最新gaia代码

.idea/workspace.xml

@@ -2,8 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="f84a58a6-0272-4806-8e67-f793e01f4a55" name="Default Changelist" comment="">
+<<<<<<< HEAD
       <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$/gaia/settings_local.py" beforeDir="false" afterPath="$PROJECT_DIR$/gaia/settings_local.py" afterDir="false" />
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -15,10 +19,15 @@
     <session id="-293873407">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
+<<<<<<< HEAD
           <entry key="project.closed" value="1" />
           <entry key="project.open.time.0" value="1" />
           <entry key="project.open.time.68" value="1" />
           <entry key="project.opened" value="2" />
+=======
+          <entry key="project.open.time.0" value="1" />
+          <entry key="project.opened" value="1" />
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
@@ -34,32 +43,75 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="json" value="6" />
+<<<<<<< HEAD
           <entry key="py" value="9" />
           <entry key="sh" value="1" />
           <entry key="template" value="1" />
           <entry key="txt" value="2" />
+=======
+          <entry key="py" value="6" />
+          <entry key="template" value="1" />
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="JSON" value="6" />
+<<<<<<< HEAD
           <entry key="PLAIN_TEXT" value="4" />
           <entry key="Python" value="9" />
+=======
+          <entry key="PLAIN_TEXT" value="1" />
+          <entry key="Python" value="6" />
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/requirements/common.txt">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="185">
               <caret line="28" selection-start-line="28" selection-end-line="28" selection-end-column="66" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/gaia/settings_local.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <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" />
+              <folding>
+                <element signature="e#3463#4696#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/trans2es/mapping/problem.json">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-415" />
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gaia/settings.py.template">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gaia/settings_ci.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="330">
+              <caret line="22" column="23" selection-start-line="22" selection-start-column="23" selection-end-line="22" selection-end-column="23" />
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
+            </state>
+          </provider>
+        </entry>
+      </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -67,11 +119,61 @@
               <caret line="194" column="80" selection-start-line="194" selection-start-column="76" selection-end-line="194" selection-end-column="80" />
               <folding>
                 <element signature="e#1265#5226#0" />
+=======
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gaia/log_settings.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="45">
+              <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-102">
+              <caret line="194" column="80" selection-start-line="194" selection-start-column="76" selection-end-line="194" selection-end-column="80" />
+              <folding>
+                <element signature="e#1265#5226#0" />
+                <element signature="e#9397#12894#0" />
+                <element signature="e#12961#19656#0" />
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
+=======
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/injection/data_sync/tasks.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="105">
+              <caret line="14" column="90" selection-start-line="14" selection-start-column="76" selection-end-line="14" selection-end-column="90" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1976">
+              <caret line="469" column="28" selection-start-line="469" selection-start-column="18" selection-end-line="469" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gaia/celery_task_router.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <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" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -79,12 +181,16 @@
       <find>/data/log</find>
       <find>diary-portrait</find>
       <find>data</find>
+<<<<<<< HEAD
       <find>gaia-dbmw</find>
       <find>protocol</find>
     </findStrings>
     <replaceStrings>
       <replace />
     </replaceStrings>
+=======
+    </findStrings>
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -105,10 +211,16 @@
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
+<<<<<<< HEAD
     <option name="x" value="-323" />
     <option name="y" value="-1080" />
     <option name="width" value="1920" />
     <option name="height" value="1080" />
+=======
+    <option name="y" value="23" />
+    <option name="width" value="1280" />
+    <option name="height" value="723" />
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -142,6 +254,7 @@
             <path>
               <item name="graces" type="b2602c69:ProjectViewProjectNode" />
               <item name="graces" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="trans2es" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -161,6 +274,9 @@
               <item name="graces" type="b2602c69:ProjectViewProjectNode" />
               <item name="graces" type="462c0819:PsiDirectoryNode" />
               <item name="yibaopay" type="462c0819:PsiDirectoryNode" />
+=======
+              <item name="gaia" type="462c0819:PsiDirectoryNode" />
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
             </path>
           </expand>
           <select />
@@ -199,6 +315,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
+<<<<<<< HEAD
     <frame x="-323" y="-1080" width="1920" height="1080" extended-state="6" />
     <editor active="true" />
     <layout>
@@ -207,6 +324,20 @@
       <window_info id="DB Browser" order="2" weight="0.32964718" />
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info anchor="bottom" id="Thumbnails" weight="0.32894737" />
+=======
+    <frame x="0" y="23" width="1280" height="723" extended-state="1" />
+    <editor active="true" />
+    <layout>
+      <window_info id="DB Browser" weight="0.32964718" />
+      <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 anchor="bottom" id="DB Execution Console" />
+      <window_info anchor="bottom" id="Version Control" />
+      <window_info anchor="bottom" id="Python Console" />
+      <window_info anchor="bottom" id="Terminal" visible="true" weight="0.0" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
@@ -214,12 +345,15 @@
       <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="TODO" order="6" />
+<<<<<<< HEAD
       <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info anchor="bottom" id="DB Execution Console" order="8" />
       <window_info anchor="bottom" id="Terminal" order="9" weight="0.0" />
       <window_info anchor="bottom" id="Python Console" order="10" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="bottom" id="Messages" order="12" weight="0.32894737" />
+=======
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
       <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" />
@@ -306,6 +440,21 @@
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
+=======
+    <entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-102">
+          <caret line="194" column="80" selection-start-line="194" selection-start-column="76" selection-end-line="194" selection-end-column="80" />
+          <folding>
+            <element signature="e#1265#5226#0" />
+            <element signature="e#9397#12894#0" />
+            <element signature="e#12961#19656#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
     <entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1976">
@@ -313,6 +462,16 @@
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
+=======
+    <entry file="file://$PROJECT_DIR$/gaia/celery_task_router.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <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" />
+        </state>
+      </provider>
+    </entry>
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
     <entry file="file://$PROJECT_DIR$/gaia/settings.py.template">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -331,6 +490,7 @@
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/11.22.txt">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -368,6 +528,8 @@
         </state>
       </provider>
     </entry>
+=======
+>>>>>>> 7820b639d89d6621d5166b854d0d8276e32dab7e
   </component>
   <component name="masterDetails">
     <states>

api/tool/special_service_dbmw.py

@@ -14,16 +14,14 @@ from gm_dbmw_api.descriptor.source import GroupedSource, MySQLTableScanSource
 from gm_dbmw_api.descriptor.sink import CeleryV1Sink
 from gm_dbmw_api.descriptor.source import MySQLTableSource
 
-
 DB = settings.DATABASES['default']['NAME']
 
-
 sink_update_with_tag = CeleryV1Sink(
     task='api.tasks.special_service_dbmw.update_with_tag',
     key_list_param_name='ids',
     static_params_json='{}',
     broker_url=settings.BROKER_URL,
-    queue='',
+    queue='gaia-dbmw',
     unpack_input_tuple=True,
     batch_size_limit=20,
     flow_rate_limit=20.0,