Your Name %!s(int64=6) %!d(string=hai) anos
pai
achega
b23b302d42

+ 195 - 113
hg3535/.idea/workspace.xml

@@ -4,7 +4,12 @@
     <list default="true" id="7fa42e97-ddea-4404-91db-5a9ccc162649" 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$/ball_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/ball_func.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipelines.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipelines.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/settings.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/roll_wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_wangqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/roll_zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_zuqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/zuqiu.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -14,7 +19,7 @@
   </component>
   <component name="CoverageDataManager">
     <SUITE FILE_PATH="coverage/hg3535$items.coverage" NAME="items Coverage Results" MODIFIED="1554291398794" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/hg3535$main.coverage" NAME="main Coverage Results" MODIFIED="1559114650917" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/hg3535$main.coverage" NAME="main Coverage Results" MODIFIED="1559557155593" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/hg3535$hgjieshu.coverage" NAME="hgjieshu Coverage Results" MODIFIED="1558494720094" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
     <SUITE FILE_PATH="coverage/hg3535$halffull.coverage" NAME="halffull Coverage Results" MODIFIED="1554544334424" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
     <SUITE FILE_PATH="coverage/hg3535$pipelines.coverage" NAME="pipelines Coverage Results" MODIFIED="1554290866137" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
@@ -45,25 +50,31 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pipelines.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="18034">
-              <caret line="1533" column="12" selection-start-line="1533" selection-start-column="12" selection-end-line="1533" selection-end-column="12" />
+            <state relative-caret-position="307">
+              <caret line="289" column="21" lean-forward="true" selection-start-line="289" selection-start-column="21" selection-end-line="289" selection-end-column="21" />
               <folding>
                 <element signature="e#0#11#0" expanded="true" />
+                <element signature="e#16016#23080#0" />
+                <element signature="e#23234#30141#0" />
+                <element signature="e#30297#33238#0" />
+                <element signature="e#33392#39660#0" />
+                <element signature="e#39810#41670#0" />
+                <element signature="e#41821#50540#0" />
+                <element signature="e#43093#59596#0" />
+                <element signature="e#65460#78016#0" />
+                <element signature="e#65318#70468#0" />
+                <element signature="e#70518#83933#0" />
+                <element signature="e#84497#84609#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+        <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/json/__init__.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="8046">
-              <caret line="453" column="50" selection-start-line="453" selection-start-column="45" selection-end-line="453" selection-end-column="54" />
-              <folding>
-                <element signature="e#24#35#0" expanded="true" />
-                <element signature="e#33118#41233#0" />
-                <element signature="e#41448#49794#0" />
-              </folding>
+            <state relative-caret-position="123">
+              <caret line="226" selection-start-line="226" selection-end-line="226" />
             </state>
           </provider>
         </entry>
@@ -71,10 +82,31 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/ball_func.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="7938">
-              <caret line="443" column="16" selection-start-line="443" selection-start-column="6" selection-end-line="443" selection-end-column="16" />
+            <state relative-caret-position="180">
+              <caret line="53" column="43" lean-forward="true" selection-start-line="53" selection-start-column="40" selection-end-line="53" selection-end-column="49" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
+                <element signature="e#34620#35398#0" />
+                <element signature="e#3638#4763#0" />
+                <element signature="e#4759#5852#0" />
+                <element signature="e#37743#39435#0" />
+                <element signature="e#39539#41983#0" />
+                <element signature="e#40800#41366#0" />
+                <element signature="e#41398#41964#0" />
+                <element signature="e#42189#43941#0" />
+                <element signature="e#11992#13441#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/main.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="144">
+              <caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
+              <folding>
+                <element signature="e#0#10#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -91,37 +123,40 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>capots_dict</find>
-      <find>half_size_home</find>
-      <find>last_number</find>
-      <find>total_goals</find>
-      <find>2or7</find>
-      <find>st_zq_league</find>
-      <find>odds_only</find>
-      <find>wq_</find>
-      <find>Zuqiustatus</find>
-      <find>try</find>
-      <find>&gt;=</find>
-      <find>Roll_Lanqiu</find>
       <find>psycopg2.extras</find>
       <find>pt</find>
       <find>Lanqiustatus</find>
       <find>new_times</find>
       <find>status</find>
       <find>3206572</find>
-      <find>bqone_intodb</find>
       <find>sizes</find>
       <find>wqone_intodb</find>
       <find>zqo_intodb</find>
       <find>zqtwo_intodb</find>
-      <find>zqone_intodbs</find>
       <find>zqone_intodb</find>
       <find>one_intodb</find>
       <find>one</find>
       <find>one_post</find>
       <find>three_intodb</find>
       <find>two_intodb</find>
+      <find>bqone_intodb</find>
+      <find>r_func</find>
+      <find>gjz_into</find>
+      <find>r_hash</find>
+      <find>zqone_intodbs</find>
+      <find>get_pcode</find>
+      <find>corner_ball</find>
+      <find>tema_ball</find>
+      <find>team_score</find>
+      <find>team_scoretema_ball</find>
+      <find>zqtwo_intodbs</find>
+      <find>match_score_t</find>
+      <find>match_score_dict</find>
+      <find>three_post</find>
     </findStrings>
+    <replaceStrings>
+      <replace>tema_ball</replace>
+    </replaceStrings>
   </component>
   <component name="Git.Settings">
     <option name="UPDATE_TYPE" value="MERGE" />
@@ -168,7 +203,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/spiders/totalball.py" />
         <option value="$PROJECT_DIR$/spiders/wangqiuls.py" />
         <option value="$PROJECT_DIR$/spiders/temaball.py" />
         <option value="$PROJECT_DIR$/spiders/wqguanjun.py" />
@@ -202,21 +236,22 @@
         <option value="$PROJECT_DIR$/spiders/hg3535_lanqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
         <option value="$PROJECT_DIR$/main_time.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/zq_jieshu.py" />
         <option value="$PROJECT_DIR$/spiders/lq_jieshu.py" />
-        <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/liansai.py" />
         <option value="$PROJECT_DIR$/spiders/guanjun.py" />
         <option value="$PROJECT_DIR$/text.py" />
         <option value="$PROJECT_DIR$/spiders/bq_jieshu.py" />
-        <option value="$PROJECT_DIR$/settings.py" />
         <option value="$PROJECT_DIR$/spiders/wqbodan.py" />
         <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/wangqiu.py" />
-        <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
         <option value="$PROJECT_DIR$/spiders/wq_jieshu.py" />
+        <option value="$PROJECT_DIR$/main.py" />
+        <option value="$PROJECT_DIR$/settings.py" />
+        <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
         <option value="$PROJECT_DIR$/ball_func.py" />
         <option value="$PROJECT_DIR$/pipelines.py" />
       </list>
@@ -259,7 +294,7 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../sports_collect/collectSports" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
@@ -509,6 +544,8 @@
       <workItem from="1559046451714" duration="22615000" />
       <workItem from="1559195646143" duration="22396000" />
       <workItem from="1559272619876" duration="1306000" />
+      <workItem from="1559296152679" duration="663000" />
+      <workItem from="1559524031484" duration="31662000" />
     </task>
     <task id="LOCAL-00001" summary="修改后,版本二">
       <created>1555727493584</created>
@@ -657,11 +694,18 @@
       <option name="project" value="LOCAL" />
       <updated>1559114920607</updated>
     </task>
-    <option name="localTasksCounter" value="22" />
+    <task id="LOCAL-00022" summary="'更新'">
+      <created>1559296171755</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1559296171755</updated>
+    </task>
+    <option name="localTasksCounter" value="23" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1605961000" />
+    <option name="totallyTimeSpent" value="1638286000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -674,13 +718,14 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.18710022" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.1913646" />
       <window_info id="Structure" order="1" sideWeight="0.2882615" side_tool="true" weight="0.1108742" />
       <window_info id="Favorites" order="2" sideWeight="0.5013405" side_tool="true" weight="0.108208954" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32832617" />
-      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" weight="0.45922747" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" weight="0.57403433" />
       <window_info anchor="bottom" id="Cvs" order="3" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="4" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="5" weight="0.32832617" />
@@ -689,15 +734,15 @@
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50586355" side_tool="true" weight="0.39055794" />
       <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49413645" weight="0.38626608" />
