修改dbmw

.idea/codeStyles/Project.xml

+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <DBN-PSQL>
+      <case-options enabled="false">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false" />
+    </DBN-PSQL>
+    <DBN-SQL>
+      <case-options enabled="false">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false">
+        <option name="STATEMENT_SPACING" value="one_line" />
+        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
+        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
+      </formatting-settings>
+    </DBN-SQL>
+  </code_scheme>
+</component>
\ No newline at end of file

.idea/dictionaries/lxrent.xml

+<component name="ProjectDictionaryState">
+  <dictionary name="lxrent" />
+</component>
\ No newline at end of file

.idea/misc.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7 (gaia_env)" project-jdk-type="Python SDK" />
+  <component name="PyCharmProfessionalAdvertiser">
+    <option name="shown" value="true" />
+  </component>
+</project>
\ No newline at end of file

.idea/workspace.xml

@@ -18,13 +18,18 @@
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
+<<<<<<< HEAD
           <entry key="py" value="9" />
+=======
+          <entry key="py" value="7" />
+>>>>>>> b9b4da04a2baa11115fe28e6eb66b86a7c570ba6
           <entry key="template" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="PLAIN_TEXT" value="1" />
+<<<<<<< HEAD
           <entry key="Python" value="9" />
         </counts>
       </usages-collector>
@@ -36,17 +41,27 @@
       <usages-collector id="statistics.file.types.edit">
         <counts>
           <entry key="Python" value="6" />
+=======
+          <entry key="Python" value="7" />
+>>>>>>> b9b4da04a2baa11115fe28e6eb66b86a7c570ba6
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data_sync/tasks.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="60">
               <caret line="17" column="12" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
+=======
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/data_sync/tasks.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+>>>>>>> b9b4da04a2baa11115fe28e6eb66b86a7c570ba6
               <folding>
                 <element signature="e#852#2790#0" />
               </folding>
@@ -54,6 +69,7 @@
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/settings/log_settings.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -72,6 +88,8 @@
           </provider>
         </entry>
       </file>
+=======
+>>>>>>> b9b4da04a2baa11115fe28e6eb66b86a7c570ba6
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -84,6 +102,7 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+<<<<<<< HEAD
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
@@ -94,6 +113,11 @@
   <component name="ProjectFrameBounds">
     <option name="x" value="-323" />
     <option name="y" value="-1080" />
+=======
+  <component name="ProjectFrameBounds">
+    <option name="x" value="201" />
+    <option name="y" value="-979" />
+>>>>>>> b9b4da04a2baa11115fe28e6eb66b86a7c570ba6
     <option name="width" value="1920" />
     <option name="height" value="1080" />
   </component>
@@ -178,7 +202,11 @@
       <window_info anchor="bottom" id="DB Execution Console" />
       <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
       <window_info anchor="bottom" id="Python Console" />
+<<<<<<< HEAD
       <window_info anchor="bottom" id="Terminal" visible="true" weight="0.0" />
+=======
+      <window_info anchor="bottom" id="Terminal" visible="true" weight="0.2134715" />
+>>>>>>> b9b4da04a2baa11115fe28e6eb66b86a7c570ba6
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
@@ -196,6 +224,14 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
+=======
+    <entry file="file://$PROJECT_DIR$/settings/log_settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-570" />
+      </provider>
+    </entry>
+>>>>>>> b9b4da04a2baa11115fe28e6eb66b86a7c570ba6
     <entry file="file://$PROJECT_DIR$/settings/settings.py">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -232,14 +268,19 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/data_sync/tasks.py">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="60">
           <caret line="17" column="12" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
+=======
+        <state>
+>>>>>>> b9b4da04a2baa11115fe28e6eb66b86a7c570ba6
           <folding>
             <element signature="e#852#2790#0" />
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/settings/log_settings.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
@@ -254,6 +295,8 @@
         </state>
       </provider>
     </entry>
+=======
+>>>>>>> b9b4da04a2baa11115fe28e6eb66b86a7c570ba6
   </component>
   <component name="masterDetails">
     <states>

Dockerfile

@@ -43,13 +43,13 @@ RUN apk add --no-cache --virtual .build-deps  \
                 && apk add --no-cache  mariadb-connector-c-dev libxml2-dev libxslt-dev librdkafka-dev \
                 && pip install --no-cache-dir -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements.txt \
                 && mkdir -p /tmp/video_convert \
-                && mkdir -p /data/log/mimas/app
+                && mkdir -p /data/log/mentha/app
 
-ENV GM_RPCD_DEPLOY_CONF_PATH "/srv/apps/mimas/deploy_prod.xml"
+ENV GM_RPCD_DEPLOY_CONF_PATH "/srv/apps/mentha/deploy_prod.xml"
 
-COPY . /srv/apps/mimas/
+COPY . /srv/apps/mentha/
 
-WORKDIR /srv/apps/mimas/
+WORKDIR /srv/apps/mentha/
 
 RUN cat requirements.txt | grep master > /tmp/gm-requirements.txt \
     && pip install --no-deps --upgrade -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/gm-requirements.txt \

Jenkinsfile

@@ -20,7 +20,7 @@ pipeline {
         // Image Tag  branch.time.hash
         TAG = dockerTag()
         // Image Full Tag
-        IMAGE = "${DOCKER_REGISTRY}/gm-backend/mimas:$TAG"
+        IMAGE = "${DOCKER_REGISTRY}/gm-backend/mentha:$TAG"
     }
 
     stages {

settings/log_settings.py

@@ -2,7 +2,7 @@
 import os
 import logging
 
-LOG_DIR = '/data/log/mimas/app/'
+LOG_DIR = '/data/log/mentha/app/'
 
 logging.basicConfig(
     level=logging.INFO,