依赖

.idea/workspace.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="8a5543fd-f32d-4426-b921-0848e1e04eaf" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/app_conf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app_conf.xml" afterDir="false" />
     </list>
+=======
+    <list default="true" id="8a5543fd-f32d-4426-b921-0848e1e04eaf" name="Default Changelist" comment="" />
+>>>>>>> test
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -95,6 +99,15 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app_conf.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="195">
+              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+            </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">
@@ -123,6 +136,7 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/requirements.txt">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="266">
@@ -132,6 +146,8 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+=======
+>>>>>>> test
         <entry file="file://$PROJECT_DIR$/moment/views/process_time.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="2714">
@@ -406,7 +422,11 @@
       <window_info content_ui="combo" id="Project" order="2" visible="true" weight="0.223193" />
       <window_info id="Structure" order="3" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Version Control" order="0" show_stripe_button="false" />
+<<<<<<< HEAD
       <window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.37171054" />
+=======
+      <window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.40789473" />
+>>>>>>> test
       <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Python Console" order="3" weight="0.44663212" />
       <window_info anchor="bottom" id="DB Execution Console" order="4" />
@@ -611,9 +631,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -621,9 +638,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
           <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
-          <folding>
-            <element signature="e#46#97#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -766,6 +780,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="75">
           <caret line="5" column="9" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="9" />
+<<<<<<< HEAD
         </state>
       </provider>
     </entry>
@@ -776,6 +791,8 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="82">
           <caret line="32" column="4" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="4" />
+=======
+>>>>>>> test
         </state>
       </provider>
     </entry>
@@ -791,8 +808,13 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app_conf.xml">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="120">
           <caret line="8" column="47" selection-start-line="8" selection-start-column="47" selection-end-line="8" selection-end-column="47" />
+=======
+        <state relative-caret-position="195">
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+>>>>>>> test
         </state>
       </provider>
     </entry>

requirements.txt

@@ -22,4 +22,5 @@ gevent==1.2.1
 git+ssh://git@git.wanmeizhensuo.com/backend/gm-rpcd.git@v0.2.2
 jieba==0.39
 gunicorn==19.7.1
-wheel==0.24.0
+wheel==0.24.0
\ No newline at end of file
+bs4==0.0.1
\ No newline at end of file