-      <window_info anchor="bottom" id="Run" order="11" sideWeight="0.4946695" weight="0.37982833" />
-      <window_info anchor="bottom" id="Python Console" order="12" sideWeight="0.49946696" weight="0.4356223" />
+      <window_info active="true" anchor="bottom" id="Run" order="11" sideWeight="0.4946695" visible="true" weight="0.40987125" />
+      <window_info anchor="bottom" id="Python Console" order="12" sideWeight="0.49946696" weight="0.28540772" />
       <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" />
       <window_info anchor="right" id="SciView" order="3" weight="0.32995737" />
       <window_info anchor="right" id="Database" order="4" weight="0.32995737" />
-      <window_info anchor="right" id="R Packages" order="5" weight="0.32889125" />
-      <window_info anchor="right" id="R Graphics" order="6" weight="0.32995737" />
+      <window_info anchor="right" id="R Graphics" order="5" weight="0.32995737" />
+      <window_info anchor="right" id="R Packages" order="6" weight="0.32889125" />
     </layout>
     <layout-to-restore>
       <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.13539445" />
@@ -802,6 +847,11 @@
           <line>84</line>
           <option name="timeStamp" value="4" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipelines.py</url>
+          <line>286</line>
+          <option name="timeStamp" value="17" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -829,15 +879,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/log/liansai_2019_5_22.log" />
-    <entry file="file://$PROJECT_DIR$/../../sports_scrapy - 副本/sports_scrapy - 副本/hg3535/spiders/hg3535_bq_status.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-90">
-          <caret line="166" column="23" selection-start-line="166" selection-start-column="12" selection-end-line="166" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/log/liansai_2019_5_23.log" />
     <entry file="file://$PROJECT_DIR$/log/bangqiu_2019_5_23.log" />
     <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/scrapy/utils/python.py">
       <provider selected="true" editor-type-id="text-editor">
@@ -954,16 +995,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="38" column="20" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="24" />
-          <folding>
-            <element signature="e#24#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status.py" />
     <entry file="file://$PROJECT_DIR$/main_notroll.py" />
     <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
@@ -1034,13 +1065,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/wqbodan.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="342">
-          <caret line="36" column="15" lean-forward="true" selection-start-line="36" selection-start-column="15" selection-end-line="36" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="234">
@@ -1051,20 +1075,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-774">
-          <caret line="21" selection-start-line="21" selection-end-line="22" selection-end-column="104" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/zq_jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="462">
@@ -1075,90 +1085,162 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/middlewares.py">
+    <entry file="file://$PROJECT_DIR$/jianting.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="486">
-          <caret line="137" column="10" selection-start-line="137" selection-start-column="8" selection-end-line="137" selection-end-column="34" />
+        <state>
           <folding>
-            <element signature="e#168#181#0" expanded="true" />
+            <element signature="e#0#9#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/jianting.py">
+    <entry file="file://$PROJECT_DIR$/spiders/wq_jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
+        <state relative-caret-position="360">
+          <caret line="20" column="168" selection-start-line="20" selection-start-column="168" selection-end-line="20" selection-end-column="168" />
           <folding>
-            <element signature="e#0#9#0" expanded="true" />
+            <element signature="e#24#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main.py">
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
+        <state relative-caret-position="846">
+          <caret line="453" column="50" selection-start-line="453" selection-start-column="45" selection-end-line="453" selection-end-column="54" />
           <folding>
-            <element signature="e#0#10#0" expanded="true" />
+            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#33118#41233#0" />
+            <element signature="e#41448#49794#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/wq_jieshu.py">
+    <entry file="file://$PROJECT_DIR$/settings.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="20" column="168" selection-start-line="20" selection-start-column="168" selection-end-line="20" selection-end-column="168" />
+        <state relative-caret-position="612">
+          <caret line="163" selection-start-line="163" selection-start-column="2" selection-end-line="164" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/middlewares.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="137" selection-start-line="137" selection-end-line="137" />
           <folding>
-            <element signature="e#24#39#0" expanded="true" />
+            <element signature="e#168#181#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/twisted/python/failure.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="244" selection-start-line="244" selection-end-line="244" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/twisted/internet/defer.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="653" selection-start-line="653" selection-end-line="653" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="489" selection-start-line="489" selection-end-line="489" />
+        <state relative-caret-position="-1039">
+          <caret line="47" selection-start-line="47" selection-end-line="47" />
           <folding>
             <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/settings.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="630">
-          <caret line="164" column="15" selection-start-line="164" selection-start-column="15" selection-end-line="164" selection-end-column="15" />
+        <state relative-caret-position="-6649">
+          <caret line="118" column="134" selection-start-line="118" selection-start-column="134" selection-end-line="118" selection-end-column="134" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipelines.py">
+    <entry file="file://$PROJECT_DIR$/spiders/wqbodan.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="18034">
-          <caret line="1533" column="12" selection-start-line="1533" selection-start-column="12" selection-end-line="1533" selection-end-column="12" />
+        <state relative-caret-position="504">
+          <caret line="36" column="15" lean-forward="true" selection-start-line="36" selection-start-column="15" selection-end-line="36" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-252">
+          <caret line="139" column="37" lean-forward="true" selection-start-line="139" selection-start-column="37" selection-end-line="139" selection-end-column="37" />
           <folding>
-            <element signature="e#0#11#0" expanded="true" />
+            <element signature="e#24#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="8046">
-          <caret line="453" column="50" selection-start-line="453" selection-start-column="45" selection-end-line="453" selection-end-column="54" />
+        <state relative-caret-position="310">
+          <caret line="177" column="52" selection-start-line="177" selection-start-column="36" selection-end-line="177" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/main.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
           <folding>
-            <element signature="e#24#35#0" expanded="true" />
-            <element signature="e#33118#41233#0" />
-            <element signature="e#41448#49794#0" />
+            <element signature="e#0#10#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/ball_func.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7938">
-          <caret line="443" column="16" selection-start-line="443" selection-start-column="6" selection-end-line="443" selection-end-column="16" />
+        <state relative-caret-position="180">
+          <caret line="53" column="43" lean-forward="true" selection-start-line="53" selection-start-column="40" selection-end-line="53" selection-end-column="49" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#34620#35398#0" />
+            <element signature="e#3638#4763#0" />
+            <element signature="e#4759#5852#0" />
+            <element signature="e#37743#39435#0" />
+            <element signature="e#39539#41983#0" />
+            <element signature="e#40800#41366#0" />
+            <element signature="e#41398#41964#0" />
+            <element signature="e#42189#43941#0" />
+            <element signature="e#11992#13441#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/json/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="123">
+          <caret line="226" selection-start-line="226" selection-end-line="226" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipelines.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="307">
+          <caret line="289" column="21" lean-forward="true" selection-start-line="289" selection-start-column="21" selection-end-line="289" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+            <element signature="e#16016#23080#0" />
+            <element signature="e#23234#30141#0" />
+            <element signature="e#30297#33238#0" />
+            <element signature="e#33392#39660#0" />
+            <element signature="e#39810#41670#0" />
+            <element signature="e#41821#50540#0" />
+            <element signature="e#43093#59596#0" />
+            <element signature="e#65460#78016#0" />
+            <element signature="e#65318#70468#0" />
+            <element signature="e#70518#83933#0" />
+            <element signature="e#84497#84609#0" />
           </folding>
         </state>
       </provider>

+ 316 - 441
hg3535/ball_func.py

@@ -49,349 +49,25 @@ def fuhao(f):
         return f
 
 
-# 篮球插入赔率 -----------------------------------------------------------------------------------------------------------
-def one_intodb(data1, data2, data3, cursor, redis_db):
-    if data1:
-        for key, value in data1.items():
-            if value:
-                for x, y in enumerate(value):
-                    new_hash = hash_func(match_id=data2['game_id'], odds_code=key, sort=x, p_id=data2['p_id'])
-                    r_hash = r_func(match_id=data2['game_id'], odds_code=key, sort=x, p_id=data2['p_id'],odd=y)
-                    odds_only = r_hash
-                    l_f = fuhao(str(data3[key][x]))
-                    if redis_db.hexists("hg3535_lanqiu", r_hash):
-                        pass
-                    else:
-                        redis_db.hset("hg3535_lanqiu", r_hash, 0)
-                        sql1 = "insert into st_lq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole, condition, expire_time,odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(sole) do update set utime=%s,odds=%s,expire_time=%s,odds_only=%s,condition=%s;"
-                        cursor.execute(sql1, (
-                            int(data2['league_id']), key, int(data2['game_id']), data2['utime'], data2['utime'], y,
-                            data2['p_id'], data2["p_code"], x, data2["source"], new_hash,
-                            l_f, data2['expire_time'], odds_only,data2['utime'], y, data2['expire_time'],
-                            odds_only, l_f))
-                        # 更新主队st_zq_odds_record表
-                        sql2 = "insert into st_lq_odds_record(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, condition,odds_only) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s);"
-                        cursor.execute(sql2, (
-                            int(data2['league_id']), key, int(data2['game_id']), data2['utime'], data2['utime'], y,
-                            data2['p_id'], data2["p_code"], x, data2["source"], l_f, odds_only))
-
-
-def two_intodb(data1, data2, data3, cursor, redis_db):
-    if data1:
-        for key, value in data1.items():
-            if value:
-                new_hash = hash_func(match_id=data2['game_id'], odds_code=data3 + key, sort=data2['sort'], p_id=data2['p_id'])
-
-                r_hash = r_func(match_id=data2['game_id'], odds_code=data3 + key, sort=data2['sort'], p_id=data2['p_id'],odd=value)
-                odds_only = r_hash
-                if redis_db.hexists("hg3535_lanqiu", r_hash):
-                    pass
-                else:
-                    redis_db.hset("hg3535_lanqiu", r_hash, 0)
-                    sql1 = "insert into st_lq_odds(lg_id, odds_code, match_id, ctime, utime,odds, p_id, p_code, sort, source, sole, condition, expire_time,odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(sole) do update set utime=%s,odds=%s,expire_time=%s,odds_only=%s,condition=%s;"
-                    cursor.execute(sql1, (
-                        int(data2['league_id']), data3, int(data2['game_id']), data2['utime'], data2['utime'], float(value),
-                        data2['p_id'], data2["p_code"], data2['sort'], data2["source"], new_hash,
-                        key, data2['expire_time'], odds_only,data2['utime'], value, data2['expire_time'], odds_only,key))
-                    # 更新主队st_zq_odds_record表
-                    sql2 = "insert into st_lq_odds_record(lg_id, odds_code, match_id, ctime, utime,odds, p_id, p_code, sort, source, condition,odds_only) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s);"
-                    cursor.execute(sql2, (
-                        int(data2['league_id']), data3, int(data2['game_id']), data2['utime'], data2['utime'], float(value),
-                        data2['p_id'], data2["p_code"], data2['sort'], data2["source"], key, odds_only))
-
-
-def three_intodb(data1, data2, cursor, redis_db):
-    if data1:
-        for key, value in data1.items():
-            if value:
-                new_hash = hash_func(match_id=data2['game_id'], odds_code=key, sort=data2['sort'], p_id=data2['p_id'])
-
-                r_hash = r_func(match_id=data2['game_id'], odds_code=key, sort=data2['sort'], p_id=data2['p_id'],odd=value)
-                odds_only = r_hash
-                if redis_db.hexists("hg3535_lanqiu", r_hash):
-                    pass
-                else:
-                    redis_db.hset("hg3535_lanqiu", r_hash, 0)
-                    sql1 = "insert into st_lq_odds(lg_id, odds_code, match_id, ctime, utime,odds, p_id, p_code, sort, source, sole, expire_time,odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s, %s,%s) on conflict(sole) do update set utime=%s,odds=%s,expire_time=%s,odds_only=%s;"
-                    cursor.execute(sql1, (
-                        int(data2['league_id']), key, int(data2['game_id']), data2['utime'], data2['utime'], float(value),
-                        data2['p_id'], data2["p_code"], data2['sort'], data2["source"], new_hash, data2['expire_time'],
-                        odds_only,data2['utime'], value, data2['expire_time'], odds_only))
-                    # 更新主队st_zq_odds_record表
-                    sql2 = "insert into st_lq_odds_record(lg_id, odds_code, match_id, ctime, utime,odds, p_id, p_code, sort, source,odds_only) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s);"
-                    cursor.execute(sql2, (
-                        int(data2['league_id']), key, int(data2['game_id']), data2['utime'], data2['utime'], float(value),
-                        data2['p_id'], data2["p_code"], data2['sort'], data2["source"], odds_only))
-
-
-
-# 插入篮球赛事表
-def into_competition(data, cursor):
-    Competition_sql = "insert into st_lq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time, ctime, utime, tag, type, source,expire_time,is_today,is_morningplate,is_stringscene) values (%s, %s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s,%s, %s, %s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_today=%s,is_morningplate=%s,is_stringscene=%s;"
-    cursor.execute(Competition_sql, (
-        data['team_home'], data['team_guest'], data['league_id'], data['game_id'], data['match_date'],
-        data['match_time'],
-        data['utime'], data['utime'], data['number'], data['pt'], data["source"], data['expire_time'], data['is_today'],
-        data['is_morningplate'], data['is_stringscene'], data['number'], data['expire_time'], data['is_today'],
-        data['is_morningplate'], data['is_stringscene']))
-
-
-# 插入足球赛事表----------------------------------------------------------------------------------------------------------
-def zqone_competition(data, cursor):
-    Competition_sql = "insert into st_zq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time, ctime, utime, tag,source, expire_time,is_today,us_time) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s,%s,%s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_today=%s,us_time=%s;"
-    cursor.execute(Competition_sql, (
-        data['team_home'], data['team_guest'], data['league_id'], data['game_id'], data['match_date'],
-        data['match_time'],
-        data['utime'], data['utime'], data['number'], data["source"], data['expire_time'], data['is_today'],
-        data['us_time'], data['number'], data['expire_time'], data['is_today'],data['us_time']))
-
-
-def zqtwo_competition(data, cursor):
-    Competition_sql = "insert into st_zq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time, ctime, utime, tag,source, expire_time,is_morningplate,us_time) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s,%s,%s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_morningplate=%s,us_time=%s;"
-    cursor.execute(Competition_sql, (
-        data['team_home'], data['team_guest'], data['league_id'], data['game_id'], data['match_date'],
-        data['match_time'],
-        data['utime'], data['utime'], data['number'], data["source"], data['expire_time'], data['is_morningplate'],
-        data['us_time'], data['number'], data['expire_time'], data['is_morningplate'], data['us_time']))
-
-
-def zqthree_competition(data, cursor):
-    Competition_sql = "insert into st_zq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time, ctime, utime, tag,source, expire_time,is_stringscene,us_time) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s,%s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_stringscene=%s,us_time=%s;"
-    cursor.execute(Competition_sql, (
-        data['team_home'], data['team_guest'], data['league_id'], data['game_id'], data['match_date'],
-        data['match_time'],
-        data['utime'], data['utime'], data['number'], data["source"], data['expire_time'], data['is_stringscene'],
-        data['us_time'], data['number'], data['expire_time'], data['is_stringscene'], data['us_time']))
-
-
-# 足球 插入赔率 让球 大小-------------------------------------------------------------------------------------------------
-def zqone_intodb(data1, data2, data3, data4, cursor, redis_db):
-    if data1:
-        for index, value in enumerate(data1):
-            if value:
-                new_hash = hash_func(match_id=data2['game_id'], odds_code=data3, sort=index, p_id=data2['p_id'])
-                r_hash = r_func(match_id=data2['game_id'], odds_code=data3, sort=index, p_id=data2['p_id'], odd=value)
-                odds_only = r_hash
-                f1 = fuhao(str(data4[index]))
-                if redis_db.hexists("hg3535_zuqiu", r_hash):
-                    pass
-                else:
-                    redis_db.hset("hg3535_zuqiu", r_hash, 0)
-                    sql1 = "insert into st_zq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole, condition, expire_time,odds_only) values (%s,%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) on conflict(sole) do update set utime=%s,odds=%s,expire_time=%s,odds_only=%s,condition=%s;"
-                    cursor.execute(sql1, (
-                        int(data2['league_id']), data3, int(data2['game_id']), data2['utime'], data2['utime'], float(value),
-                        data2['p_id'], data2["p_code"], index, data2["source"], new_hash,
-                        f1, data2['expire_time'], odds_only,data2['utime'], value, data2['expire_time'],
-                        odds_only, f1))
-
-                    # 更新主队st_zq_odds_record表
-                    sql2 = "insert into st_zq_odds_record(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, condition,odds_only) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s);"
-                    cursor.execute(sql2, (
-                        int(data2['league_id']), data3, int(data2['game_id']), data2['utime'], data2['utime'], float(value),
-                        data2['p_id'], data2["p_code"], index, data2["source"], f1, odds_only))
-
-
-
-# 足球 插入赔率  独赢 单双
-def zqtwo_intodb(data1, data2, data3, data4, cursor, redis_db):
-    if data1:
-        new_hash = hash_func(match_id=data2['game_id'], odds_code=data3, sort=data2['sort'], p_id=data2['p_id'])
-        r_hash = r_func(match_id=data2['game_id'], odds_code=data3, sort=data2['sort'], p_id=data2['p_id'],
-                        odd=data1)
-        odds_only = r_hash
-        if redis_db.hexists("hg3535_zuqiu", r_hash):
-            pass
-        else:
-            redis_db.hset("hg3535_zuqiu", r_hash, 0)
-            sql1 = "insert into st_zq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole, condition, expire_time, odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) on conflict(sole) do update set utime=%s,odds=%s,expire_time=%s,odds_only=%s,condition=%s;"
-            cursor.execute(sql1, (
-                int(data2['league_id']), data3, int(data2['game_id']), data2['utime'], data2['utime'], data1,
-                data2['p_id'], data2["p_code"], data2['sort'], data2["source"], new_hash,
-                data4, data2['expire_time'], odds_only, data2['utime'], data1, data2['expire_time'], odds_only,data4))
-            # 更新主队st_zq_odds_record表
-            sql2 = "insert into st_zq_odds_record(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, condition,odds_only) values (%s,%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s);"
-            cursor.execute(sql2, (
-                int(data2['league_id']), data3, int(data2['game_id']), data2['utime'], data2['utime'], data1,
-                data2['p_id'], data2["p_code"], data2['sort'], data2["source"], data4, odds_only))
-
-
-def gjz_into(data, cursor, r_hash, s_hash, redis_db):
-    if redis_db.hexists('hg3535_guanjun', r_hash):
-        pass
-    else:
-        redis_db.hset('hg3535_guanjun', r_hash, 0)
-        # if pt == 1:
-        sql = "insert into st_zq_odds(lg_id, odds_code, match_id, ctime, utime,odds, p_id, p_code, team, type, source, sole, expire_time,odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s,%s, %s,%s, %s, %s, %s) on conflict(sole) do update set utime = %s,odds = %s,expire_time=%s,odds_only=%s;"
-        cursor.execute(sql, (
-            int(data['league_id']), data['new_champion'], int(data['game_id']), data['utime'], data['utime'],
-            data['champion_team'], data['p_id'], data['new_league_name'],
-            data['tema_home'], 1, "hg3535", data['new_hash'], data['expire_time'], data['odds_only'],data['utime'],
-            data['champion_team'], data['expire_time'], data['odds_only']))
-        # 插入st_zq_odds_record表
-        new_sql = "insert into st_zq_odds_record(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, team, type, source,odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s)"
-        cursor.execute(new_sql, (
-            int(data['league_id']), data['new_champion'], int(data['game_id']), data['utime'], data['utime'],
-            data['champion_team'], data['p_id'], data['new_league_name'],
-            data['tema_home'], 1, "hg3535", data['odds_only']))
-
-    if redis_db.hexists('hg3535_liansai', s_hash):
-        pass
-    else:
-        redis_db.hset('hg3535_liansai', s_hash, 0)
-        league_sql = "insert into st_zq_league(name_chinese, lg_id,last_time) values (%s, %s, %s) on conflict(lg_id) do update set last_time = %s,source=%s;"
-        cursor.execute(league_sql, (data['league_name'], data['league_id'], data['time3'], data['time3'], "hg3535"))
-
-
-def gjl_into(data, cursor, r_hash, s_hash, redis_db):
-    if redis_db.hexists('hg3535_guanjun', r_hash):
-        pass
-    else:
-        redis_db.hset('hg3535_guanjun', r_hash, 0)
-        sql = "insert into st_lq_odds(lg_id, odds_code, match_id, ctime, utime,odds, p_id, p_code, team, type, source, sole, expire_time,odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s,%s, %s,%s, %s, %s, %s) on conflict(sole) do update set utime = %s,odds = %s,expire_time=%s,odds_only=%s;"
-        cursor.execute(sql, (
-            int(data['league_id']), data['new_champion'], int(data['game_id']), data['utime'], data['utime'],
-            data['champion_team'], data['p_id'], data['new_league_name'],
-            data['tema_home'], 1, "hg3535", data['new_hash'], data['expire_time'], data['odds_only'],data['utime'],
-            data['champion_team'], data['expire_time'], data['odds_only']))
-        # 插入st_zq_odds_record表
-        new_sql = "insert into st_lq_odds_record(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, team, type, source,odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s)"
-        cursor.execute(new_sql, (
-            int(data['league_id']), data['new_champion'], int(data['game_id']), data['utime'], data['utime'],
-            data['champion_team'], data['p_id'], data['new_league_name'],
-            data['tema_home'], 1, "hg3535", data['odds_only']))
-    # 插入st_zq_league表
-    if redis_db.hexists('hg3535_liansai', s_hash):
-        pass
-    else:
-        redis_db.hset('hg3535_liansai', s_hash, 0)
-        league_sql = "insert into st_lq_league(name_chinese, lg_id,last_time) values (%s, %s, %s) on conflict(lg_id) do update set last_time = %s,source=%s;"
-        cursor.execute(league_sql, (data['league_name'], data['league_id'], data['time3'], data['time3'], "hg3535"))
-
-
-def gjw_into(data, cursor, r_hash, s_hash, redis_db):
-    if redis_db.hexists('hg3535_guanjun', r_hash):
-        pass
-    else:
-        redis_db.hset('hg3535_guanjun', r_hash, 0)
-        sql = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime,odds, p_id, p_code, team, type, source, sole, expire_time,odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s,%s, %s,%s, %s, %s, %s) on conflict(sole) do update set utime = %s,odds = %s,expire_time=%s,odds_only=%s;"
-        cursor.execute(sql, (
-            int(data['league_id']), data['new_champion'], int(data['game_id']), data['utime'], data['utime'],
-            data['champion_team'], data['p_id'], data['new_league_name'],
-            data['tema_home'], 1, "hg3535", data['new_hash'], data['expire_time'], data['odds_only'],data['utime'],
-            data['champion_team'], data['expire_time'], data['odds_only']))
-        # 插入st_zq_odds_record表
-        new_sql = "insert into st_wq_odds_record(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, team, type, source,odds_only) values (%s,%s, %s, %s, %s, %s, %s, %s, %s,%s, %s, %s)"
-        cursor.execute(new_sql, (
-            int(data['league_id']), data['new_champion'], int(data['game_id']), data['utime'], data['utime'],
-            data['champion_team'], data['p_id'], data['new_league_name'],
-            data['tema_home'], 1, "hg3535", data['odds_only']))
-    # 插入st_zq_league表
-    if redis_db.hexists('hg3535_liansai', s_hash):
-        pass
-    else:
-        redis_db.hset('hg3535_liansai', s_hash, 0)
-        league_sql = "insert into st_wq_league(name_chinese, lg_id,last_time) values (%s, %s, %s) on conflict(lg_id) do update set last_time = %s,source=%s;"
-        cursor.execute(league_sql, (data['league_name'], data['league_id'], data['time3'], data['time3'], "hg3535"))
-
-
-def gjb_into(data, cursor, r_hash, s_hash, redis_db):
-    if redis_db.hexists('hg3535_guanjun', r_hash):
-        pass
-    else:
-        redis_db.hset('hg3535_guanjun', r_hash, 0)
-        sql = "insert into st_bq_odds(lg_id, odds_code, match_id, ctime, utime,odds, p_id, p_code, team, type, source, sole, expire_time,odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s,%s, %s,%s, %s, %s, %s) on conflict(sole) do update set utime = %s,odds = %s,expire_time=%s,odds_only=%s;"
-        cursor.execute(sql, (
-            int(data['league_id']), data['new_champion'], int(data['game_id']), data['utime'], data['utime'],
-            data['champion_team'], data['p_id'], data['new_league_name'],
-            data['tema_home'], 1, "hg3535", data['new_hash'], data['expire_time'], data['odds_only'],data['utime'],
-            data['champion_team'], data['expire_time'], data['odds_only']))
-        # 插入st_zq_odds_record表
-        new_sql = "insert into st_bq_odds_record(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, team, type, source,odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s)"
-        cursor.execute(new_sql, (
-            int(data['league_id']), data['new_champion'], int(data['game_id']), data['utime'], data['utime'],
-            data['champion_team'], data['p_id'], data['new_league_name'],
-            data['tema_home'], 1, "hg3535", data['odds_only']))
-    # 插入st_zq_league表
-    if redis_db.hexists('hg3535_liansai', s_hash):
-        pass
-    else:
-        redis_db.hset('hg3535_liansai', s_hash, 0)
-        league_sql = "insert into st_bq_league(name_chinese, lg_id,last_time) values (%s, %s, %s) on conflict(lg_id) do update set last_time = %s,source=%s;"
-        cursor.execute(league_sql, (data['league_name'], data['league_id'], data['time3'], data['time3'], "hg3535"))
-
-
-# 网球 插入赔率----------------------------------------------------------------------------------------------------------
-def wqone_intodb(data1, data2, data3, cursor, redis_db):
-    if data1:
-        for key, value in data1.items():
-            if value:
-                new_hash = hash_func(match_id=data2['game_id'], odds_code=key, sort=data2['sort'], p_id=data2['p_id'])
-                r_hash = r_func(match_id=data2['game_id'], odds_code=key, sort=data2['sort'], p_id=data2['p_id'], odd=value)
-                odds_only = r_hash
-                w_f = fuhao(str(data3[key]))
-                if redis_db.hexists("hg3535_wangqiu", r_hash):
-                    pass
-                else:
-                    redis_db.hset("hg3535_wangqiu", r_hash, 0)
-                    sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole, condition, expire_time,odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(sole) do update set utime=%s,odds=%s,expire_time=%s,odds_only=%s,condition=%s;"
-                    cursor.execute(sql1, (
-                        int(data2['league_id']), key, int(data2['game_id']), data2['utime'], data2['utime'], value,
-                        data2['p_id'], data2["p_code"], data2['sort'], data2["source"], new_hash,
-                        w_f, data2['expire_time'], odds_only,data2['utime'], value, data2['expire_time'],
-                        odds_only, w_f))
-                    # 更新主队st_zq_odds_record表
-                    sql2 = "insert into st_wq_odds_record(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, condition,odds_only) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s);"
-                    cursor.execute(sql2, (
-                        int(data2['league_id']), key, int(data2['game_id']), data2['utime'], data2['utime'], value,
-                        data2['p_id'], data2["p_code"], data2['sort'], data2["source"], w_f, odds_only))
-
-
-# 棒球 插入赔率----------------------------------------------------------------------------------------------------------
-def bqone_intodb(data1, data2, data3, cursor, redis_db):
-    if data1:
-        for key, value in data1.items():
-            if value:
-                new_hash = hash_func(match_id=data2['game_id'], odds_code=key, sort=data2['sort'], p_id=data2['p_id'])
-                r_hash = r_func(match_id=data2['game_id'], odds_code=key, sort=data2['sort'], p_id=data2['p_id'], odd=value)
-                odds_only = r_hash
-                b_f = fuhao(str(data3[key]))
-                if redis_db.hexists("hg3535_bangqiu", r_hash):
-                    pass
-                else:
-                    redis_db.hset("hg3535_bangqiu", r_hash, 0)
-                    sql1 = "insert into st_bq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole, condition, expire_time,odds_only) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(sole) do update set utime=%s,odds=%s,expire_time=%s,odds_only=%s,condition=%s"
-                    cursor.execute(sql1, (
-                        int(data2['league_id']), key, int(data2['game_id']), data2['utime'], data2['utime'], value,
-                        data2['p_id'], data2["p_code"], data2['sort'], data2["source"], new_hash,
-                        b_f, data2['expire_time'], odds_only, data2['utime'], value,data2['expire_time'],
-                        odds_only, b_f))
-                    # 更新主队st_zq_odds_record表
-                    sql2 = "insert into st_bq_odds_record(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, condition,odds_only) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s, %s);"
-                    cursor.execute(sql2, (
-                        int(data2['league_id']), key, int(data2['game_id']), data2['utime'], data2['utime'], value,
-                        data2['p_id'], data2["p_code"], data2['sort'], data2["source"], b_f, odds_only))
-
-
-
 def get_pcode(corner_ball, code):
