Skip to content

D
dymas
Commit 684d84db authored by lixiaofang's avatar lixiaofang
Browse files
Options

doris_dymas

parent 56edf880
Hide whitespace changes
Inline Side-by-side
Showing with 235 additions and 238 deletions
.idea/workspace.xml
View file @ 684d84db
...@@ -2,21 +2,7 @@ ...@@ -2,21 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ae0ff912-332d-4611-9939-a4d235689946" name="Default Changelist" comment=""> <list default="true" id="ae0ff912-332d-4611-9939-a4d235689946" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/dymas/base.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/base.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app_conf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app_conf.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/__init__.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/base.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/base.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/celery.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/celery.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/deploy_devel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/deploy_devel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/devel.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/devel.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/doris_injection.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/doris_injection.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/log_settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/log_settings.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/routers.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/routers.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/system.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/system.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/doris/wsgi.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/wsgi.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/manage.py" beforeDir="false" afterPath="$PROJECT_DIR$/manage.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -36,128 +22,41 @@ ...@@ -36,128 +22,41 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="Dockerfile" value="1" /> <entry key="Dockerfile" value="3" />
<entry key="Jenkinsfile" value="1" /> <entry key="Jenkinsfile" value="1" />
<entry key="gitignore" value="1" /> <entry key="gitignore" value="2" />
<entry key="log" value="2" /> <entry key="log" value="2" />
<entry key="py" value="32" /> <entry key="plan" value="1" />
<entry key="txt" value="3" /> <entry key="py" value="71" />
<entry key="xml" value="1" /> <entry key="txt" value="4" />
<entry key="xml" value="3" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="PLAIN_TEXT" value="8" /> <entry key="PLAIN_TEXT" value="13" />
<entry key="Python" value="32" /> <entry key="Python" value="71" />
<entry key="XML" value="1" /> <entry key="XML" value="3" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="Dockerfile" value="5" /> <entry key="Dockerfile" value="5" />
<entry key="py" value="6" /> <entry key="py" value="16" />
<entry key="xml" value="5" /> <entry key="xml" value="5" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="PLAIN_TEXT" value="5" /> <entry key="PLAIN_TEXT" value="5" />
<entry key="Python" value="6" /> <entry key="Python" value="16" />
<entry key="XML" value="5" /> <entry key="XML" value="5" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf />
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app_conf.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
<caret line="36" column="21" lean-forward="true" selection-start-line="36" selection-start-column="21" selection-end-line="36" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dymas/system.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dymas/devel.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="10" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dymas/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390">
<caret line="26" column="41" lean-forward="true" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
<folding>
<element signature="e#639#650#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-414" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="28" column="16" lean-forward="true" selection-start-line="28" selection-start-column="16" selection-end-line="28" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dymas/base.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
...@@ -172,9 +71,9 @@ ...@@ -172,9 +71,9 @@
<find>log_d</find> <find>log_d</find>
<find>log_dir</find> <find>log_dir</find>
<find>gm_rpcd</find> <find>gm_rpcd</find>
<find>doris</find>
<find>from dori</find> <find>from dori</find>
<find>doris.</find> <find>doris.</find>
<find>doris</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -201,7 +100,6 @@ ...@@ -201,7 +100,6 @@
<option value="$PROJECT_DIR$/search/views/diary.py" /> <option value="$PROJECT_DIR$/search/views/diary.py" />
<option value="$PROJECT_DIR$/search/management/commands/debugscript.py" /> <option value="$PROJECT_DIR$/search/management/commands/debugscript.py" />
<option value="$PROJECT_DIR$/doris/log_settings.py" /> <option value="$PROJECT_DIR$/doris/log_settings.py" />
<option value="$PROJECT_DIR$/requirements.txt" />
<option value="$PROJECT_DIR$/doris/base.py" /> <option value="$PROJECT_DIR$/doris/base.py" />
<option value="$PROJECT_DIR$/app_conf.xml" /> <option value="$PROJECT_DIR$/app_conf.xml" />
<option value="$PROJECT_DIR$/Dockerfile" /> <option value="$PROJECT_DIR$/Dockerfile" />
...@@ -209,6 +107,11 @@ ...@@ -209,6 +107,11 @@
<option value="$PROJECT_DIR$/dymas/devel.py" /> <option value="$PROJECT_DIR$/dymas/devel.py" />
<option value="$PROJECT_DIR$/dymas/urls.py" /> <option value="$PROJECT_DIR$/dymas/urls.py" />
<option value="$PROJECT_DIR$/manage.py" /> <option value="$PROJECT_DIR$/manage.py" />
<option value="$PROJECT_DIR$/dymas/celery.py" />
<option value="$PROJECT_DIR$/dymas/doris_injection.py" />
<option value="$PROJECT_DIR$/dymas/wsgi.py" />
<option value="$PROJECT_DIR$/dymas/base.py" />
<option value="$PROJECT_DIR$/requirements.txt" />
</list> </list>
</option> </option>
</component> </component>
...@@ -248,6 +151,21 @@ ...@@ -248,6 +151,21 @@
<item name="dymas" type="b2602c69:ProjectViewProjectNode" /> <item name="dymas" type="b2602c69:ProjectViewProjectNode" />
<item name="dymas" type="462c0819:PsiDirectoryNode" /> <item name="dymas" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="dymas" type="b2602c69:ProjectViewProjectNode" />
<item name="dymas" type="462c0819:PsiDirectoryNode" />
<item name="dymas" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dymas" type="b2602c69:ProjectViewProjectNode" />
<item name="dymas" type="462c0819:PsiDirectoryNode" />
<item name="libs" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dymas" type="b2602c69:ProjectViewProjectNode" />
<item name="dymas" type="462c0819:PsiDirectoryNode" />
<item name="word" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
...@@ -314,7 +232,7 @@ ...@@ -314,7 +232,7 @@
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-323" y="-1080" width="1920" height="1080" extended-state="0" /> <frame x="-323" y="-1080" width="1920" height="1080" extended-state="0" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24170616" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24170616" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info id="DB Browser" order="3" /> <window_info id="DB Browser" order="3" />
...@@ -327,34 +245,13 @@ ...@@ -327,34 +245,13 @@
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="DB Execution Console" order="8" /> <window_info anchor="bottom" id="DB Execution Console" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.58445597" /> <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.3357513" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Python Console" order="11" /> <window_info anchor="bottom" id="Python Console" order="11" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout> </layout>
<layout-to-restore>
<window_info id="DB Browser" order="0" />
<window_info id="Favorites" order="1" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="2" visible="true" weight="0.0" />
<window_info id="Structure" order="3" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="DB Execution Console" order="0" />
<window_info anchor="bottom" id="Version Control" order="1" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" order="2" />
<window_info anchor="bottom" id="Event Log" order="3" side_tool="true" />
<window_info anchor="bottom" id="Python Console" order="4" />
<window_info anchor="bottom" id="Message" order="5" />
<window_info anchor="bottom" id="Find" order="6" />
<window_info anchor="bottom" id="Run" order="7" />
<window_info anchor="bottom" id="Debug" order="8" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="11" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout-to-restore>
</component> </component>
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
...@@ -371,79 +268,6 @@ ...@@ -371,79 +268,6 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/libs/es.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="498">
<caret line="170" lean-forward="true" selection-start-line="170" selection-end-line="170" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/filters.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<caret line="42" column="6" lean-forward="true" selection-start-line="42" selection-start-column="6" selection-end-line="42" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/hera/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="9" column="20" lean-forward="true" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/recommend/utils/diary_portrait.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="66" column="13" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/utils/sku.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="167">
<caret line="741" column="37" lean-forward="true" selection-start-line="741" selection-start-column="37" selection-end-line="741" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/recommend/utils/service.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="376">
<caret line="297" column="28" selection-start-line="297" selection-start-column="28" selection-end-line="297" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/content_aggre.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="512">
<caret line="2604" selection-start-line="2604" selection-end-line="2604" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/recommend/views/detail.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="466" column="47" selection-start-line="466" selection-start-column="47" selection-end-line="466" selection-end-column="47" />
<folding>
<element signature="e#14036#26953#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/recommend/views/service.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="196">
<caret line="650" column="59" selection-start-line="650" selection-start-column="59" selection-end-line="650" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/search_comprehensive.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="618" column="30" selection-start-line="618" selection-start-column="30" selection-end-line="618" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/tractate.py"> <entry file="file://$PROJECT_DIR$/search/views/tractate.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="181"> <state relative-caret-position="181">
...@@ -549,16 +373,11 @@ ...@@ -549,16 +373,11 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state relative-caret-position="-414" />
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dymas/base.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app_conf.xml"> <entry file="file://$PROJECT_DIR$/app_conf.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630"> <state relative-caret-position="630">
...@@ -566,24 +385,87 @@ ...@@ -566,24 +385,87 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Dockerfile"> <entry file="file://$PROJECT_DIR$/libs/autocomplete.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251"> <state relative-caret-position="275">
<caret line="36" column="21" lean-forward="true" selection-start-line="36" selection-start-column="21" selection-end-line="36" selection-end-column="21" /> <caret line="19" column="15" lean-forward="true" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="15" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dymas/system.py"> <entry file="file://$PROJECT_DIR$/sqls/sqitch.plan">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="15">
<caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" /> <caret line="1" column="9" selection-start-line="1" selection-start-column="9" selection-end-line="1" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/word/tasks.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/word/models.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#28#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dymas/base.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2460">
<caret line="165" column="22" selection-start-line="165" selection-start-column="17" selection-end-line="165" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dymas/celery.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="19" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
<folding>
<element signature="e#0#56#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dymas/deploy_devel.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/dymas/devel.py"> <entry file="file://$PROJECT_DIR$/dymas/devel.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="47" column="10" selection-start-line="47" selection-start-column="5" selection-end-line="47" selection-end-column="10" />
<folding>
<element signature="e#15#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dymas/doris_injection.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="54" selection-start-line="3" selection-start-column="54" selection-end-line="3" selection-end-column="54" />
<folding>
<element signature="e#0#9#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dymas/log_settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-28" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dymas/routers.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/dymas/system.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="15">
<caret line="1" column="10" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="10" /> <caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -597,22 +479,137 @@ ...@@ -597,22 +479,137 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Jenkinsfile"> <entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-414" /> <state relative-caret-position="330">
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
<folding>
<element signature="e#22#31#0" expanded="true" />
</folding>
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/requirements.txt"> <entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="526">
<caret line="28" column="16" lean-forward="true" selection-start-line="28" selection-start-column="16" selection-end-line="28" selection-end-column="16" /> <caret line="57" lean-forward="true" selection-start-line="57" selection-end-line="57" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/manage.py"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <state relative-caret-position="210">
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" /> <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/word/views.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#35#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/algorithms.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/cache.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#12#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/date.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/libs/debug.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/error.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/feedbuilder.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#45#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/es.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="526">
<caret line="170" lean-forward="true" selection-start-line="170" selection-end-line="170" />
<folding>
<element signature="e#15#35#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/filters.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/libs/http.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/neo4j.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/libs/region.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/libs/rpc.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/ssdb.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/libs/testutil.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/libs/types.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/dymas/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="13" column="54" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="54" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
dymas/base.py
View file @ 684d84db
...@@ -78,7 +78,7 @@ TEMPLATES = [ ...@@ -78,7 +78,7 @@ TEMPLATES = [
}, },
] ]
WSGI_APPLICATION = 'doris.wsgi.application' WSGI_APPLICATION = 'dymas.wsgi.application'
# Database # Database
# https://docs.djangoproject.com/en/1.10/ref/settings/#databases # https://docs.djangoproject.com/en/1.10/ref/settings/#databases
...@@ -123,8 +123,8 @@ STATIC_URL = '/static/' ...@@ -123,8 +123,8 @@ STATIC_URL = '/static/'
admin.site.site_header = '更美策略平台' admin.site.site_header = '更美策略平台'
STATIC_ROOT = 'static' STATIC_ROOT = 'static'
WORD_FILE = '/srv/apps/doris/static/word/word.txt' WORD_FILE = '/srv/apps/dymas/static/word/word.txt'
STOP_WORD_FILE = '/srv/apps/doris/static/word/stopword.txt' STOP_WORD_FILE = '/srv/apps/dymas/static/word/stopword.txt'
ES_CONSTS = { ES_CONSTS = {
'TAG_ID_DIRECTOR_RECOMMEND': 1142, # "所长精选" tag id 'TAG_ID_DIRECTOR_RECOMMEND': 1142, # "所长精选" tag id
...@@ -159,7 +159,7 @@ DEVICE_PORTRAIT_NAME = "device:{}:category" ...@@ -159,7 +159,7 @@ DEVICE_PORTRAIT_NAME = "device:{}:category"
FEED_CACHE_VERSION = "v0" FEED_CACHE_VERSION = "v0"
DATABASE_ROUTERS = ['doris.routers.DatabaseRouter'] DATABASE_ROUTERS = ['dymas.routers.DatabaseRouter']
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.mysql', # 设置为mysql数据库 'ENGINE': 'django.db.backends.mysql', # 设置为mysql数据库
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment