Skip to content

G
graces
Commit f5c3046f authored by lixiaofang's avatar lixiaofang
Browse files
Options

最新gaia代码

parents 307c8969 fc6decc3
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 22 deletions
.idea/workspace.xml
View file @ f5c3046f
...@@ -2,12 +2,16 @@ ...@@ -2,12 +2,16 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f84a58a6-0272-4806-8e67-f793e01f4a55" name="Default Changelist" comment=""> <list default="true" id="f84a58a6-0272-4806-8e67-f793e01f4a55" name="Default Changelist" comment="">
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<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$/api/tool/special_service_dbmw.py" beforeDir="false" afterPath="$PROJECT_DIR$/api/tool/special_service_dbmw.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/api/tool/special_service_dbmw.py" beforeDir="false" afterPath="$PROJECT_DIR$/api/tool/special_service_dbmw.py" afterDir="false" />
======= =======
<change beforePath="$PROJECT_DIR$/gaia/settings_local.py" beforeDir="false" afterPath="$PROJECT_DIR$/gaia/settings_local.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/gaia/settings_local.py" beforeDir="false" afterPath="$PROJECT_DIR$/gaia/settings_local.py" afterDir="false" />
>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e >>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
=======
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
</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" />
...@@ -51,17 +55,25 @@ ...@@ -51,17 +55,25 @@
======= =======
<entry key="py" value="6" /> <entry key="py" value="6" />
<entry key="template" value="1" /> <entry key="template" value="1" />
<<<<<<< HEAD
>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e >>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
=======
<entry key="txt" value="1" />
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="JSON" value="6" /> <entry key="JSON" value="6" />
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<entry key="PLAIN_TEXT" value="4" /> <entry key="PLAIN_TEXT" value="4" />
<entry key="Python" value="9" /> <entry key="Python" value="9" />
======= =======
<entry key="PLAIN_TEXT" value="1" /> <entry key="PLAIN_TEXT" value="1" />
=======
<entry key="PLAIN_TEXT" value="2" />
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
<entry key="Python" value="6" /> <entry key="Python" value="6" />
>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e >>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
</counts> </counts>
...@@ -69,6 +81,7 @@ ...@@ -69,6 +81,7 @@
</session> </session>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<<<<<<< HEAD
<leaf> <leaf>
<<<<<<< HEAD <<<<<<< HEAD
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
...@@ -77,9 +90,13 @@ ...@@ -77,9 +90,13 @@
<state relative-caret-position="185"> <state relative-caret-position="185">
<caret line="28" selection-start-line="28" selection-end-line="28" selection-end-column="66" /> <caret line="28" selection-start-line="28" selection-end-line="28" selection-end-column="66" />
======= =======
=======
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/gaia/settings_local.py"> <entry file="file://$PROJECT_DIR$/requirements/common.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="340"> <state relative-caret-position="340">
<caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" /> <caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
<folding> <folding>
...@@ -169,6 +186,10 @@ ...@@ -169,6 +186,10 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="223"> <state relative-caret-position="223">
<caret line="37" column="15" selection-start-line="37" selection-start-column="15" selection-end-line="37" selection-end-column="15" /> <caret line="37" column="15" selection-start-line="37" selection-start-column="15" selection-end-line="37" selection-end-column="15" />
=======
<state relative-caret-position="67">
<caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -210,6 +231,7 @@ ...@@ -210,6 +231,7 @@
</list> </list>
</option> </option>
</component> </component>
<<<<<<< HEAD
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<<<<<<< HEAD <<<<<<< HEAD
<option name="x" value="-323" /> <option name="x" value="-323" />
...@@ -217,6 +239,9 @@ ...@@ -217,6 +239,9 @@
<option name="width" value="1920" /> <option name="width" value="1920" />
<option name="height" value="1080" /> <option name="height" value="1080" />
======= =======
=======
<component name="ProjectFrameBounds">
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
<option name="y" value="23" /> <option name="y" value="23" />
<option name="width" value="1280" /> <option name="width" value="1280" />
<option name="height" value="723" /> <option name="height" value="723" />
...@@ -254,6 +279,7 @@ ...@@ -254,6 +279,7 @@
<path> <path>
<item name="graces" type="b2602c69:ProjectViewProjectNode" /> <item name="graces" type="b2602c69:ProjectViewProjectNode" />
<item name="graces" type="462c0819:PsiDirectoryNode" /> <item name="graces" type="462c0819:PsiDirectoryNode" />
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<item name="trans2es" type="462c0819:PsiDirectoryNode" /> <item name="trans2es" type="462c0819:PsiDirectoryNode" />
</path> </path>
...@@ -277,6 +303,9 @@ ...@@ -277,6 +303,9 @@
======= =======
<item name="gaia" type="462c0819:PsiDirectoryNode" /> <item name="gaia" type="462c0819:PsiDirectoryNode" />
>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e >>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
=======
<item name="_celery.py" type="8704e2dd:PyFileNode" />
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
</path> </path>
</expand> </expand>
<select /> <select />
...@@ -315,6 +344,7 @@ ...@@ -315,6 +344,7 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<frame x="-323" y="-1080" width="1920" height="1080" extended-state="6" /> <frame x="-323" y="-1080" width="1920" height="1080" extended-state="6" />
<editor active="true" /> <editor active="true" />
...@@ -327,17 +357,23 @@ ...@@ -327,17 +357,23 @@
======= =======
<frame x="0" y="23" width="1280" height="723" extended-state="1" /> <frame x="0" y="23" width="1280" height="723" extended-state="1" />
<editor active="true" /> <editor active="true" />
=======
<frame x="0" y="23" width="1280" height="723" extended-state="0" />
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
<layout> <layout>
<window_info id="DB Browser" weight="0.32964718" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24702145" />
<window_info id="Favorites" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30976966" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<<<<<<< HEAD
<window_info anchor="bottom" id="DB Execution Console" /> <window_info anchor="bottom" id="DB Execution Console" />
<window_info anchor="bottom" id="Version Control" /> <window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Python Console" /> <window_info anchor="bottom" id="Python Console" />
<window_info anchor="bottom" id="Terminal" visible="true" weight="0.0" /> <window_info anchor="bottom" id="Terminal" visible="true" weight="0.0" />
<window_info anchor="bottom" id="Event Log" side_tool="true" /> <window_info anchor="bottom" id="Event Log" side_tool="true" />
>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e >>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
=======
<window_info id="DB Browser" order="2" weight="0.32964718" />
<window_info id="Favorites" order="3" side_tool="true" />
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" /> <window_info anchor="bottom" id="Run" order="2" />
...@@ -345,6 +381,7 @@ ...@@ -345,6 +381,7 @@
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<window_info anchor="bottom" id="Version Control" order="7" /> <window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="DB Execution Console" order="8" /> <window_info anchor="bottom" id="DB Execution Console" order="8" />
...@@ -354,6 +391,13 @@ ...@@ -354,6 +391,13 @@
<window_info anchor="bottom" id="Messages" order="12" weight="0.32894737" /> <window_info anchor="bottom" id="Messages" order="12" weight="0.32894737" />
======= =======
>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e >>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
=======
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="DB Execution Console" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.6069079" />
<window_info anchor="bottom" id="Python Console" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
<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" />
...@@ -405,13 +449,6 @@ ...@@ -405,13 +449,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/trans2es/mapping/service.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="301" column="28" selection-end-line="341" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/mapping/sku.json"> <entry file="file://$PROJECT_DIR$/trans2es/mapping/sku.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295"> <state relative-caret-position="295">
...@@ -441,11 +478,31 @@ ...@@ -441,11 +478,31 @@
</provider> </provider>
</entry> </entry>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
=======
<entry file="file://$PROJECT_DIR$/gaia/celery_task_router.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="37" column="15" selection-start-line="37" selection-start-column="15" selection-end-line="37" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gaia/settings_local.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179">
<caret line="52" column="23" selection-start-line="52" selection-start-column="23" selection-end-line="52" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gaia/settings.py.template">
<provider selected="true" editor-type-id="text-editor" />
</entry>
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py"> <entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-102"> <state relative-caret-position="15">
<caret line="194" column="80" selection-start-line="194" selection-start-column="76" selection-end-line="194" selection-end-column="80" /> <caret line="198" column="49" selection-start-line="198" selection-start-column="49" selection-end-line="198" selection-end-column="49" />
<folding> <folding>
<element signature="e#1265#5226#0" /> <element signature="e#1265#5226#0" />
<element signature="e#9397#12894#0" /> <element signature="e#9397#12894#0" />
...@@ -457,12 +514,13 @@ ...@@ -457,12 +514,13 @@
>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e >>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py"> <entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1976"> <state relative-caret-position="529">
<caret line="469" column="28" selection-start-line="469" selection-start-column="18" selection-end-line="469" selection-end-column="28" /> <caret line="469" column="28" selection-start-line="469" selection-start-column="18" selection-end-line="469" selection-end-column="28" />
</state> </state>
</provider> </provider>
</entry> </entry>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
<entry file="file://$PROJECT_DIR$/gaia/celery_task_router.py"> <entry file="file://$PROJECT_DIR$/gaia/celery_task_router.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -473,20 +531,22 @@ ...@@ -473,20 +531,22 @@
</entry> </entry>
>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e >>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
<entry file="file://$PROJECT_DIR$/gaia/settings.py.template"> <entry file="file://$PROJECT_DIR$/gaia/settings.py.template">
=======
<entry file="file://$PROJECT_DIR$/trans2es/mapping/problem.json">
>>>>>>> fc6decc3196046d40b3151f18d0fd3d0bed12b37
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/trans2es/mapping/problem.json"> <entry file="file://$PROJECT_DIR$/trans2es/mapping/service.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-415" /> <state relative-caret-position="68">
<caret line="98" column="10" selection-start-line="98" selection-start-column="10" selection-end-line="98" selection-end-column="10" />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/gaia/settings_local.py"> <entry file="file://$PROJECT_DIR$/requirements/common.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340"> <state relative-caret-position="67">
<caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" /> <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding>
<element signature="e#3463#4696#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
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