-    code_dict = {'concede_size': 1, 'capot': 2, 'two_sides': 3, 'total_goal': 4, 'half_full': 5, 'bodan': 6,
-                 'first_last_ball': 7, 'temaball': 11}
-    if corner_ball == "角球":
-        p_code = "corner_ball"
-        p_id = 9
-    elif corner_ball == "会晋级":
-        p_code = "promotion"
-        p_id = 10
-    elif corner_ball == "罚牌数":
-        p_code = "Penalty_card"
-        p_id = 12
+    code_dict = {'concede': 1, 'capot': 2, 'two_sides': 3, 'total_goal': 4, 'half_full': 5, 'bodan': 6,
+                 'first_last_ball': 7, 'tema_ball': 11, 'goal_size': 13}
+    if corner_ball:
+        if corner_ball == "角球":
+            p_code = "corner_ball"
+            p_id = 9
+        elif corner_ball == "会晋级":
+            p_code = "promotion"
+            p_id = 10
+        elif corner_ball == "罚牌数":
+            p_code = "Penalty_card"
+            p_id = 12
+        else:
+            p_code = code
+            p_id = code_dict[code]
+        return p_code, p_id
     else:
-        p_code = code
-        p_id = code_dict[code]
-    return p_code, p_id
-
-
-
+        return code, code_dict[code]
 
 
 # ----------------------------------------------------------------------------------------------------------------------
