Skip to content

D
dymas
Commit 56edf880 authored by lixiaofang's avatar lixiaofang
Browse files
Options

doris_dymas

parent d067b323
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 40 deletions
.idea/workspace.xml
View file @ 56edf880
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/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/__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/base.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/base.py" afterDir="false" />
...@@ -15,6 +16,7 @@ ...@@ -15,6 +16,7 @@
<change beforePath="$PROJECT_DIR$/doris/system.py" beforeDir="false" afterPath="$PROJECT_DIR$/dymas/system.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/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$/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" />
...@@ -38,7 +40,7 @@ ...@@ -38,7 +40,7 @@
<entry key="Jenkinsfile" value="1" /> <entry key="Jenkinsfile" value="1" />
<entry key="gitignore" value="1" /> <entry key="gitignore" value="1" />
<entry key="log" value="2" /> <entry key="log" value="2" />
<entry key="py" value="29" /> <entry key="py" value="32" />
<entry key="txt" value="3" /> <entry key="txt" value="3" />
<entry key="xml" value="1" /> <entry key="xml" value="1" />
</counts> </counts>
...@@ -46,18 +48,20 @@ ...@@ -46,18 +48,20 @@
<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="8" />
<entry key="Python" value="29" /> <entry key="Python" value="32" />
<entry key="XML" value="1" /> <entry key="XML" value="1" />
</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="py" value="6" /> <entry key="py" value="6" />
<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="Python" value="6" /> <entry key="Python" value="6" />
<entry key="XML" value="5" /> <entry key="XML" value="5" />
</counts> </counts>
...@@ -66,7 +70,7 @@ ...@@ -66,7 +70,7 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<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">
...@@ -75,11 +79,11 @@ ...@@ -75,11 +79,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/manage.py"> <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="60"> <state relative-caret-position="315">
<caret line="5" column="58" selection-start-line="5" selection-start-column="58" selection-end-line="5" selection-end-column="58" /> <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -87,15 +91,47 @@ ...@@ -87,15 +91,47 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Dockerfile"> <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="333"> <state relative-caret-position="251">
<caret line="50" column="24" lean-forward="true" selection-start-line="50" selection-start-column="24" selection-end-line="50" selection-end-column="24" /> <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> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Jenkinsfile"> <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="-414" />
</provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
...@@ -135,8 +171,10 @@ ...@@ -135,8 +171,10 @@
<find>SECRET_KEY</find> <find>SECRET_KEY</find>
<find>log_d</find> <find>log_d</find>
<find>log_dir</find> <find>log_dir</find>
<find>doris</find>
<find>gm_rpcd</find> <find>gm_rpcd</find>
<find>doris</find>
<find>from dori</find>
<find>doris.</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -166,10 +204,15 @@ ...@@ -166,10 +204,15 @@
<option value="$PROJECT_DIR$/requirements.txt" /> <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$/dymas/system.py" />
<option value="$PROJECT_DIR$/dymas/devel.py" />
<option value="$PROJECT_DIR$/dymas/urls.py" />
<option value="$PROJECT_DIR$/manage.py" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="1"> <component name="ProjectFrameBounds">
<option name="x" value="-323" /> <option name="x" value="-323" />
<option name="y" value="-1080" /> <option name="y" value="-1080" />
<option name="width" value="1920" /> <option name="width" value="1920" />
...@@ -269,8 +312,7 @@ ...@@ -269,8 +312,7 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-323" y="-1080" width="1920" height="1080" extended-state="6" /> <frame x="-323" y="-1080" width="1920" height="1080" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24170616" /> <window_info 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" />
...@@ -285,7 +327,7 @@ ...@@ -285,7 +327,7 @@
<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.2373057" /> <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.58445597" />
<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" />
...@@ -500,51 +542,77 @@ ...@@ -500,51 +542,77 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/manage.py"> <entry file="file://$PROJECT_DIR$/doris/base.py">
<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="330">
<caret line="5" column="58" selection-start-line="5" selection-start-column="58" selection-end-line="5" selection-end-column="58" /> <caret line="23" column="18" selection-start-line="23" selection-end-line="24" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/doris/base.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="330"> <state relative-caret-position="210">
<caret line="23" column="18" selection-start-line="23" selection-end-line="24" /> <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
</state>
</provider>
</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">
<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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Dockerfile"> <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="333"> <state relative-caret-position="251">
<caret line="50" column="24" lean-forward="true" selection-start-line="50" selection-start-column="24" selection-end-line="50" selection-end-column="24" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Jenkinsfile"> <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="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> </entry>
<entry file="file://$PROJECT_DIR$/requirements.txt"> <entry file="file://$PROJECT_DIR$/dymas/devel.py">
<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="15">
<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="1" column="10" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="10" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/dymas/urls.py">
<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="390">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/dymas/base.py"> <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="-414" />
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app_conf.xml"> <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="630"> <state relative-caret-position="420">
<caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" /> <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>
<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> </state>
</provider> </provider>
</entry> </entry>
......
dymas/base.py
View file @ 56edf880
...@@ -58,7 +58,7 @@ MIDDLEWARE = [ ...@@ -58,7 +58,7 @@ MIDDLEWARE = [
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
] ]
ROOT_URLCONF = 'doris.urls' ROOT_URLCONF = 'dymas.urls'
TEMPLATES = [ TEMPLATES = [
{ {
......
dymas/celery.py
View file @ 56edf880
...@@ -6,9 +6,9 @@ from celery import Celery ...@@ -6,9 +6,9 @@ from celery import Celery
from django.conf import settings from django.conf import settings
# set the default Django settings module for the 'celery' program. # set the default Django settings module for the 'celery' program.
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'doris.devel') os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dymas.devel')
app = Celery('doris') app = Celery('dymas')
# Using a string here means the worker don't have to serialize # Using a string here means the worker don't have to serialize
# the configuration object to child processes. # the configuration object to child processes.
......
dymas/doris_injection.py
View file @ 56edf880
import os import os
import django import django
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'doris.devel') os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dymas.devel')
django.setup() django.setup()
dymas/wsgi.py
View file @ 56edf880
...@@ -11,6 +11,6 @@ import os ...@@ -11,6 +11,6 @@ import os
from django.core.wsgi import get_wsgi_application from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "doris.devel") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dymas.devel")
application = get_wsgi_application() application = get_wsgi_application()
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