@@ -405,102 +81,6 @@ def new_times(ctime):
     return match_date,match_time
 
 
-def zqone_intodbs(data1, data2, data3, data4, cursor, redis_db):
-    if data1:
-        for index, value in enumerate(data1):
-            if value:
-                new_hash = hash_func(match_id=data2['game_id'], odds_code=data3, sort=index, p_id=data2['p_id'])
-                r_hash = r_func(match_id=data2['game_id'], odds_code=data3, sort=index, p_id=data2['p_id'], odd=value)
-                odds_only = r_hash
-                if redis_db.hexists("hg3535_zuqiu", r_hash):
-                    pass
-                else:
-                    redis_db.hset("hg3535_zuqiu", r_hash, 0)
-                    # if data2['pt'] == 0:
-                    sql1 = "insert into st_zq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole, condition, expire_time,odds_only,is_rollball) values (%s,%s,%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) on conflict(sole) do update set utime=%s,odds=%s,expire_time=%s,odds_only=%s,condition=%s;"
-                    cursor.execute(sql1, (
-                        int(data2['league_id']), data3, int(data2['game_id']), data2['utime'], data2['utime'], float(value),
-                        data2['p_id'], data2["p_code"], index, data2["source"], new_hash,
-                        data4[index], data2['expire_time'], odds_only, 1, data2['utime'], value, data2['expire_time'],
-                        odds_only,data4[index]))
-
-                    # 更新主队st_zq_odds_record表
-                    sql2 = "insert into st_zq_odds_record(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, condition,odds_only,is_rollball) values (%s,%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s);"
-                    cursor.execute(sql2, (
-                        int(data2['league_id']), data3, int(data2['game_id']), data2['utime'], data2['utime'], float(value),
-                        data2['p_id'], data2["p_code"], index, data2["source"], data4[index], odds_only,1))
-                    #写入数据设置默认值竟然不生效 待看
-                    sql3 = "insert into st_zq_result(match_id, match_score, home_team, guest_team, home_score, guest_score, all_goal, status, first_score, last_score, match_winer, update_time, match_time,match_process,tag,lg_id,u_home_score,u_guest_score,source,p_code) values (%s,%s,%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s,%s,%s,%s,%s) on conflict(match_id) do update set update_time=%s,match_score=%s,match_time=%s,match_process=%s,home_score=%s,guest_score=%s;"
-                    cursor.execute(sql3, (
-                        int(data2['game_id']), data2['match_score'],data2['team_home'],data2['team_guest'],data2['score_home'],data2['score_guest'],data2['number'],1,'','','',data2['utime'],data2['time_game'],data2['half_way'],data2['number'],int(data2['league_id']),0,0,'hg3535',data2["p_code"],data2['utime'],data2['match_score'],data2['time_game'],data2['half_way'],data2['score_home'],data2['score_guest']
-                    ))
-
-                    sql4 = "insert into st_zq_result_record(lg_id, home_team, guest_team, home_score, guest_score, all_goal, status, first_score, last_score, match_score, match_winer, update_time, match_time,match_process,tag,match_id,source,p_code) values (%s,%s,%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s,%s,%s);"
-                    cursor.execute(sql4, (
-                        int(data2['league_id']), data2['team_home'],data2['team_guest'],data2['score_home'],data2['score_guest'],data2['number'],1,'','',data2['match_score'],'',data2['utime'],data2['time_game'],data2['half_way'],data2['number'],int(data2['game_id']),'hg3535',data2["p_code"]
-                    ))
-
-
-def zqtwo_intodbs(data1, data2, data3, data4, cursor, redis_db):
-    if data1:
-        new_hash = hash_func(match_id=data2['game_id'], odds_code=data3, sort=data2['sort'], p_id=data2['p_id'])
-        r_hash = r_func(match_id=data2['game_id'], odds_code=data3, sort=data2['sort'], p_id=data2['p_id'],
-                        odd=data1)
-        odds_only = r_hash
-        if redis_db.hexists("hg3535_zuqiu", r_hash):
-            pass
-        else:
-            redis_db.hset("hg3535_zuqiu", r_hash, 0)
-            # if data2['pt'] == 1:
-            sql1 = "insert into st_zq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole, condition, expire_time, odds_only,is_today) values (%s,%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) on conflict(sole) do update set utime=%s,odds=%s,expire_time=%s,odds_only=%s,condition=%s;"
-            cursor.execute(sql1, (
-                int(data2['league_id']), data3, int(data2['game_id']), data2['utime'], data2['utime'], data1,
-                data2['p_id'], data2["p_code"], data2['sort'], data2["source"], new_hash,
-                data4, data2['expire_time'], odds_only, 1, data2['utime'], data1, data2['expire_time'], odds_only,data4))
-            # 更新主队st_zq_odds_record表
-            sql2 = "insert into st_zq_odds_record(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, condition,odds_only, is_today) values (%s,%s,%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s);"
-            cursor.execute(sql2, (
-                int(data2['league_id']), data3, int(data2['game_id']), data2['utime'], data2['utime'], data1,
-                data2['p_id'], data2["p_code"], data2['sort'], data2["source"], data4, odds_only, 1))
-
-            sql3 = "insert into st_zq_result(match_id, match_score, home_team, guest_team, home_score, guest_score, all_goal, status, first_score, last_score, match_winer, update_time, match_time,match_process,tag,lg_id,u_home_score,u_guest_score,source,p_code) values (%s,%s,%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s,%s,%s,%s,%s) on conflict(match_id) do update set update_time=%s,match_score=%s,match_time=%s,match_process=%s,home_score=%s,guest_score=%s;"
-            cursor.execute(sql3, (
-                    int(data2['game_id']), data2['match_score'],data2['team_home'],data2['team_guest'],data2['score_home'],data2['score_guest'],data2['number'],1,'','','',data2['utime'],data2['time_game'],data2['half_way'],data2['number'],int(data2['league_id']),0,0,'hg3535',data2["p_code"],data2['utime'],data2['match_score'],data2['time_game'],data2['half_way'],data2['score_home'],data2['score_guest']
-                ))
-
-            sql4 = "insert into st_zq_result_record(lg_id, home_team, guest_team, home_score, guest_score, all_goal, status, first_score, last_score, match_score, match_winer, update_time, match_time,match_process,tag,match_id,source,p_code) values (%s,%s,%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s,%s,%s);"
-            cursor.execute(sql4, (
-                    int(data2['league_id']), data2['team_home'],data2['team_guest'],data2['score_home'],data2['score_guest'],data2['number'],1,'','',data2['match_score'],'',data2['utime'],data2['time_game'],data2['half_way'],data2['number'],int(data2['game_id']),'hg3535',data2["p_code"]
-                ))
-
-
-def zqone_competitions(data, cursor):
-    Competition_sql = "insert into st_zq_competition(home_team, guest_team, lg_id, status, match_id, match_date, match_time, ctime, utime,tag, source,type,expire_time,us_time,is_rollball) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s,%s,%s,%s,%s,%s) on conflict(match_id) do update set utime = %s,status=%s,tag=%s,expire_time=%s;"
-    cursor.execute(Competition_sql, (
-        data['team_home'], data['team_guest'], data['league_id'],1,data['game_id'], data['match_date'],
-        data['match_time'],
-        data['utime'], data['utime'], data['number'], data["source"], 4,data['expire_time'], data['us_time'],data['is_rollball'],
-        data['utime'], 1, data['number'], data['expire_time']))
-
-
-def get_pcodes(corner_ball, code):
-    code_dict = {'concede_size': 1, 'capot': 2, 'two_sides': 3, 'total_goal': 4, 'half_full': 5, 'bodan': 6,
-                 'first_last_ball': 7, 'temaball': 11}
-    if corner_ball == "角球":
-        p_code = "corner_ball"
-        p_id = 9
-    elif corner_ball == "会晋级":
-        p_code = "promotion"
-        p_id = 10
-    elif corner_ball == "罚牌数":
-        p_code = "Penalty_card"
-        p_id = 12
-    else:
-        p_code = code
-        p_id = code_dict[code]
-    return p_code, p_id
-
-
 def news_times(ctime):
     time1 = time.mktime(time.strptime(ctime, '%Y-%m-%d %H:%M:%S')) + 43200
     time2 = time.localtime(time1)
@@ -512,7 +92,7 @@ def news_times(ctime):
     return match_date, match_time, time3
 
 
-def one_post(data, match_id, odds_code, p_id, league_id, p_code, condition, game_code):
+def one_post(data, match_id, odds_code, p_id, league_id, p_code, condition, game_code, zq_odds):
     if data:
         new_hash = hash_func(match_id=match_id, odds_code=odds_code, sort=0, p_id=p_id)
         r_hash = r_func(match_id=match_id, odds_code=odds_code, sort=0, p_id=p_id, odd=data)
@@ -535,11 +115,13 @@ def one_post(data, match_id, odds_code, p_id, league_id, p_code, condition, game
                 "team": ""
             }
         }
-        return payload
+        zq_odds.append(payload)
+        # return payload
 
 
-def two_post(data, match_id, odds_code, p_id, league_id, p_code, condition, game_code):
+def two_post(data, match_id, odds_code, p_id, league_id, p_code, condition, game_code, zq_odds):
     if data:
+        # odds_list = []
         for index, value in enumerate(data):
             if value:
                 s_hash = hash_func(match_id=match_id, odds_code=odds_code, sort=0, p_id=p_id)
@@ -564,4 +146,297 @@ def two_post(data, match_id, odds_code, p_id, league_id, p_code, condition, game
                         "team": ""
                     }
                 }
-                return payload
+                zq_odds.append(payload)
+        #         odds_list.append(payload)
+        # return odds_list
+
+
+def three_post(data, match_id, p_id, league_id, p_code, condition, game_code, zq_odds):
+    if data:
+        # odd_list = []
+        for key, value in data.items():
+            if value:
+                s_hash = hash_func(match_id=match_id, odds_code=key, sort=0, p_id=p_id)
+                o_hash = r_func(match_id=match_id, odds_code=key, sort=0, p_id=p_id, odd=value)
+                f1 = fuhao(str(condition[key]))
+                payload = {
+                    "game_code": game_code,
+                    "title": "odds",
+                    "data": {
+                        "match_id": match_id,
+                        "lg_id": league_id,
+                        "odds_code": key,
+                        "status": 0,
+                        "sort": 0,
+                        "p_code": p_code,
+                        "odds": value,
+                        "condition": f1,
+                        "odds_only": o_hash,
+                        "sole": s_hash,
+                        "source": "hg3535",
+                        "type": 0,
+                        "team": ""
+                    }
+                }
+                zq_odds.append(payload)
+        #         odd_list.append(payload)
+        # return odd_list
+
+
+def gs_post(ball, league_id, league_name, data_game):
+    if ball == "足球":
+        n_gameid = int('1' + str(league_id))
+        payload = {
+            "game_code": "zq",
+            "title": "competition",
+            "data": {
+                "home_team": league_name,
+                "lg_id": league_id,
+                "status": 0,
+                "match_id": n_gameid,
+                "source": "hg3535",
+                "us_time": data_game
+                }
+        }
+    elif ball == "篮球":
+        n_gameid = int('1' + str(league_id))
+        payload = {
+            "game_code": "zq",
+            "title": "competition",
+            "data": {
+                "home_team": league_name,
+                "lg_id": league_id,
+                "status": 0,
+                "match_id": n_gameid,
+                "source": "hg3535",
+                "us_time": data_game
+            }
+        }
+    elif ball == "网球":
+        n_gameid = int('1' + str(league_id))
+        payload = {
+            "game_code": "zq",
+            "title": "competition",
+            "data": {
+                "home_team": league_name,
+                "lg_id": league_id,
+                "status": 0,
+                "match_id": n_gameid,
+                "source": "hg3535",
+                "us_time": data_game
+            }
+        }
+    elif ball == "棒球":
+        n_gameid = int('1' + str(league_id))
+        payload = {
+            "game_code": "zq",
+            "title": "competition",
+            "data": {
+                "home_team": league_name,
+                "lg_id": league_id,
+                "status": 0,
+                "match_id": n_gameid,
+                "source": "hg3535",
+                "us_time": data_game
+            }
+        }
+    return payload
+
+
+def go_post(ball, league_id, new_champion, new_league_name, value, r_hash, new_hash, tema_home):
+    game_id = int('1' + str(league_id))
+    if ball == "足球":
+        payload = {
+            "game_code": "zq",
+            "title": "odds",
+            "data": {
+                "match_id": league_id,
+                "lg_id": game_id,
+                "odds_code": new_champion,
+                "status": 0,
+                "sort": 0,
+                "p_code": new_league_name,
+                "odds": value,
+                "condition": None,
+                "odds_only": r_hash,
+                "sole": new_hash,
+                "source": 'hg3535',
+                "type": 1,
+                "team": tema_home
+            }
+        }
+    elif ball == "篮球":
+        payload = {
+            "game_code": "lq",
+            "title": "odds",
+            "data": {
+                "match_id": league_id,
+                "lg_id": game_id,
+                "odds_code": new_champion,
+                "status": 0,
+                "sort": 0,
+                "p_code": new_league_name,
+                "odds": value,
+                "condition": None,
+                "odds_only": r_hash,
+                "sole": new_hash,
+                "source": "hg3535",
+                "type": 1,
+                "team": tema_home
+            }
+        }
+    elif ball == "网球":
+        payload = {
+            "game_code": "wq",
+            "title": "odds",
+            "data": {
+                "match_id": league_id,
+                "lg_id": game_id,
+                "odds_code": new_champion,
+                "status": 0,
+                "sort": 0,
+                "p_code": new_league_name,
+                "odds": value,
+                "condition": None,
+                "odds_only": r_hash,
+                "sole": new_hash,
+                "source": "hg3535",
+                "type": 1,
+                "team": tema_home
+            }
+        }
+    elif ball == "棒球":
+        payload = {
+            "game_code": "bq",
+            "title": "odds",
+            "data": {
+                "match_id": league_id,
+                "lg_id": game_id,
+                "odds_code": new_champion,
+                "status": 0,
+                "sort": 0,
+                "p_code": new_league_name,
+                "odds": value,
+                "condition": None,
+                "odds_only": r_hash,
+                "sole": new_hash,
+                "source": "hg3535",
+                "type": 1,
+                "team": tema_home
+            }
+        }
+    return payload
+
+
+def guanl_post(ball, league_name, league_id, time3):
+    if ball == "足球":
+        payload = {
+            "game_code": "zq",
+            "title": "league",
+            "data": {
+                "name_chinese": league_name,
+                "kind": "1",
+                "match_mode": "1",
+                "if_stop": "0",
+                # "belong": None,
+                "last_time": time3,
+                "lg_id": league_id,
+                "source": "hg3535"
+                }
+            }
+    elif ball == "篮球":
+        payload = {
+            "game_code": "zq",
+            "title": "league",
+            "data": {
+                "name_chinese": league_name,
+                "kind": "1",
+                "match_mode": "1",
+                "if_stop": "0",
+                # "belong": None,
+                "last_time": time3,
+                "lg_id": league_id,
+                "source": "hg3535"
+            }
+        }
+    elif ball == "网球":
+        payload = {
+            "game_code": "zq",
+            "title": "league",
+            "data": {
+                "name_chinese": league_name,
+                "kind": "1",
+                "match_mode": "1",
+                "if_stop": "0",
+                # "belong": None,
+                "last_time": time3,
+                "lg_id": league_id,
+                "source": "hg3535"
+            }
+        }
+    elif ball == "棒球":
+        payload = {
+            "game_code": "zq",
+            "title": "league",
+            "data": {
+                "name_chinese": league_name,
+                "kind": "1",
+                "match_mode": "1",
+                "if_stop": "0",
+                # "belong": None,
+                "last_time": time3,
+                "lg_id": league_id,
+                "source": "hg3535"
+            }
+        }
+    return payload
+
+
+def liansai(area_name, name_chinese, st_league, area_dict, game_code, qiu):
+    if area_name in area_dict:
+        payload = {
+            "game_code": game_code,
+            "title": "league",
+            "data": {
+                "name_chinese": name_chinese,
+                "kind": "1",
+                "match_mode": "1",
+                "if_stop": "0",
+                "belong": area_name,
+                "last_time": None,
+                "lg_id": st_league,
+                "source": "hg3535"
+            }
+        }
+    else:
+        if area_name == qiu:
+            payload = {
+                "game_code": game_code,
+                "title": "league",
+                "data": {
+                    "name_chinese": name_chinese,
+                    "kind": "1",
+                    "match_mode": "1",
+                    "if_stop": "0",
+                    "belong": " ",
+                    "last_time": None,
+                    "lg_id": st_league,
+                    "source": "hg3535"
+                }
+            }
+        else:
+            payload = {
+                "game_code": game_code,
+                "title": "league",
+                "data": {
+                    "name_chinese": name_chinese,
+                    "kind": "1",
+                    "match_mode": "1",
+                    "if_stop": "0",
+                    "belong": area_name,
+                    "last_time": None,
+                    "lg_id": st_league,
+                    "source": "hg3535"
+                }}
+        return payload
+

+ 2 - 2
hg3535/main.py

@@ -5,8 +5,8 @@ from scrapy.cmdline import execute
 # print(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 # execute(["scrapy", "crawl", "liansai"])
-# execute(["scrapy", "crawl", "zuqiu"])
-execute(["scrapy", "crawl", "lanqiu"])
+execute(["scrapy", "crawl", "zuqiu"])
+# execute(["scrapy", "crawl", "lanqiu"])
 # execute(["scrapy", "crawl", "guanjun"])
 # execute(["scrapy", "crawl", "wangqiu"])
 # execute(["scrapy", "crawl", "wqbodan"])

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 47 - 916
hg3535/pipelines.py


+ 8 - 8
hg3535/settings.py

@@ -155,14 +155,14 @@ SCHEDULER_FLUSH_ON_START = False
 # POST_PASSWORD = 'yjkj8888'
 
 
-POST_HOST = '192.168.2.200'
-POST_DATABASE = 'kaiyou'
-POST_USER = 'kaiyou'
-POST_PORT = '10432'
-POST_PASSWORD = '123456'
-
-R_HOST = 'localhost'
-R_POST = '6379'
+# POST_HOST = '192.168.2.200'
+# POST_DATABASE = 'kaiyou'
+# POST_USER = 'kaiyou'
+# POST_PORT = '10432'
+# POST_PASSWORD = '123456'
+
+# R_HOST = 'localhost'
+# R_POST = '6379'
 # R_PASSWORD = '123456'
 #
 # POST_HOST = 'localhost'

+ 16 - 16
hg3535/spiders/roll_wangqiu.py

@@ -130,19 +130,19 @@ class WangqiuSpider(scrapy.Spider):
                 # 第一节让球
                 one_concedes = result['o']["ahs1"]["v"]
                 one_concede_home_rule,one_concede_home,one_concede_guest_rule,one_concede_guest= rangqiu_daxiao(inner=one_concedes)
-                concedes_dict_rule['one_concede_home'] = ''.join(one_concede_home_rule)
-                concedes_dict['one_concede_home'] = ''.join(one_concede_home)
-                concedes_dict_rule['one_concede_guest'] = ''.join(one_concede_guest_rule)
-                concedes_dict['one_concede_guest'] = ''.join(one_concede_guest)
+                concedes_dict_rule['one_dishes_home'] = ''.join(one_concede_home_rule)
+                concedes_dict['one_dishes_home'] = ''.join(one_concede_home)
+                concedes_dict_rule['one_dishes_guest'] = ''.join(one_concede_guest_rule)
+                concedes_dict['one_dishes_guest'] = ''.join(one_concede_guest)
             except:
                 one_concede_guest = ""
                 one_concede_guest_rule = ""
                 one_concede_home = ""
                 one_concede_home_rule = ""
-                concedes_dict['one_concede_home_rule'] = one_concede_home_rule
-                concedes_dict['one_concede_home'] = one_concede_home
-                concedes_dict['one_concede_guest_rule'] = one_concede_guest_rule
-                concedes_dict['one_concede_guest'] = one_concede_guest
+                concedes_dict['one_dishes_home_rule'] = one_concede_home_rule
+                concedes_dict['one_dishes_home'] = one_concede_home
+                concedes_dict['one_dishes_guest_rule'] = one_concede_guest_rule
+                concedes_dict['one_dishes_guest'] = one_concede_guest
 
 # ----------------------------------------第二节让球分割线---------------------------------------------------------------------------
 
@@ -151,19 +151,19 @@ class WangqiuSpider(scrapy.Spider):
             try:
                 two_concedes = result['o']["ahs2"]["v"]
                 two_concede_home_rule,two_concede_home,two_concede_guest_rule,two_concede_guest = rangqiu_daxiao(inner=two_concedes)
-                concedes_dict_rule['two_concede_home'] = ''.join(two_concede_home_rule)
-                concedes_dict['two_concede_home'] = ''.join(two_concede_home)
-                concedes_dict_rule['two_concede_guest'] = ''.join(two_concede_guest_rule)
-                concedes_dict['two_concede_guest'] = ''.join(two_concede_guest)
+                concedes_dict_rule['two_dishes_home'] = ''.join(two_concede_home_rule)
+                concedes_dict['two_dishes_home'] = ''.join(two_concede_home)
+                concedes_dict_rule['two_dishes_guest'] = ''.join(two_concede_guest_rule)
+                concedes_dict['two_dishes_guest'] = ''.join(two_concede_guest)
             except:
                 two_concede_guest = ""
                 two_concede_guest_rule = ""
                 two_concede_home = ""
                 two_concede_home_rule = ""
-                concedes_dict_rule['two_concede_home'] = two_concede_home_rule
-                concedes_dict['two_concede_home'] = two_concede_home
-                concedes_dict_rule['two_concede_guest'] = two_concede_guest_rule
-                concedes_dict['two_concede_guest'] = two_concede_guest
+                concedes_dict_rule['two_dishes_home'] = two_concede_home_rule
+                concedes_dict['two_dishes_home'] = two_concede_home
+                concedes_dict_rule['two_dishes_guest'] = two_concede_guest_rule
+                concedes_dict['two_dishes_guest'] = two_concede_guest
 
 
 

+ 4 - 53
hg3535/spiders/roll_zuqiu.py

@@ -92,41 +92,14 @@ class ZuqiuSpider(scrapy.Spider):
                         concedes = data['o']['ah']['v']
                         new_concedes = [concedes[i] for i in range(len(concedes)) if i % 2 == 1]
                         concede_homes = [new_concedes[i] for i in range(len(new_concedes)) if i % 2 == 0]
-                        # concede_home_rule = [concede_homes[i] for i in range(len(concede_homes)) if i % 2 == 0]
-                        concede_home_rule = []
-                        for i in range(len(concede_homes)):
-                            if i % 2 is 0:
-                                home_rule = str(concede_homes[i])
-                                if home_rule.startswith('+'):
-                                    n_home_rule = home_rule.replace('+', '-')
-                                    concede_home_rule.append(n_home_rule)
-                                elif home_rule.startswith('-'):
-                                    n_home_rule = home_rule.replace('-', '+')
-                                    concede_home_rule.append(n_home_rule)
-                                else:
-                                    concede_home_rule.append(home_rule)
-                                # concede_homes[i]
-                                # concede_home
+                        concede_home_rule = [concede_homes[i] for i in range(len(concede_homes)) if i % 2 == 0]
                         if pt is 3:
                             concede_home = [float(concede_homes[i]) - 1 for i in range(len(concede_homes)) if i % 2 is 1]
                         else:
                             concede_home = [concede_homes[i] for i in range(len(concede_homes)) if i % 2 is 1]
 
                         concede_guests = [new_concedes[i] for i in range(len(new_concedes)) if i % 2 is 1]
-                        # concede_guest_rule
-                        # concede_guest
-                        concede_guest_rule = []
-                        for i in range(len(concede_guests)):
-                            if i % 2 is 0:
-                                guest_rule = str(concede_guests[i])
-                                if guest_rule.startswith('+'):
-                                    n_guest_rule = guest_rule.replace('+', '-')
-                                    concede_guest_rule.append(n_guest_rule)
-                                elif guest_rule.startswith('-'):
-                                    n_guest_rule = guest_rule.replace('-', '+')
-                                    concede_guest_rule.append(n_guest_rule)
-                                else:
-                                    concede_guest_rule.append(guest_rule)
+                        concede_guest_rule = [concede_guests[i] for i in range(len(concede_guests)) if i % 2 == 0]
                         if pt is 3:
                             concede_guest = [float(concede_guests[i]) -1 for i in range(len(concede_guests)) if i % 2 is 1]
                         else:
@@ -143,36 +116,14 @@ class ZuqiuSpider(scrapy.Spider):
                         new_half_concedes = [half_concedes[i] for i in range(len(half_concedes)) if i % 2 is 1]
                         new_half_concede_homes = [new_half_concedes[i] for i in range(len(new_half_concedes)) if
                                                   i % 2 is 0]
-                        half_concede_home_rule = []
-                        for i in range(len(new_half_concede_homes)):
-                            if i % 2 == 0:
-                                home_rule = str(new_half_concede_homes[i])
-                                if home_rule.startswith('+'):
-                                    n_home_rule = home_rule.replace('+', '-')
-                                    half_concede_home_rule.append(n_home_rule)
-                                if home_rule.startswith('-'):
-                                    n_home_rule = home_rule.replace('-', '+')
-                                    half_concede_home_rule.append(n_home_rule)
-                                else:
-                                    half_concede_home_rule.append(home_rule)
+                        half_concede_home_rule = [new_half_concede_homes[i] for i in range(len(new_half_concede_homes)) if i % 2 == 0]
                         # concede_home
                         if pt is 3:
                             half_concede_home = [float(new_half_concede_homes[i]) - 1 for i in range(len(new_half_concede_homes)) if i % 2 is 1]
                         else:
                             half_concede_home = [new_half_concede_homes[i] for i in range(len(new_half_concede_homes)) if i % 2 is 1]
                         half_concede_guests = [new_half_concedes[i] for i in range(len(new_half_concedes)) if i % 2 is 1]
-                        half_concede_guest_rule = []
-                        for i in range(len(half_concede_guests)):
-                            if i % 2 == 0:
-                                guest_rule = str(half_concede_guests[i])
-                                if guest_rule.startswith('+'):
-                                    n_guest_rule = guest_rule.replace('+', '-')
-                                    half_concede_guest_rule.append(n_guest_rule)
-                                if guest_rule.startswith('-'):
-                                    n_guest_rule = guest_rule.replace('-', '+')
-                                    half_concede_guest_rule.append(n_guest_rule)
-                                else:
-                                    half_concede_guest_rule.append(guest_rule)
+                        half_concede_guest_rule = [half_concede_guests[i] for i in range(len(half_concede_guests)) if i % 2 == 0]
                         # concede_guest
                         if pt is 3:
                             half_concede_guest = [float(half_concede_guests[i]) -1  for i in range(len(half_concede_guests)) if

+ 6 - 3
hg3535/spiders/zuqiu.py

@@ -19,8 +19,8 @@ class ZuqiuSpider(scrapy.Spider):
         "ITEM_PIPELINES":{
             'hg3535.pipelines.Zuqiupipeline': 300,
         },
-        'LOG_LEVEL': 'DEBUG',
-        'LOG_FILE': "../hg3535/log/zuqiu_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day),
+        # 'LOG_LEVEL': 'DEBUG',
+        # 'LOG_FILE': "../hg3535/log/zuqiu_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day),
         # 'RETRY_ENABLED': False,
         # 'COOKIES_ENABLED': False,
         # 'DOWNLOAD_TIMEOUT': 1,
@@ -105,7 +105,10 @@ class ZuqiuSpider(scrapy.Spider):
                         # 下半场
                         half_way = data['i'][12]
                         # 角球或者其他
-                        corner_ball = data['pci'].get('ctn', "")
+                        try:
+                            corner_ball = data['pci']['ctn']
+                        except:
+                            corner_ball = 0
                         # 日期
                         data_game = data['i'][4]
                         # 开赛时间

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio