Your Name 6 lat temu
rodzic
commit
45124c4328

+ 185 - 139
hg3535/.idea/workspace.xml

@@ -2,10 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <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$/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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/settings.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" />
@@ -15,7 +14,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="1559819869107" 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="1560130156197" 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$" />
@@ -46,92 +45,104 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/settings.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="254">
-              <caret line="157" selection-start-line="157" selection-end-line="161" selection-end-column="24" />
+            <state relative-caret-position="216">
+              <caret line="152" column="22" lean-forward="true" selection-start-line="152" selection-start-column="22" selection-end-line="152" selection-end-column="22" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/psycopg2/extras.py">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/main.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="128">
-              <caret line="138" selection-start-line="138" selection-end-line="138" />
+            <state relative-caret-position="288">
+              <caret line="16" column="51" lean-forward="true" selection-start-line="16" selection-start-column="51" selection-end-line="16" selection-end-column="51" />
+              <folding>
+                <element signature="e#0#10#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/zq_jieshu.py">
+        <entry file="file://$PROJECT_DIR$/pipelines.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="37">
-              <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
+            <state relative-caret-position="18">
+              <caret line="1742" column="34" selection-start-line="1742" selection-start-column="34" selection-end-line="1742" selection-end-column="34" />
               <folding>
-                <element signature="e#36#51#0" expanded="true" />
+                <element signature="e#0#11#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pipelines.py">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/main_time.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30460">
-              <caret line="1697" selection-start-line="1697" selection-end-line="1697" />
+            <state relative-caret-position="144">
+              <caret line="11" selection-start-line="11" selection-end-line="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/spiders/zq_jieshu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="90">
+              <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
               <folding>
-                <element signature="e#0#11#0" expanded="true" />
+                <element signature="e#36#51#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/twisted/internet/defer.py">
+        <entry file="file://$PROJECT_DIR$/spiders/wq_jieshu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="156">
-              <caret line="653" selection-start-line="653" selection-end-line="653" />
+            <state relative-caret-position="630">
+              <caret line="54" column="94" selection-start-line="54" selection-start-column="94" selection-end-line="54" selection-end-column="94" />
+              <folding>
+                <element signature="e#24#39#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/twisted/python/failure.py">
+        <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="156">
-              <caret line="242" selection-start-line="242" selection-end-line="242" />
+            <state relative-caret-position="7038">
+              <caret line="399" column="59" selection-start-line="399" selection-start-column="59" selection-end-line="399" selection-end-column="59" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/middlewares.py">
+        <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="551">
-              <caret line="151" selection-start-line="151" selection-end-line="151" />
-              <folding>
-                <element signature="e#168#181#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="126">
+              <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
+        <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="388">
-              <caret line="77" selection-start-line="77" selection-end-line="77" />
+            <state relative-caret-position="162">
+              <caret line="21" selection-start-line="21" selection-end-line="22" selection-end-column="103" />
               <folding>
-                <element signature="e#24#39#0" expanded="true" />
+                <element signature="e#24#35#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
+        <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="378">
-              <caret line="31" selection-start-line="30" selection-end-line="36" selection-end-column="100" />
+            <state relative-caret-position="648">
+              <caret line="42" column="19" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="19" />
               <folding>
                 <element signature="e#24#35#0" expanded="true" />
               </folding>
@@ -150,7 +161,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>t1</find>
       <find>pid</find>
       <find>corner_ball</find>
       <find>print</find>
@@ -180,6 +190,7 @@
       <find>3206572</find>
       <find>get_pcode</find>
       <find>match_time</find>
+      <find>three_total_sizes_big</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -227,7 +238,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" />
@@ -270,22 +280,23 @@
         <option value="$PROJECT_DIR$/spiders/bq_jieshu.py" />
         <option value="$PROJECT_DIR$/spiders/liansai.py" />
         <option value="$PROJECT_DIR$/ball_func.py" />
-        <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/zq_jieshu.py" />
-        <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/pipelines.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
         <option value="$PROJECT_DIR$/settings.py" />
+        <option value="$PROJECT_DIR$/main.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="9" />
-    <option name="y" value="20" />
-    <option name="width" value="1936" />
-    <option name="height" value="1066" />
+    <option name="x" value="262" />
+    <option name="y" value="79" />
+    <option name="width" value="1437" />
+    <option name="height" value="1029" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -293,7 +304,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -314,11 +324,12 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </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_scrapy/hg3535" />
     <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" />
@@ -567,6 +578,8 @@
       <workItem from="1558946386286" duration="5906000" />
       <workItem from="1559183149389" duration="6526000" />
       <workItem from="1559817639837" duration="2439000" />
+      <workItem from="1559820318166" duration="6091000" />
+      <workItem from="1560128279184" duration="2486000" />
     </task>
     <task id="LOCAL-00001" summary="修改后,版本二">
       <created>1555727493584</created>
@@ -715,11 +728,39 @@
       <option name="project" value="LOCAL" />
       <updated>1559187739192</updated>
     </task>
-    <option name="localTasksCounter" value="22" />
+    <task id="LOCAL-00022" summary="更新">
+      <created>1559820382430</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1559820382430</updated>
+    </task>
+    <task id="LOCAL-00023" summary="更新">
+      <created>1559820458233</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1559820458233</updated>
+    </task>
+    <task id="LOCAL-00024" summary="更新">
+      <created>1559832627997</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1559832627998</updated>
+    </task>
+    <task id="LOCAL-00025" summary="更新">
+      <created>1559832648593</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1559832648593</updated>
+    </task>
+    <option name="localTasksCounter" value="26" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1574082000" />
+    <option name="totallyTimeSpent" value="1582659000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -733,12 +774,12 @@
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.15138593" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.15458423" />
       <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.30150214" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" weight="0.29399142" />
       <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" />
@@ -748,7 +789,7 @@
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50692964" side_tool="true" weight="0.3858521" />
       <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49307036" weight="0.2274678" />
       <window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" weight="0.4356223" />
-      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.35622317" />
+      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.58798283" />
       <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" />
@@ -860,6 +901,11 @@
           <line>84</line>
           <option name="timeStamp" value="4" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/roll_wangqiu.py</url>
+          <line>232</line>
+          <option name="timeStamp" value="13" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -995,20 +1041,6 @@
     <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status_up.py" />
     <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status.py" />
     <entry file="file://$PROJECT_DIR$/main_notroll.py" />
-    <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="87">
-          <caret line="152" column="14" selection-start-line="152" selection-start-column="14" selection-end-line="152" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/main_time.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="11" selection-start-line="11" selection-end-line="11" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/log/zq_jieshu_2019_5_27.log" />
     <entry file="file://$PROJECT_DIR$/spiders/bq_jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
@@ -1020,16 +1052,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/wq_jieshu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="463">
-          <caret line="54" column="94" selection-start-line="54" selection-start-column="94" selection-end-line="54" selection-end-column="94" />
-          <folding>
-            <element signature="e#24#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/lq_jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="277">
@@ -1085,16 +1107,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1048">
-          <caret line="174" column="74" lean-forward="true" selection-start-line="174" selection-start-column="74" selection-end-line="174" selection-end-column="74" />
-          <folding>
-            <element signature="e#24#35#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-3480">
@@ -1105,23 +1117,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="-1152">
-          <caret line="399" column="59" lean-forward="true" selection-start-line="399" selection-start-column="59" selection-end-line="399" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3350">
-          <caret line="42" column="19" lean-forward="true" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="19" />
-          <folding>
-            <element signature="e#24#35#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="241">
@@ -1142,90 +1137,141 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
+    <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="11484">
+          <caret line="653" selection-start-line="653" selection-end-line="653" />
+        </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="378">
-          <caret line="31" selection-start-line="30" selection-end-line="36" selection-end-column="100" />
+        <state relative-caret-position="4158">
+          <caret line="242" selection-start-line="242" selection-end-line="242" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/middlewares.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2664">
+          <caret line="151" selection-start-line="151" selection-end-line="151" />
+          <folding>
+            <element signature="e#168#181#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3132">
+          <caret line="174" column="74" lean-forward="true" selection-start-line="174" selection-start-column="74" selection-end-line="174" selection-end-column="74" />
           <folding>
             <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/zq_jieshu.py">
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/psycopg2/extras.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="37">
-          <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
+        <state relative-caret-position="1944">
+          <caret line="140" selection-start-line="140" selection-end-line="140" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1008">
+          <caret line="64" selection-start-line="64" selection-end-line="64" />
           <folding>
-            <element signature="e#36#51#0" expanded="true" />
+            <element signature="e#24#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/twisted/python/failure.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="156">
-          <caret line="242" selection-start-line="242" selection-end-line="242" />
+        <state relative-caret-position="7038">
+          <caret line="399" column="59" selection-start-line="399" selection-start-column="59" selection-end-line="399" selection-end-column="59" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/twisted/internet/defer.py">
+    <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="156">
-          <caret line="653" selection-start-line="653" selection-end-line="653" />
+        <state relative-caret-position="126">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/middlewares.py">
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="551">
-          <caret line="151" selection-start-line="151" selection-end-line="151" />
+        <state relative-caret-position="648">
+          <caret line="42" column="19" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="19" />
           <folding>
-            <element signature="e#168#181#0" expanded="true" />
+            <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipelines.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="388">
-          <caret line="77" selection-start-line="77" selection-end-line="77" />
+        <state relative-caret-position="18">
+          <caret line="1742" column="34" selection-start-line="1742" selection-start-column="34" selection-end-line="1742" selection-end-column="34" />
           <folding>
-            <element signature="e#24#39#0" expanded="true" />
+            <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/settings.py">
+    <entry file="file://$PROJECT_DIR$/main_time.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="254">
-          <caret line="157" selection-start-line="157" selection-end-line="161" selection-end-column="24" />
+        <state relative-caret-position="144">
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main.py">
+    <entry file="file://$PROJECT_DIR$/spiders/zq_jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="16" selection-start-line="16" selection-end-line="17" />
+        <state relative-caret-position="90">
+          <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
           <folding>
-            <element signature="e#0#10#0" expanded="true" />
+            <element signature="e#36#51#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/psycopg2/extras.py">
+    <entry file="file://$PROJECT_DIR$/spiders/wq_jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="138" selection-start-line="138" selection-end-line="138" />
+        <state relative-caret-position="630">
+          <caret line="54" column="94" selection-start-line="54" selection-start-column="94" selection-end-line="54" selection-end-column="94" />
+          <folding>
+            <element signature="e#24#39#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipelines.py">
+    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30460">
-          <caret line="1697" selection-start-line="1697" selection-end-line="1697" />
+        <state relative-caret-position="162">
+          <caret line="21" selection-start-line="21" selection-end-line="22" selection-end-column="103" />
           <folding>
-            <element signature="e#0#11#0" expanded="true" />
+            <element signature="e#24#35#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="216">
+          <caret line="152" column="22" lean-forward="true" selection-start-line="152" selection-start-column="22" selection-end-line="152" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/main.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="288">
+          <caret line="16" column="51" lean-forward="true" selection-start-line="16" selection-start-column="51" selection-end-line="16" selection-end-column="51" />
+          <folding>
+            <element signature="e#0#10#0" expanded="true" />
           </folding>
         </state>
       </provider>

BIN
hg3535/__pycache__/pipelines.cpython-36.pyc


BIN
hg3535/__pycache__/settings.cpython-36.pyc


+ 188 - 183
hg3535/pipelines.py

@@ -1528,14 +1528,14 @@ class Roll_Lanqiupipeline(object):
             if odd_evens_dict:
                 for key, value in odd_evens_dict.items():
                     if value:
-                        for x, y in enumerate(value):
-                            new_hash = hash_func(match_id=game_id, odds_code=key, sort=x, p_id=2)
-                            odds_only = r_func(match_id=game_id, odds_code=key, sort=x, p_id=2,odd=y)
-                            sql1 = "insert into st_lq_odds(lg_id, odds_code, match_id, ctime, utime,odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only =%s;"
-                            self.cursor.execute(sql1, (int(league_id), key, int(game_id), utime, utime,y, 2, "two_sides",x, "hg3535", new_hash, odd_evens_dict_rule[key][x],odds_only,1,utime, y,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, condition,odds_only,is_rollball) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s);"
-                            self.cursor.execute(sql2, (int(league_id), key, int(game_id), utime, utime,y, 2, "two_sides", x, "hg3535", odd_evens_dict_rule[key][x],odds_only,1))
+                        # for x, y in enumerate(value):
+                        new_hash = hash_func(match_id=game_id, odds_code=key, sort=x, p_id=2)
+                        odds_only = r_func(match_id=game_id, odds_code=key, sort=x, p_id=2,odd=y)
+                        sql1 = "insert into st_lq_odds(lg_id, odds_code, match_id, ctime, utime,odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only =%s;"
+                        self.cursor.execute(sql1, (int(league_id), key, int(game_id), utime, utime,y, 2, "two_sides",x, "hg3535", new_hash, odd_evens_dict_rule[key],odds_only,1,utime, y,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, condition,odds_only,is_rollball) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s);"
+                        self.cursor.execute(sql2, (int(league_id), key, int(game_id), utime, utime,y, 2, "two_sides", x, "hg3535", odd_evens_dict_rule[key],odds_only,1))
 
             if total_sizes_dict:
                 for key, value in total_sizes_dict.items():
@@ -1679,95 +1679,97 @@ class Roll_Wangqiupipeline(object):
         # 总局数单双
         odd_evens_dict = item['odd_evens_dict']
         odd_evens_dict_rule = item['odd_evens_dict_rule']
-        if concedes_dict:
-            for key, value in concedes_dict.items():
-                if value:
-                    new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=1)
-                    odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=1,odd=value)
-                    sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only=%s;"
-                    self.cursor.execute(sql1, (
-                    int(league_id), key, int(game_id), utime, utime,value, 1, "dishes_home", 0, "hg3535", new_hash,
-                    concedes_dict_rule[key],odds_only,1,utime, value,odds_only))
-                    # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
-                    self.cursor.execute(sql2, (
-                    int(league_id), key, int(game_id), utime, utime, value, 1, "dishes_home", 0, "hg3535",
-                    concedes_dict_rule[key],odds_only,1))
-                    #插入结果表
-                    sql3 = "insert into st_wq_result(lg_id, home_player_name, guest_player_name, home_player_let_plate, guest_player_let_plate, all_inning,home_player_score,guest_player_score,status,first_score_player,last_score_player,first_inning_score,second_inning_score,third_inning_score,match_winer_player,update_time,match_process,tag,match_id,source,match_time) values (%s, %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_process =%s,home_player_score =%s,guest_player_score =%s;"
-                    self.cursor.execute(sql3, (int(league_id), team_home, team_guest,int(score_home), int(score_guest), 0, score_home,score_guest,1,'','','','','','',utime,jijie,number,game_id,'hg3535','00:00',utime,jijie,score_home,score_guest))
-                    # 插入记录表
-                sql4 = "insert into st_wq_result_record(lg_id, home_player_name, guest_player_name, home_player_let_plate, guest_player_let_plate, all_inning,home_player_score,guest_player_score,status,first_score_player,last_score_player,first_inning_score,second_inning_score,third_inning_score,match_winer_player,update_time,match_process,tag,match_id,source,match_time) values (%s, %s, %s, %s, %s,%s, %s, %s, %s, %s, %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);"
-                self.cursor.execute(sql4, (int(league_id), team_home, team_guest,int(score_home), int(score_guest), 0, score_home,score_guest,1,'','','','','','',utime,jijie,number,game_id,'hg3535','00:00'))
+        try:
+            if concedes_dict:
+                for key, value in concedes_dict.items():
+                    if value:
+                        new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=1)
+                        odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=1,odd=value)
+                        sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only=%s;"
+                        self.cursor.execute(sql1, (
+                        int(league_id), key, int(game_id), utime, utime,value, 1, "dishes_home", 0, "hg3535", new_hash,
+                        concedes_dict_rule[key],odds_only,1,utime, value,odds_only))
+                        # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
+                        self.cursor.execute(sql2, (
+                        int(league_id), key, int(game_id), utime, utime, value, 1, "dishes_home", 0, "hg3535",
+                        concedes_dict_rule[key],odds_only,1))
+                        #插入结果表
+                        sql3 = "insert into st_wq_result(lg_id, home_player_name, guest_player_name, home_player_let_plate, guest_player_let_plate, all_inning,home_player_score,guest_player_score,status,first_score_player,last_score_player,first_inning_score,second_inning_score,third_inning_score,match_winer_player,update_time,match_process,tag,match_id,source,match_time) values (%s, %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_process =%s,home_player_score =%s,guest_player_score =%s;"
+                        self.cursor.execute(sql3, (int(league_id), team_home, team_guest,int(score_home), int(score_guest), 0, score_home,score_guest,1,'','','','','','',utime,jijie,number,game_id,'hg3535','00:00',utime,jijie,score_home,score_guest))
+                        # 插入记录表
+                    sql4 = "insert into st_wq_result_record(lg_id, home_player_name, guest_player_name, home_player_let_plate, guest_player_let_plate, all_inning,home_player_score,guest_player_score,status,first_score_player,last_score_player,first_inning_score,second_inning_score,third_inning_score,match_winer_player,update_time,match_process,tag,match_id,source,match_time) values (%s, %s, %s, %s, %s,%s, %s, %s, %s, %s, %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);"
+                    self.cursor.execute(sql4, (int(league_id), team_home, team_guest,int(score_home), int(score_guest), 0, score_home,score_guest,1,'','','','','','',utime,jijie,number,game_id,'hg3535','00:00'))
+
+            if kemps_dict:
+                for key, value in kemps_dict.items():
+                    if value:
+                        new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=2)
+                        odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=2,odd=value)
+                        sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,odds_only,is_rollball) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s) on conflict(sole) do update set utime = %s,odds = %s,odds_only=%s;"
+                        self.cursor.execute(sql1, (
+                        int(league_id), key, int(game_id), utime, utime, value, 2, "kemp", 0, "hg3535", new_hash,odds_only,1,utime, value,odds_only))
+                        # 更新主队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,odds_only,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s,%s,%s);"
+                        self.cursor.execute(sql2, (
+                        int(league_id), key, int(game_id), utime, utime,value, 2, "kemp", 0, "hg3535",odds_only,1))
 
-        if kemps_dict:
-            for key, value in kemps_dict.items():
-                if value:
-                    new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=2)
-                    odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=2,odd=value)
-                    sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,odds_only,is_rollball) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s) on conflict(sole) do update set utime = %s,odds = %s,odds_only=%s;"
-                    self.cursor.execute(sql1, (
-                    int(league_id), key, int(game_id), utime, utime, value, 2, "kemp", 0, "hg3535", new_hash,odds_only,1,utime, value,odds_only))
-                    # 更新主队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,odds_only,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s,%s,%s);"
-                    self.cursor.execute(sql2, (
-                    int(league_id), key, int(game_id), utime, utime,value, 2, "kemp", 0, "hg3535",odds_only,1))
-
-                    sql3 = "insert into st_wq_result(lg_id, home_player_name, guest_player_name, home_player_let_plate, guest_player_let_plate, all_inning,home_player_score,guest_player_score,status,first_score_player,last_score_player,first_inning_score,second_inning_score,third_inning_score,match_winer_player,update_time,match_process,tag,match_id,source,match_time) values (%s, %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_process =%s,home_player_score =%s,guest_player_score =%s;"
-                    self.cursor.execute(sql3, (int(league_id), team_home, team_guest,int(score_home), int(score_guest), 0, score_home,score_guest,1,'','','','','','',utime,jijie,number,game_id,'hg3535','00:00',utime,jijie,score_home,score_guest))
-
-        if bureaus_dict:
-            for key, value in bureaus_dict.items():
-                if value:
-                    new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=3)
-                    odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=3,odd=value)
-                    sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only =%s;"
-                    self.cursor.execute(sql1, (
-                    int(league_id), key, int(game_id), utime, utime, value, 3, "bureau", 0, "hg3535", new_hash,
-                    bureaus_dict_rule[key],odds_only,1,utime, value,odds_only))
-                    # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
-                    self.cursor.execute(sql2, (
-                    int(league_id), key, int(game_id), utime, utime,value, 3, "bureau", 0, "hg3535",
-                    bureaus_dict_rule[key],odds_only,1))
-                    sql3 = "insert into st_wq_result(lg_id, home_player_name, guest_player_name, home_player_let_plate, guest_player_let_plate, all_inning,home_player_score,guest_player_score,status,first_score_player,last_score_player,first_inning_score,second_inning_score,third_inning_score,match_winer_player,update_time,match_process,tag,match_id,source,match_time) values (%s, %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_process =%s,home_player_score =%s,guest_player_score =%s;"
-                    self.cursor.execute(sql3, (int(league_id), team_home, team_guest,int(score_home), int(score_guest), 0, score_home,score_guest,1,'','','','','','',utime,jijie,number,game_id,'hg3535','00:00',utime,jijie,score_home,score_guest))
-
-        if total_number_dict:
-            for key, value in total_number_dict.items():
-                if value:
-                    # for x, y in enumerate(value):
-                    new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=4)
-                    odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=4,odd=value)
-                    # print(value)
-                    sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only=%s;"
-                    self.cursor.execute(sql1, (
-                    int(league_id), key, int(game_id), utime, utime,value, 4, "total_number", 0, "hg3535", new_hash,
-                    total_number_dict_rule[key],odds_only,1,utime, value,odds_only))
-                    # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
-                    self.cursor.execute(sql2, (
-                    int(league_id), key, int(game_id), utime, utime, value, 4, "total_number", 0, "hg3535",
-                    total_number_dict_rule[key],odds_only,1))
-                    sql3 = "insert into st_wq_result(lg_id, home_player_name, guest_player_name, home_player_let_plate, guest_player_let_plate, all_inning,home_player_score,guest_player_score,status,first_score_player,last_score_player,first_inning_score,second_inning_score,third_inning_score,match_winer_player,update_time,match_process,tag,match_id,source,match_time) values (%s, %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_process =%s,home_player_score =%s,guest_player_score =%s;"
-                    self.cursor.execute(sql3, (int(league_id), team_home, team_guest,int(score_home), int(score_guest), 0, score_home,score_guest,1,'','','','','','',utime,jijie,number,game_id,'hg3535','00:00',utime,jijie,score_home,score_guest))
-
-        if odd_evens_dict:
-            for key, value in odd_evens_dict.items():
-                if value:
-                    new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=5)
-                    odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=5,odd=value)
-                    sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only=%s;"
-                    self.cursor.execute(sql1, (
-                    int(league_id), key, int(game_id), utime, utime,value, 5, "two_game_sides", 0, "hg3535", new_hash,
-                    odd_evens_dict_rule[key],odds_only,1,utime, value,odds_only))
-                    # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
-                    self.cursor.execute(sql2, (
-                    int(league_id), key, int(game_id), utime, utime, value, 5, "two_game_sides", 0, "hg3535",odd_evens_dict_rule[key],odds_only,1))
-                    sql3 = "insert into st_wq_result(lg_id, home_player_name, guest_player_name, home_player_let_plate, guest_player_let_plate, all_inning,home_player_score,guest_player_score,status,first_score_player,last_score_player,first_inning_score,second_inning_score,third_inning_score,match_winer_player,update_time,match_process,tag,match_id,source,match_time) values (%s, %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_process =%s,home_player_score =%s,guest_player_score =%s;"
-                    self.cursor.execute(sql3, (int(league_id), team_home, team_guest,int(score_home), int(score_guest), 0, score_home,score_guest,1,'','','','','','',utime,jijie,number,game_id,'hg3535','00:00',utime,jijie,score_home,score_guest))
+                        sql3 = "insert into st_wq_result(lg_id, home_player_name, guest_player_name, home_player_let_plate, guest_player_let_plate, all_inning,home_player_score,guest_player_score,status,first_score_player,last_score_player,first_inning_score,second_inning_score,third_inning_score,match_winer_player,update_time,match_process,tag,match_id,source,match_time) values (%s, %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_process =%s,home_player_score =%s,guest_player_score =%s;"
+                        self.cursor.execute(sql3, (int(league_id), team_home, team_guest,int(score_home), int(score_guest), 0, score_home,score_guest,1,'','','','','','',utime,jijie,number,game_id,'hg3535','00:00',utime,jijie,score_home,score_guest))
 
+            if bureaus_dict:
+                for key, value in bureaus_dict.items():
+                    if value:
+                        new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=3)
+                        odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=3,odd=value)
+                        sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only =%s;"
+                        self.cursor.execute(sql1, (
+                        int(league_id), key, int(game_id), utime, utime, value, 3, "bureau", 0, "hg3535", new_hash,
+                        bureaus_dict_rule[key],odds_only,1,utime, value,odds_only))
+                        # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
+                        self.cursor.execute(sql2, (
+                        int(league_id), key, int(game_id), utime, utime,value, 3, "bureau", 0, "hg3535",
+                        bureaus_dict_rule[key],odds_only,1))
+                        sql3 = "insert into st_wq_result(lg_id, home_player_name, guest_player_name, home_player_let_plate, guest_player_let_plate, all_inning,home_player_score,guest_player_score,status,first_score_player,last_score_player,first_inning_score,second_inning_score,third_inning_score,match_winer_player,update_time,match_process,tag,match_id,source,match_time) values (%s, %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_process =%s,home_player_score =%s,guest_player_score =%s;"
+                        self.cursor.execute(sql3, (int(league_id), team_home, team_guest,int(score_home), int(score_guest), 0, score_home,score_guest,1,'','','','','','',utime,jijie,number,game_id,'hg3535','00:00',utime,jijie,score_home,score_guest))
+
+            if total_number_dict:
+                for key, value in total_number_dict.items():
+                    if value:
+                        # for x, y in enumerate(value):
+                        new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=4)
+                        odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=4,odd=value)
+                        # print(value)
+                        sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only=%s;"
+                        self.cursor.execute(sql1, (
+                        int(league_id), key, int(game_id), utime, utime,value, 4, "total_number", 0, "hg3535", new_hash,
+                        total_number_dict_rule[key],odds_only,1,utime, value,odds_only))
+                        # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
+                        self.cursor.execute(sql2, (
+                        int(league_id), key, int(game_id), utime, utime, value, 4, "total_number", 0, "hg3535",
+                        total_number_dict_rule[key],odds_only,1))
+                        sql3 = "insert into st_wq_result(lg_id, home_player_name, guest_player_name, home_player_let_plate, guest_player_let_plate, all_inning,home_player_score,guest_player_score,status,first_score_player,last_score_player,first_inning_score,second_inning_score,third_inning_score,match_winer_player,update_time,match_process,tag,match_id,source,match_time) values (%s, %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_process =%s,home_player_score =%s,guest_player_score =%s;"
+                        self.cursor.execute(sql3, (int(league_id), team_home, team_guest,int(score_home), int(score_guest), 0, score_home,score_guest,1,'','','','','','',utime,jijie,number,game_id,'hg3535','00:00',utime,jijie,score_home,score_guest))
+
+            if odd_evens_dict:
+                for key, value in odd_evens_dict.items():
+                    if value:
+                        new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=5)
+                        odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=5,odd=value)
+                        sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only=%s;"
+                        self.cursor.execute(sql1, (
+                        int(league_id), key, int(game_id), utime, utime,value, 5, "two_game_sides", 0, "hg3535", new_hash,
+                        odd_evens_dict_rule[key],odds_only,1,utime, value,odds_only))
+                        # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
+                        self.cursor.execute(sql2, (
+                        int(league_id), key, int(game_id), utime, utime, value, 5, "two_game_sides", 0, "hg3535",odd_evens_dict_rule[key],odds_only,1))
+                        sql3 = "insert into st_wq_result(lg_id, home_player_name, guest_player_name, home_player_let_plate, guest_player_let_plate, all_inning,home_player_score,guest_player_score,status,first_score_player,last_score_player,first_inning_score,second_inning_score,third_inning_score,match_winer_player,update_time,match_process,tag,match_id,source,match_time) values (%s, %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_process =%s,home_player_score =%s,guest_player_score =%s;"
+                        self.cursor.execute(sql3, (int(league_id), team_home, team_guest,int(score_home), int(score_guest), 0, score_home,score_guest,1,'','','','','','',utime,jijie,number,game_id,'hg3535','00:00',utime,jijie,score_home,score_guest))
+        except Exception as e:
+            print(e)
         # 插入赛事表
         try:
             Competition_sql = "insert into st_wq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,type,source,is_rollball,status) values (%s, %s, %s, %s, %s, %s, %s, %s, %s,%s, %s, %s,%s) on conflict(match_id) do update set tag = %s, status = %s;"
@@ -1860,95 +1862,98 @@ class Roll_Banqiupipeline(object):
         # 赛事失效时间
         # n_time = out_time(ctime, 3.5)
         # 插入独赢
-        if capots_dict:
-            for key, value in capots_dict.items():
-                if value:
-                    new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=2)
-                    odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=2,odd=value)
-                    sql1 = "insert into st_bq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,odds_only,expire_time,is_rollball) 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,odds_only=%s,expire_time=%s;"
-                    self.cursor.execute(sql1, (
-                        int(league_id), key, int(game_id), utime, utime, value, 4, "capot", 0, "hg3535", new_hash,
-                        odds_only, expire_time,1,utime, value, odds_only,expire_time))
-                    # 更新主队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,odds_only,is_rollball) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s,%s);"
-                    self.cursor.execute(sql2, (
-                        int(league_id), key, int(game_id), utime, utime, value, 4, "capot", 0, "hg3535", odds_only,1))
-                    res = json.dumps(match_score_dict)
-                    sql3 = "insert into st_bq_result(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,u_home_score,u_guest_score,source,match_score_t) 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;"
-                    self.cursor.execute(sql3, (int(league_id), team_home, team_guest,score_home, score_guest, number, 1,'','',qiudui,'',utime,r_ctime,jijie,number,int(game_id),0,0,'hg3535',res,utime,qiudui,r_ctime,jijie,score_home,score_guest))
-        # 插入赛事表
-            Competition_sql = "insert into st_bq_competition(home_team,guest_team,lg_id,status,match_id,ctime,utime,tag,source,type,is_rollball) values(%s, %s, %s, %s, %s, %s, %s,%s, %s,%s,%s) on conflict(match_id) do update set tag=%s,is_rollball=%s,utime=%s;"
-            self.cursor.execute(Competition_sql, (team_home, team_guest, league_id, 1,game_id,utime, utime, number,"hg3535",1,1,number,1,utime))
+        try:
+            if capots_dict:
+                for key, value in capots_dict.items():
+                    if value:
+                        new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=2)
+                        odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=2,odd=value)
+                        sql1 = "insert into st_bq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,odds_only,expire_time,is_rollball) 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,odds_only=%s,expire_time=%s;"
+                        self.cursor.execute(sql1, (
+                            int(league_id), key, int(game_id), utime, utime, value, 4, "capot", 0, "hg3535", new_hash,
+                            odds_only, expire_time,1,utime, value, odds_only,expire_time))
+                        # 更新主队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,odds_only,is_rollball) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s,%s);"
+                        self.cursor.execute(sql2, (
+                            int(league_id), key, int(game_id), utime, utime, value, 4, "capot", 0, "hg3535", odds_only,1))
+                        res = json.dumps(match_score_dict)
+                        sql3 = "insert into st_bq_result(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,u_home_score,u_guest_score,source,match_score_t) 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;"
+                        self.cursor.execute(sql3, (int(league_id), team_home, team_guest,score_home, score_guest, number, 1,'','',qiudui,'',utime,r_ctime,jijie,number,int(game_id),0,0,'hg3535',res,utime,qiudui,r_ctime,jijie,score_home,score_guest))
+            # 插入赛事表
+                Competition_sql = "insert into st_bq_competition(home_team,guest_team,lg_id,status,match_id,ctime,utime,tag,source,type,is_rollball) values(%s, %s, %s, %s, %s, %s, %s,%s, %s,%s,%s) on conflict(match_id) do update set tag=%s,is_rollball=%s,utime=%s;"
+                self.cursor.execute(Competition_sql, (team_home, team_guest, league_id, 1,game_id,utime, utime, number,"hg3535",1,1,number,1,utime))
 
-        #让球
-        if concedes_dict:
-            for key, value in concedes_dict.items():
-                if value:
-                    new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=1)
-                    odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=1,odd=value)
-                    sql1 = "insert into st_bq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only=%s;"
-                    self.cursor.execute(sql1, (
-                    int(league_id), key, int(game_id), utime, utime,value, 1, "concede", 0, "hg3535", new_hash,
-                    concedes_dict_rule[key],odds_only,1,utime, value,odds_only))
-                    # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
-                    self.cursor.execute(sql2, (
-                    int(league_id), key, int(game_id), utime, utime, value, 1, "concede", 0, "hg3535",
-                    concedes_dict_rule[key],odds_only,1))
-                    #插入结果表
-                    res = json.dumps(match_score_dict)
-                    # r = pymysql.escape_string(res)
-                    sql3 = "insert into st_bq_result(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,u_home_score,u_guest_score,source,match_score_t) 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_t = %s,match_time =%s,match_process =%s,home_score =%s,guest_score =%s;"
-                    self.cursor.execute(sql3, (int(league_id), team_home, team_guest,score_home, score_guest, number, 1,'','','','',utime,r_ctime,jijie,number,int(game_id),0,0,'hg3535',res,utime,res,r_ctime,jijie,score_home,score_guest))
-                    # 插入记录表
-                sql4 = "insert into st_bq_result_record(lg_id, home_team, guest_team, home_score, guest_score,first_score, last_score,match_score,match_winer,update_time,match_time,match_process,tag,match_id,source,status) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s, %s,%s,%s,%s);"
-                self.cursor.execute(sql4, (int(league_id), team_home, team_guest,score_home, score_guest, '', '','','',utime,r_ctime,jijie,number,int(game_id),'hg3535',0))
-
-        if total_size_dict:
-            for key, value in total_size_dict.items():
-                if value:
-                    new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=2)
-                    odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=2,odd=value)
-                    sql1 = "insert into st_bq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only=%s;"
-                    self.cursor.execute(sql1, (
-                    int(league_id), key, int(game_id), utime, utime,value, 2, "total_size", 0, "hg3535", new_hash,
-                    total_size_dict_rule[key],odds_only,1,utime, value,odds_only))
-                    # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
-                    self.cursor.execute(sql2, (
-                    int(league_id), key, int(game_id), utime, utime, value, 2, "total_size", 0, "hg3535",
-                    total_size_dict_rule[key],odds_only,1))
-                    #插入结果表
-                    res = json.dumps(match_score_dict)
-                    # r = pymysql.escape_string(res)
-                    sql3 = "insert into st_bq_result(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,u_home_score,u_guest_score,source,match_score_t) 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_t = %s,match_time =%s,match_process =%s,home_score =%s,guest_score =%s;"
-                    self.cursor.execute(sql3, (int(league_id), team_home, team_guest,score_home, score_guest, number, 1,'','','','',utime,r_ctime,jijie,number,int(game_id),0,0,'hg3535',res,utime,res,r_ctime,jijie,score_home,score_guest))
-                    # 插入记录表
-                sql4 = "insert into st_bq_result_record(lg_id, home_team, guest_team, home_score, guest_score,first_score, last_score,match_score,match_winer,update_time,match_time,match_process,tag,match_id,source,status) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s, %s,%s,%s,%s);"
-                self.cursor.execute(sql4, (int(league_id), team_home, team_guest,score_home, score_guest, '', '','','',utime,r_ctime,jijie,number,int(game_id),'hg3535',1))
-
-        if odd_evens_dict:
-            for key, value in odd_evens_dict.items():
-                if value:
-                    new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=3)
-                    odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=3,odd=value)
-                    sql1 = "insert into st_bq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only=%s;"
-                    self.cursor.execute(sql1, (
-                    int(league_id), key, int(game_id), utime, utime,value, 3, "two_sides", 0, "hg3535", new_hash,
-                    odd_evens_dict_rule[key],odds_only,1,utime, value,odds_only))
-                    # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
-                    self.cursor.execute(sql2, (
-                    int(league_id), key, int(game_id), utime, utime, value, 3, "two_sides", 0, "hg3535",
-                    odd_evens_dict_rule[key],odds_only,1))
-                    #插入结果表
-                    res = json.dumps(match_score_dict)
-                    # r = pymysql.escape_string(res)
-                    sql3 = "insert into st_bq_result(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,u_home_score,u_guest_score,source,match_score_t) 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_t = %s,match_time =%s,match_process =%s,home_score =%s,guest_score =%s;"
-                    self.cursor.execute(sql3, (int(league_id), team_home, team_guest,score_home, score_guest, number, 1,'','','','',utime,r_ctime,jijie,number,int(game_id),0,0,'hg3535',res,utime,res,r_ctime,jijie,score_home,score_guest))
-                    # 插入记录表
-                sql4 = "insert into st_bq_result_record(lg_id, home_team, guest_team, home_score, guest_score,first_score, last_score,match_score,match_winer,update_time,match_time,match_process,tag,match_id,source,status) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s, %s,%s,%s,%s);"
-                self.cursor.execute(sql4, (int(league_id), team_home, team_guest,score_home, score_guest, '', '','','',utime,r_ctime,jijie,number,int(game_id),'hg3535',1))
+            #让球
+            if concedes_dict:
+                for key, value in concedes_dict.items():
+                    if value:
+                        new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=1)
+                        odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=1,odd=value)
+                        sql1 = "insert into st_bq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only=%s;"
+                        self.cursor.execute(sql1, (
+                        int(league_id), key, int(game_id), utime, utime,value, 1, "concede", 0, "hg3535", new_hash,
+                        concedes_dict_rule[key],odds_only,1,utime, value,odds_only))
+                        # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
+                        self.cursor.execute(sql2, (
+                        int(league_id), key, int(game_id), utime, utime, value, 1, "concede", 0, "hg3535",
+                        concedes_dict_rule[key],odds_only,1))
+                        #插入结果表
+                        res = json.dumps(match_score_dict)
+                        # r = pymysql.escape_string(res)
+                        sql3 = "insert into st_bq_result(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,u_home_score,u_guest_score,source,match_score_t) 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_t = %s,match_time =%s,match_process =%s,home_score =%s,guest_score =%s;"
+                        self.cursor.execute(sql3, (int(league_id), team_home, team_guest,score_home, score_guest, number, 1,'','','','',utime,r_ctime,jijie,number,int(game_id),0,0,'hg3535',res,utime,res,r_ctime,jijie,score_home,score_guest))
+                        # 插入记录表
+                    sql4 = "insert into st_bq_result_record(lg_id, home_team, guest_team, home_score, guest_score,first_score, last_score,match_score,match_winer,update_time,match_time,match_process,tag,match_id,source,status) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s, %s,%s,%s,%s);"
+                    self.cursor.execute(sql4, (int(league_id), team_home, team_guest,score_home, score_guest, '', '','','',utime,r_ctime,jijie,number,int(game_id),'hg3535',0))
+
+            if total_size_dict:
+                for key, value in total_size_dict.items():
+                    if value:
+                        new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=2)
+                        odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=2,odd=value)
+                        sql1 = "insert into st_bq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only=%s;"
+                        self.cursor.execute(sql1, (
+                        int(league_id), key, int(game_id), utime, utime,value, 2, "total_size", 0, "hg3535", new_hash,
+                        total_size_dict_rule[key],odds_only,1,utime, value,odds_only))
+                        # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
+                        self.cursor.execute(sql2, (
+                        int(league_id), key, int(game_id), utime, utime, value, 2, "total_size", 0, "hg3535",
+                        total_size_dict_rule[key],odds_only,1))
+                        #插入结果表
+                        res = json.dumps(match_score_dict)
+                        # r = pymysql.escape_string(res)
+                        sql3 = "insert into st_bq_result(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,u_home_score,u_guest_score,source,match_score_t) 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_t = %s,match_time =%s,match_process =%s,home_score =%s,guest_score =%s;"
+                        self.cursor.execute(sql3, (int(league_id), team_home, team_guest,score_home, score_guest, number, 1,'','','','',utime,r_ctime,jijie,number,int(game_id),0,0,'hg3535',res,utime,res,r_ctime,jijie,score_home,score_guest))
+                        # 插入记录表
+                    sql4 = "insert into st_bq_result_record(lg_id, home_team, guest_team, home_score, guest_score,first_score, last_score,match_score,match_winer,update_time,match_time,match_process,tag,match_id,source,status) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s, %s,%s,%s,%s);"
+                    self.cursor.execute(sql4, (int(league_id), team_home, team_guest,score_home, score_guest, '', '','','',utime,r_ctime,jijie,number,int(game_id),'hg3535',1))
+
+            if odd_evens_dict:
+                for key, value in odd_evens_dict.items():
+                    if value:
+                        new_hash = hash_func(match_id=game_id, odds_code=key, sort=0, p_id=3)
+                        odds_only = r_func(match_id=game_id, odds_code=key, sort=0, p_id=3,odd=value)
+                        sql1 = "insert into st_bq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,condition,odds_only,is_rollball) 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,odds_only=%s;"
+                        self.cursor.execute(sql1, (
+                        int(league_id), key, int(game_id), utime, utime,value, 3, "two_sides", 0, "hg3535", new_hash,
+                        odd_evens_dict_rule[key],odds_only,1,utime, value,odds_only))
+                        # 更新主队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,is_rollball) values (%s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s,%s);"
+                        self.cursor.execute(sql2, (
+                        int(league_id), key, int(game_id), utime, utime, value, 3, "two_sides", 0, "hg3535",
+                        odd_evens_dict_rule[key],odds_only,1))
+                        #插入结果表
+                        res = json.dumps(match_score_dict)
+                        # r = pymysql.escape_string(res)
+                        sql3 = "insert into st_bq_result(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,u_home_score,u_guest_score,source,match_score_t) 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_t = %s,match_time =%s,match_process =%s,home_score =%s,guest_score =%s;"
+                        self.cursor.execute(sql3, (int(league_id), team_home, team_guest,score_home, score_guest, number, 1,'','','','',utime,r_ctime,jijie,number,int(game_id),0,0,'hg3535',res,utime,res,r_ctime,jijie,score_home,score_guest))
+                        # 插入记录表
+                    sql4 = "insert into st_bq_result_record(lg_id, home_team, guest_team, home_score, guest_score,first_score, last_score,match_score,match_winer,update_time,match_time,match_process,tag,match_id,source,status) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s, %s,%s,%s,%s);"
+                    self.cursor.execute(sql4, (int(league_id), team_home, team_guest,score_home, score_guest, '', '','','',utime,r_ctime,jijie,number,int(game_id),'hg3535',1))
+        except Exception as e:
+            print(e)
         return item
 
     def close_spider(self, spider):

BIN
hg3535/spiders/__pycache__/lanqiu.cpython-36.pyc


BIN
hg3535/spiders/__pycache__/liansai.cpython-36.pyc


BIN
hg3535/spiders/__pycache__/roll_bangqiu.cpython-36.pyc


BIN
hg3535/spiders/__pycache__/roll_lanqiu.cpython-36.pyc


BIN
hg3535/spiders/__pycache__/roll_wangqiu.cpython-36.pyc


BIN
hg3535/spiders/__pycache__/roll_zuqiu.cpython-36.pyc


BIN
hg3535/spiders/__pycache__/zq_jieshu.cpython-36.pyc


BIN
hg3535/spiders/__pycache__/zuqiu.cpython-36.pyc


+ 2 - 2
hg3535/spiders/roll_bangqiu.py

@@ -24,8 +24,8 @@ class BqrangqiuSpider(scrapy.Spider):
         "ITEM_PIPELINES": {
             "hg3535.pipelines.Roll_Banqiupipeline": 300,
         },
-        'LOG_LEVEL': 'DEBUG',
-        'LOG_FILE': "../hg3535/log/roll_bangqiu_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day)
+        # 'LOG_LEVEL': 'DEBUG',
+        # 'LOG_FILE': "../hg3535/log/roll_bangqiu_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day)
     }
 
     start_urls = ['https://hg3535z.com/odds2/d/getodds?sid=4&pt=4&ubt=am&pn=0&sb=2&dc=null&pid=0'] # 滚球菜单 棒球滚球列url

+ 202 - 262
hg3535/spiders/roll_lanqiu.py

@@ -43,8 +43,8 @@ class LanqiuSpider(scrapy.Spider):
         "ITEM_PIPELINES": {
             "hg3535.pipelines.Roll_Lanqiupipeline": 200,
         },
-        'LOG_LEVEL': 'DEBUG',
-        'LOG_FILE': "../hg3535/log/roll_lanqiu_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day)
+        # 'LOG_LEVEL': 'DEBUG',
+        # 'LOG_FILE': "../hg3535/log/roll_lanqiu_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day)
     }
     # start_urls = ['http://hg3535z.com/odds2/d/getodds?sid=2&pt=3&ubt=am&pn=0&sb=2&dc=null&pid=0']
     # http: // hg3535z.com / odds2 / d / getamodds?eid = 3098030 & iip = false & ubt = am & isp = false
@@ -112,14 +112,10 @@ class LanqiuSpider(scrapy.Spider):
                 concedes_dict_rule['concede_guest'] = concede_guest_rule
                 concedes_dict['concede_guest'] = concede_guest
             except:
-                concede_guest = ""
-                concede_guest_rule = ""
-                concede_home = ""
-                concede_home_rule = ""
-                concedes_dict_rule['concede_home'] = concede_home_rule
-                concedes_dict['concede_home'] = concede_home
-                concedes_dict_rule['concede_guest'] = concede_guest_rule
-                concedes_dict['concede_guest'] = concede_guest
+                concedes_dict_rule['concede_home'] = None
+                concedes_dict['concede_home'] = None
+                concedes_dict_rule['concede_guest'] = None
+                concedes_dict['concede_guest'] = None
             # print(concedes_dict)
             try:
                 half_concedes = result['o']["ah1st"]["v"]
@@ -131,33 +127,25 @@ class LanqiuSpider(scrapy.Spider):
                 concedes_dict['half_concede_guest'] = half_concede_guest
 
             except:
-                half_concede_home_rule = ""
-                half_concede_home = ""
-                half_concede_guest_rule = ""
-                half_concede_guest = ""
-                concedes_dict_rule['half_concede_home'] = half_concede_home_rule
-                concedes_dict['half_concede_home'] = half_concede_home
-                concedes_dict_rule['half_concede_guest'] = half_concede_guest_rule
-                concedes_dict['half_concede_guest'] = half_concede_guest
+                concedes_dict_rule['half_concede_home'] = None
+                concedes_dict['half_concede_home'] = None
+                concedes_dict_rule['half_concede_guest'] = None
+                concedes_dict['half_concede_guest'] = None
 
             # 第一节让球
             try:
                 one_concedes = result['o']["ahq1"]["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'] = half_concede_home_rule
-                concedes_dict['one_concede_home'] = half_concede_home
-                concedes_dict_rule['one_concede_guest'] = half_concede_guest_rule
-                concedes_dict['one_concede_guest'] = one_concede_guest
-
-            except:
-                one_concede_guest = ""
-                one_concede_guest_rule = ""
-                one_concede_home = ""
-                one_concede_home_rule = ""
                 concedes_dict_rule['one_concede_home'] = one_concede_home_rule
                 concedes_dict['one_concede_home'] = one_concede_home
                 concedes_dict_rule['one_concede_guest'] = one_concede_guest_rule
                 concedes_dict['one_concede_guest'] = one_concede_guest
+
+            except:
+                concedes_dict_rule['one_concede_home'] = None
+                concedes_dict['one_concede_home'] = None
+                concedes_dict_rule['one_concede_guest'] = None
+                concedes_dict['one_concede_guest'] = None
             # 第二节让球
             try:
                 two_concedes = result['o']["ahq2"]["v"]
@@ -167,14 +155,10 @@ class LanqiuSpider(scrapy.Spider):
                 concedes_dict_rule['two_concede_guest'] = two_concede_guest_rule
                 concedes_dict['two_concede_guest'] = 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_concede_home'] = None
+                concedes_dict['two_concede_home'] = None
+                concedes_dict_rule['two_concede_guest'] = None
+                concedes_dict['two_concede_guest'] = None
             # 第三节让球
             try:
                 three_concedes = result['o']["ahq3"]["v"]
@@ -185,14 +169,10 @@ class LanqiuSpider(scrapy.Spider):
                 concedes_dict['three_concede_guest'] = three_concede_guest
 
             except:
-                three_concede_guest = ""
-                three_concede_guest_rule = ""
-                three_concede_home = ""
-                three_concede_home_rule = ""
-                concedes_dict_rule['three_concede_home'] = three_concede_home_rule
-                concedes_dict['three_concede_home'] = three_concede_home
-                concedes_dict_rule['three_concede_guest'] = three_concede_guest_rule
-                concedes_dict['three_concede_guest'] = three_concede_guest
+                concedes_dict_rule['three_concede_home'] = None
+                concedes_dict['three_concede_home'] = None
+                concedes_dict_rule['three_concede_guest'] = None
+                concedes_dict['three_concede_guest'] = None
             # 第四节让球
             try:
                 four_concedes = result['o']["ahq4"]["v"]
@@ -203,14 +183,10 @@ class LanqiuSpider(scrapy.Spider):
                 concedes_dict['four_concede_guest'] = four_concede_guest
 
             except:
-                four_concede_guest = ""
-                four_concede_guest_rule = ""
-                four_concede_home = ""
-                four_concede_home_rule = ""
-                concedes_dict_rule['four_concede_home'] = four_concede_home_rule
-                concedes_dict['four_concede_home'] = four_concede_home
-                concedes_dict_rule['four_concede_guest'] = four_concede_guest_rule
-                concedes_dict['four_concede_guest'] = four_concede_guest
+                concedes_dict_rule['four_concede_home'] = None
+                concedes_dict['four_concede_home'] = None
+                concedes_dict_rule['four_concede_guest'] = None
+                concedes_dict['four_concede_guest'] = None
 # ----------------------------------------总分大小分割线 - ---------------------------------------------------------------
             # 全场总分大小
             total_sizes_dict = {}
@@ -223,14 +199,10 @@ class LanqiuSpider(scrapy.Spider):
                 total_sizes_dict_rule["total_sizes_small"] = total_sizes_small_rule
                 total_sizes_dict["total_sizes_small"] = total_sizes_small
             except:
-                total_sizes_big_rule = ""
-                total_sizes_big = ""
-                total_sizes_small_rule = ""
-                total_sizes_small = ""
-                total_sizes_dict_rule["total_sizes_big"] = total_sizes_big_rule
-                total_sizes_dict["total_sizes_big"] = total_sizes_big
-                total_sizes_dict_rule["total_sizes_small"] = total_sizes_small_rule
-                total_sizes_dict["total_sizes_small"] = total_sizes_small
+                total_sizes_dict_rule["total_sizes_big"] = None
+                total_sizes_dict["total_sizes_big"] = None
+                total_sizes_dict_rule["total_sizes_small"] = None
+                total_sizes_dict["total_sizes_small"] = None
             # 上半场总分大小
             try:
                 half_total_sizes = result['o']["ou1st"]["v"]
@@ -240,14 +212,10 @@ class LanqiuSpider(scrapy.Spider):
                 total_sizes_dict_rule["half_total_sizes_small"] = half_total_sizes_small_rule
                 total_sizes_dict["half_total_sizes_small"] = half_total_sizes_small
             except:
-                half_total_sizes_big_rule = ""
-                half_total_sizes_big = ""
-                half_total_sizes_small_rule = ""
-                half_total_sizes_small = ""
-                total_sizes_dict_rule["half_total_sizes_big"] = half_total_sizes_big_rule
-                total_sizes_dict["half_total_sizes_big"] = half_total_sizes_big
-                total_sizes_dict_rule["half_total_sizes_small"] = half_total_sizes_small_rule
-                total_sizes_dict["half_total_sizes_small"] = half_total_sizes_small
+                total_sizes_dict_rule["half_total_sizes_big"] = None
+                total_sizes_dict["half_total_sizes_big"] = None
+                total_sizes_dict_rule["half_total_sizes_small"] = None
+                total_sizes_dict["half_total_sizes_small"] = None
             # 第一节总分大小
             try:
                 one_total_sizes = result['o']["ou1st"]["v"]
@@ -257,14 +225,10 @@ class LanqiuSpider(scrapy.Spider):
                 total_sizes_dict_rule["one_total_sizes_small"] = one_total_sizes_small_rule
                 total_sizes_dict["one_total_sizes_small"] = one_total_sizes_small
             except:
-                one_total_sizes_big_rule = ""
-                one_total_sizes_big = ""
-                one_total_sizes_small_rule = ""
-                one_total_sizes_small = ""
-                total_sizes_dict_rule["one_total_sizes_big"] = one_total_sizes_big_rule
-                total_sizes_dict["one_total_sizes_big"] = one_total_sizes_big
-                total_sizes_dict_rule["one_total_sizes_small"] = one_total_sizes_small_rule
-                total_sizes_dict["one_total_sizes_small"] = one_total_sizes_small
+                total_sizes_dict_rule["one_total_sizes_big"] = None
+                total_sizes_dict["one_total_sizes_big"] = None
+                total_sizes_dict_rule["one_total_sizes_small"] = None
+                total_sizes_dict["one_total_sizes_small"] = None
             # 第二节场总分大小
             try:
                 two_total_sizes = result['o']["ou2st"]["v"]
@@ -274,14 +238,10 @@ class LanqiuSpider(scrapy.Spider):
                 total_sizes_dict_rule["two_total_sizes_small"] = two_total_sizes_small_rule
                 total_sizes_dict["two_total_sizes_small"] = two_total_sizes_small
             except:
-                two_total_sizes_big_rule = ""
-                two_total_sizes_big = ""
-                two_total_sizes_small_rule = ""
-                two_total_sizes_small = ""
-                total_sizes_dict_rule["two_total_sizes_big"] = two_total_sizes_big_rule
-                total_sizes_dict["two_total_sizes_big"] = two_total_sizes_big
-                total_sizes_dict_rule["two_total_sizes_small"] = two_total_sizes_small_rule
-                total_sizes_dict["two_total_sizes_small"] = two_total_sizes_small
+                total_sizes_dict_rule["two_total_sizes_big"] = None
+                total_sizes_dict["two_total_sizes_big"] = None
+                total_sizes_dict_rule["two_total_sizes_small"] = None
+                total_sizes_dict["two_total_sizes_small"] = None
             # 第三节总分大小
             try:
                 three_total_sizes = result['o']["ou3st"]["v"]
@@ -291,14 +251,10 @@ class LanqiuSpider(scrapy.Spider):
                 total_sizes_dict_rule["three_total_sizes_small"] = three_total_sizes_small_rule
                 total_sizes_dict["three_total_sizes_small"] = three_total_sizes_small
             except:
-                three_total_sizes_big_rule = ""
-                three_total_sizes_big = ""
-                three_total_sizes_small_rule = ""
-                three_total_sizes_small = ""
-                total_sizes_dict_rule["three_total_sizes_big"] = three_total_sizes_big_rule
-                total_sizes_dict["three_total_sizes_big"] = three_total_sizes_big
-                total_sizes_dict_rule["three_total_sizes_small"] = three_total_sizes_small_rule
-                total_sizes_dict["three_total_sizes_small"] = three_total_sizes_small
+                total_sizes_dict_rule["three_total_sizes_big"] = None
+                total_sizes_dict["three_total_sizes_big"] = None
+                total_sizes_dict_rule["three_total_sizes_small"] = None
+                total_sizes_dict["three_total_sizes_small"] = None
             # 第四节总分大小
             try:
                 four_total_sizes = result['o']["ou4st"]["v"]
@@ -308,14 +264,10 @@ class LanqiuSpider(scrapy.Spider):
                 total_sizes_dict_rule["four_total_sizes_small"] = four_total_sizes_small_rule
                 total_sizes_dict["four_total_sizes_small"] = four_total_sizes_small
             except:
-                four_total_sizes_big_rule = ""
-                four_total_sizes_big = ""
-                four_total_sizes_small_rule = ""
-                four_total_sizes_small = ""
-                total_sizes_dict_rule["four_total_sizes_big"] = four_total_sizes_big_rule
-                total_sizes_dict["four_total_sizes_big"] = four_total_sizes_big
-                total_sizes_dict_rule["four_total_sizes_small"] = four_total_sizes_small_rule
-                total_sizes_dict["four_total_sizes_small"] = four_total_sizes_small
+                total_sizes_dict_rule["four_total_sizes_big"] = None
+                total_sizes_dict["four_total_sizes_big"] = None
+                total_sizes_dict_rule["four_total_sizes_small"] = None
+                total_sizes_dict["four_total_sizes_small"] = None
 
 # ----------------------------------------总分单双分割线------------------------------------------------------------------
             # 全场 总分单双
@@ -324,85 +276,85 @@ class LanqiuSpider(scrapy.Spider):
             try:
                 odd_evens = result['o']["oe"]["v"]
                 # # 全场 总分单, 全场 总分双
-                odd_even_odd, odd_even_even = danshaung_fun(inner=odd_evens)
-                odd_evens_dict["two_sides_single"] = odd_even_odd
+                # odd_even_odd, odd_even_even = danshaung_fun(inner=odd_evens)
+                odd_evens_dict["two_sides_single"] = odd_evens[1]
                 odd_evens_dict_rule['two_sides_single'] = '单'
-                odd_evens_dict["two_sides_double"] = odd_even_even
+                odd_evens_dict["two_sides_double"] = odd_evens[3]
                 odd_evens_dict_rule['two_sides_double'] = '双'
             except:
-                odd_even_odd = ""
-                odd_even_even = ""
-                odd_evens_dict["two_sides_single"] = odd_even_odd
+                # odd_even_odd = ""
+                # odd_even_even = ""
+                odd_evens_dict["two_sides_single"] = None
                 odd_evens_dict_rule['two_sides_single'] = '单'
-                odd_evens_dict["two_sides_double"] = odd_even_even
+                odd_evens_dict["two_sides_double"] = None
                 odd_evens_dict_rule['two_sides_double'] = '双'
             # 上半场全场 总分单双
 
             try:
                 half_odd_evens = result['o']["oe1st"]["v"]
                 # 上半场 总分单, 上半场 总分双
-                half_odd_even_odd,half_odd_even_even = danshaung_fun(inner=half_odd_evens)
-                odd_evens_dict["half_two_sides_single"] = half_odd_even_odd
+                # half_odd_even_odd,half_odd_even_even = danshaung_fun(inner=half_odd_evens)
+                odd_evens_dict["half_two_sides_single"] = half_odd_evens[1]
                 odd_evens_dict_rule['half_two_sides_single'] = '单'
-                odd_evens_dict["half_two_sides_double"] = half_odd_even_even
+                odd_evens_dict["half_two_sides_double"] = half_odd_evens[3]
                 odd_evens_dict_rule['half_two_sides_double'] = '双'
             except:
-                half_odd_even_odd = ""
-                half_odd_even_even = ""
-                odd_evens_dict["half_two_sides_single"] = half_odd_even_odd
+                # half_odd_even_odd = ""
+                # half_odd_even_even = ""
+                odd_evens_dict["half_two_sides_single"] = None
                 odd_evens_dict_rule['half_two_sides_single'] = '单'
-                odd_evens_dict["half_two_sides_double"] = half_odd_even_even
+                odd_evens_dict["half_two_sides_double"] = None
                 odd_evens_dict_rule['half_two_sides_double'] = '双'
 
             # 总分:单/双-第一节
             try:
                 one_odd_evens = result['o']["oeq1"]["v"]
-                one_odd_even_odd,one_odd_even_even = danshaung_fun(inner=one_odd_evens)
-                odd_evens_dict["one_two_sides_single"] = one_odd_even_odd
+                # one_odd_even_odd,one_odd_even_even = danshaung_fun(inner=one_odd_evens)
+                odd_evens_dict["one_two_sides_single"] = one_odd_evens[1]
                 odd_evens_dict_rule['one_two_sides_single'] = '单'
-                odd_evens_dict["one_two_sides_double"] = one_odd_even_even
+                odd_evens_dict["one_two_sides_double"] = one_odd_evens[3]
                 odd_evens_dict_rule['one_two_sides_double'] = '双'
             except:
-                one_odd_even_odd = ""
-                one_odd_even_even = ""
-                odd_evens_dict["one_two_sides_single"] = one_odd_even_odd
+                # one_odd_even_odd = ""
+                # one_odd_even_even = ""
+                odd_evens_dict["one_two_sides_single"] = None
                 odd_evens_dict_rule['one_two_sides_single'] = '单'
-                odd_evens_dict["one_two_sides_double"] = one_odd_even_even
+                odd_evens_dict["one_two_sides_double"] = None
                 odd_evens_dict_rule['one_two_sides_double'] = '双'
 
 
             # 总分:单/双-第二节
             try:
                 two_odd_evens = result['o']["oeq2"]["v"]
-                two_odd_even_odd,two_odd_even_even = danshaung_fun(inner=two_odd_evens)
-                odd_evens_dict["two_two_sides_single"] = two_odd_even_odd
+                # two_odd_even_odd,two_odd_even_even = danshaung_fun(inner=two_odd_evens)
+                odd_evens_dict["two_two_sides_single"] = two_odd_evens[1]
                 odd_evens_dict_rule['two_two_sides_single'] = '单'
-                odd_evens_dict["two_two_sides_double"] = two_odd_even_even
+                odd_evens_dict["two_two_sides_double"] = two_odd_evens[3]
                 odd_evens_dict_rule['two_two_sides_double'] = '双'
             except:
-                two_odd_even_odd = ""
-                two_odd_even_even = ""
-                odd_evens_dict["two_two_sides_single"] = two_odd_even_odd
+                # two_odd_even_odd = ""
+                # two_odd_even_even = ""
+                odd_evens_dict["two_two_sides_single"] = None
                 odd_evens_dict_rule['two_two_sides_single'] = '单'
-                odd_evens_dict["two_two_sides_double"] = two_odd_even_even
+                odd_evens_dict["two_two_sides_double"] = None
                 odd_evens_dict_rule['two_two_sides_double'] = '双'
 
             # 总分:单/双-第三节
             try:
                 three_odd_evens = result['o']["oeq3"]["v"]
-                three_odd_even_odd,three_odd_even_even = danshaung_fun(inner=three_odd_evens)
-                odd_evens_dict["three_two_sides_single"] = three_odd_even_odd
+                # three_odd_even_odd,three_odd_even_even = danshaung_fun(inner=three_odd_evens)
+                odd_evens_dict["three_two_sides_single"] = three_odd_evens[1]
                 odd_evens_dict_rule['three_two_sides_single'] = '单'
-                odd_evens_dict["three_two_sides_double"] = three_odd_even_even
+                odd_evens_dict["three_two_sides_double"] = three_odd_evens[3]
                 odd_evens_dict_rule['three_two_sides_double'] = '双'
 
 
             except:
-                three_odd_even_odd = ""
-                three_odd_even_even = ""
-                odd_evens_dict["three_two_sides_single"] = three_odd_even_odd
+                # three_odd_even_odd = ""
+                # three_odd_even_even = ""
+                odd_evens_dict["three_two_sides_single"] = None
                 odd_evens_dict_rule['three_two_sides_single'] = '单'
-                odd_evens_dict["three_two_sides_double"] = three_odd_even_even
+                odd_evens_dict["three_two_sides_double"] = None
                 odd_evens_dict_rule['three_two_sides_double'] = '双'
 
 
@@ -410,17 +362,17 @@ class LanqiuSpider(scrapy.Spider):
             # 总分:单/双-第四节
             try:
                 four_odd_evens = result['o']["oeq4"]["v"]
-                four_odd_even_odd,four_odd_even_even = danshaung_fun(inner=four_odd_evens)
-                odd_evens_dict["four_two_sides_single"] = four_odd_even_odd
+                # four_odd_even_odd,four_odd_even_even = danshaung_fun(inner=four_odd_evens)
+                odd_evens_dict["four_two_sides_single"] = four_odd_evens[1]
                 odd_evens_dict_rule['four_two_sides_single'] = '单'
-                odd_evens_dict["four_two_sides_double"] = four_odd_even_even
+                odd_evens_dict["four_two_sides_double"] = four_odd_evens[3]
                 odd_evens_dict_rule['four_two_sides_double'] = '双'
             except:
-                four_odd_even_odd = ""
-                four_odd_even_even = ""
-                odd_evens_dict["four_two_sides_single"] = four_odd_even_odd
+                # four_odd_even_odd = ""
+                # four_odd_even_even = ""
+                odd_evens_dict["four_two_sides_single"] = None
                 odd_evens_dict_rule['four_two_sides_single'] = '单'
-                odd_evens_dict["four_two_sides_double"] = four_odd_even_even
+                odd_evens_dict["four_two_sides_double"] = None
                 odd_evens_dict_rule['four_two_sides_double'] = '双'
 
 # ----------------------------------------球队得分最后一位数分割线---------------------------------------------------------
@@ -454,10 +406,10 @@ class LanqiuSpider(scrapy.Spider):
                 capots_dict["capot_home"] = capot_home
                 capots_dict["capot_guest"] = capot_guest
             except:
-                capot_home = ""
-                capot_guest = ""
-                capots_dict["capot_home"] = capot_home
-                capots_dict["capot_guest"] = capot_guest
+                # capot_home = ""
+                # capot_guest = ""
+                capots_dict["capot_home"] = None
+                capots_dict["capot_guest"] = None
 
             # 上半场独赢
             try:
@@ -468,10 +420,10 @@ class LanqiuSpider(scrapy.Spider):
                 capots_dict["half_capot_home"] = half_capot_home
                 capots_dict["half_capot_guest"] = half_capot_guest
             except:
-                half_capot_home = ""
-                half_capot_guest = ""
-                capots_dict["half_capot_home"] = half_capot_home
-                capots_dict["half_capot_guest"] = half_capot_guest
+                # half_capot_home = ""
+                # half_capot_guest = ""
+                capots_dict["half_capot_home"] = None
+                capots_dict["half_capot_guest"] = None
 
             # 第一节独赢
             try:
@@ -482,10 +434,10 @@ class LanqiuSpider(scrapy.Spider):
                 capots_dict["one_capot_home"] = one_capot_home
                 capots_dict["one_capot_guest"] = one_capot_guest
             except:
-                one_capot_home = ""
-                one_capot_guest = ""
-                capots_dict["one_capot_home"] = one_capot_home
-                capots_dict["one_capot_guest"] = one_capot_guest
+                # one_capot_home = ""
+                # one_capot_guest = ""
+                capots_dict["one_capot_home"] = None
+                capots_dict["one_capot_guest"] = None
 
             # 第二节独赢
             try:
@@ -496,10 +448,10 @@ class LanqiuSpider(scrapy.Spider):
                 capots_dict["two_capot_home"] = two_capot_home
                 capots_dict["two_capot_guest"] = two_capot_guest
             except:
-                two_capot_home = ""
-                two_capot_guest = ""
-                capots_dict["two_capot_home"] = two_capot_home
-                capots_dict["two_capot_guest"] = two_capot_guest
+                # two_capot_home = ""
+                # two_capot_guest = ""
+                capots_dict["two_capot_home"] = None
+                capots_dict["two_capot_guest"] = None
 
             # 第三节独赢
             try:
@@ -510,10 +462,10 @@ class LanqiuSpider(scrapy.Spider):
                 capots_dict["three_capot_home"] = three_capot_home
                 capots_dict["three_capot_guest"] = three_capot_guest
             except:
-                three_capot_home = ""
-                three_capot_guest = ""
-                capots_dict["three_capot_home"] = three_capot_home
-                capots_dict["three_capot_guest"] = three_capot_guest
+                # three_capot_home = ""
+                # three_capot_guest = ""
+                capots_dict["three_capot_home"] = None
+                capots_dict["three_capot_guest"] = None
 
             # 第四节独赢
             try:
@@ -524,10 +476,10 @@ class LanqiuSpider(scrapy.Spider):
                 capots_dict["four_capot_home"] = four_capot_home
                 capots_dict["four_capot_guest"] = four_capot_guest
             except:
-                four_capot_home = ""
-                four_capot_guest = ""
-                capots_dict["four_capot_home"] = four_capot_home
-                capots_dict["four_capot_guest"] = four_capot_guest
+                # four_capot_home = ""
+                # four_capot_guest = ""
+                capots_dict["four_capot_home"] = None
+                capots_dict["four_capot_guest"] = None
 
 # ---------------------------------------------------华丽分割线列表es[1]--------------------------------------------------
             # 球队得分 全场主队 home
@@ -546,14 +498,14 @@ class LanqiuSpider(scrapy.Spider):
                     team_scores_dict_rule["score_home_small"] = score_home_small_rule
                     team_scores_dict["score_home_small"] = score_home_small
                 except:
-                    score_home_small = ""
-                    score_home_small_rule = ""
-                    score_home_big_rule = ""
-                    score_home_big = ""
-                    team_scores_dict_rule["score_home_big"] = score_home_big_rule
-                    team_scores_dict["score_home_big"] = score_home_big
-                    team_scores_dict_rule["score_home_small"] = score_home_small_rule
-                    team_scores_dict["score_home_small"] = score_home_small
+                    # score_home_small = ""
+                    # score_home_small_rule = ""
+                    # score_home_big_rule = ""
+                    # score_home_big = ""
+                    team_scores_dict_rule["score_home_big"] = None
+                    team_scores_dict["score_home_big"] = None
+                    team_scores_dict_rule["score_home_small"] = None
+                    team_scores_dict["score_home_small"] = None
                 # 球队得分 上半场主队 home
                 try:
                     half_score_homes = score_home['o']['ou1st']['v']
@@ -564,14 +516,14 @@ class LanqiuSpider(scrapy.Spider):
                     team_scores_dict_rule["half_score_home_small"] = half_score_home_small_rule
                     team_scores_dict["half_score_home_small"] = half_score_home_small
                 except:
-                    half_score_home_small = ""
-                    half_score_home_small_rule = ""
-                    half_score_home_big = ""
-                    half_score_home_big_rule = ""
-                    team_scores_dict_rule["half_score_home_big"] = half_score_home_big_rule
-                    team_scores_dict["half_score_home_big"] = half_score_home_big
-                    team_scores_dict_rule["half_score_home_small"] = half_score_home_small_rule
-                    team_scores_dict["half_score_home_small"] = half_score_home_small
+                    # half_score_home_small = ""
+                    # half_score_home_small_rule = ""
+                    # half_score_home_big = ""
+                    # half_score_home_big_rule = ""
+                    team_scores_dict_rule["half_score_home_big"] = None
+                    team_scores_dict["half_score_home_big"] = None
+                    team_scores_dict_rule["half_score_home_small"] = None
+                    team_scores_dict["half_score_home_small"] = None
 
                 # 球队得分:主队-大 / 小-第一节
                 try:
@@ -582,14 +534,14 @@ class LanqiuSpider(scrapy.Spider):
                     team_scores_dict_rule["one_score_home_small"] = one_score_home_small_rule
                     team_scores_dict["one_score_home_small"] = one_score_home_small
                 except:
-                    one_score_home_small = ""
-                    one_score_home_small_rule = ""
-                    one_score_home_big = ""
-                    one_score_home_big_rule = ""
-                    team_scores_dict_rule["one_score_home_big"] = one_score_home_big_rule
-                    team_scores_dict["one_score_home_big"] = one_score_home_big
-                    team_scores_dict_rule["one_score_home_small"] = one_score_home_small_rule
-                    team_scores_dict["one_score_home_small"] = one_score_home_small
+                    # one_score_home_small = ""
+                    # one_score_home_small_rule = ""
+                    # one_score_home_big = ""
+                    # one_score_home_big_rule = ""
+                    team_scores_dict_rule["one_score_home_big"] = None
+                    team_scores_dict["one_score_home_big"] = None
+                    team_scores_dict_rule["one_score_home_small"] = None
+                    team_scores_dict["one_score_home_small"] = None
 
                 # 球队得分:主队-大 / 小-第二节
                 try:
@@ -600,14 +552,14 @@ class LanqiuSpider(scrapy.Spider):
                     team_scores_dict_rule["two_score_home_small"] = two_score_home_small_rule
                     team_scores_dict["two_score_home_small"] = two_score_home_small
                 except:
-                    two_score_home_small = ""
-                    two_score_home_small_rule = ""
-                    two_score_home_big = ""
-                    two_score_home_big_rule = ""
-                    team_scores_dict_rule["two_score_home_big"] = two_score_home_big_rule
-                    team_scores_dict["two_score_home_big"] = two_score_home_big
-                    team_scores_dict_rule["two_score_home_small"] = two_score_home_small_rule
-                    team_scores_dict["two_score_home_small"] = two_score_home_small
+                    # two_score_home_small = ""
+                    # two_score_home_small_rule = ""
+                    # two_score_home_big = ""
+                    # two_score_home_big_rule = ""
+                    team_scores_dict_rule["two_score_home_big"] = None
+                    team_scores_dict["two_score_home_big"] = None
+                    team_scores_dict_rule["two_score_home_small"] = None
+                    team_scores_dict["two_score_home_small"] = None
 
                 # 球队得分:主队-大 / 小-第三节
                 try:
@@ -618,14 +570,14 @@ class LanqiuSpider(scrapy.Spider):
                     team_scores_dict_rule["three_score_home_small"] = three_score_home_small_rule
                     team_scores_dict["three_score_home_small"] = three_score_home_small
                 except:
-                    three_score_home_small = ""
-                    three_score_home_small_rule = ""
-                    three_score_home_big = ""
-                    three_score_home_big_rule = ""
-                    team_scores_dict_rule["three_score_home_big"] = three_score_home_big_rule
-                    team_scores_dict["three_score_home_big"] = three_score_home_big
-                    team_scores_dict_rule["three_score_home_small"] = three_score_home_small_rule
-                    team_scores_dict["three_score_home_small"] = three_score_home_small
+                    # three_score_home_small = ""
+                    # three_score_home_small_rule = ""
+                    # three_score_home_big = ""
+                    # three_score_home_big_rule = ""
+                    team_scores_dict_rule["three_score_home_big"] = None
+                    team_scores_dict["three_score_home_big"] = None
+                    team_scores_dict_rule["three_score_home_small"] = None
+                    team_scores_dict["three_score_home_small"] = None
 
                 # 球队得分:主队-大 / 小-第四节
                 try:
@@ -636,14 +588,14 @@ class LanqiuSpider(scrapy.Spider):
                     team_scores_dict_rule["four_score_home_small"] = four_score_home_small_rule
                     team_scores_dict["four_score_home_small"] = four_score_home_small
                 except:
-                    four_score_home_small = ""
-                    four_score_home_small_rule = ""
-                    four_score_home_big = ""
-                    four_score_home_big_rule = ""
-                    team_scores_dict_rule["four_score_home_big"] = four_score_home_big_rule
-                    team_scores_dict["four_score_home_big"] = four_score_home_big
-                    team_scores_dict_rule["four_score_home_small"] = four_score_home_small_rule
-                    team_scores_dict["four_score_home_small"] = four_score_home_small
+                    # four_score_home_small = ""
+                    # four_score_home_small_rule = ""
+                    # four_score_home_big = ""
+                    # four_score_home_big_rule = ""
+                    team_scores_dict_rule["four_score_home_big"] = None
+                    team_scores_dict["four_score_home_big"] = None
+                    team_scores_dict_rule["four_score_home_small"] = None
+                    team_scores_dict["four_score_home_small"] = None
 
 
 # ---------------------------------------------------华丽分割线列表es[2]--------------------------------------------------
@@ -662,14 +614,14 @@ class LanqiuSpider(scrapy.Spider):
                     team_scores_dict_rule["score_guest_small"] = score_guest_small_rule
                     team_scores_dict["score_guest_small"] = score_guest_small
                 except:
-                    score_guest_small = ""
-                    score_guest_small_rule = ""
-                    score_guest_big = ""
-                    score_guest_big_rule = ""
-                    team_scores_dict_rule["score_guest_big"] = score_guest_big_rule
-                    team_scores_dict["score_guest_big"] = score_guest_big
-                    team_scores_dict_rule["score_guest_small"] = score_guest_small_rule
-                    team_scores_dict["score_guest_small"] = score_guest_small
+                    # score_guest_small = ""
+                    # score_guest_small_rule = ""
+                    # score_guest_big = ""
+                    # score_guest_big_rule = ""
+                    team_scores_dict_rule["score_guest_big"] = None
+                    team_scores_dict["score_guest_big"] = None
+                    team_scores_dict_rule["score_guest_small"] = None
+                    team_scores_dict["score_guest_small"] = None
 
                 # 球队得分 上半场客队 guest
                 try:
@@ -680,14 +632,14 @@ class LanqiuSpider(scrapy.Spider):
                     team_scores_dict_rule["half_score_guest_small"] = half_score_guest_small_rule
                     team_scores_dict["half_score_guest_small"] = half_score_guest_small
                 except:
-                    half_score_guest_small = ""
-                    half_score_guest_small_rule = ""
-                    half_score_guest_big = ""
-                    half_score_guest_big_rule = ""
-                    team_scores_dict_rule["half_score_guest_big"] = half_score_guest_big_rule
-                    team_scores_dict["half_score_guest_big"] = half_score_guest_big
-                    team_scores_dict_rule["half_score_guest_small"] = half_score_guest_small_rule
-                    team_scores_dict["half_score_guest_small"] = half_score_guest_small
+                    # half_score_guest_small = ""
+                    # half_score_guest_small_rule = ""
+                    # half_score_guest_big = ""
+                    # half_score_guest_big_rule = ""
+                    team_scores_dict_rule["half_score_guest_big"] = None
+                    team_scores_dict["half_score_guest_big"] = None
+                    team_scores_dict_rule["half_score_guest_small"] = None
+                    team_scores_dict["half_score_guest_small"] = None
                 # 球队得分第一节
                 try:
                     one_score_guests = score_guest["o"]['ouq1']['v']
@@ -698,14 +650,14 @@ class LanqiuSpider(scrapy.Spider):
                     team_scores_dict_rule["one_score_guest_small"] = one_score_guest_small_rule
                     team_scores_dict["one_score_guest_small"] = one_score_guest_small
                 except:
-                    one_score_guest_small = ""
-                    one_score_guest_small_rule = ""
-                    one_score_guest_big = ""
-                    one_score_guest_big_rule = ""
-                    team_scores_dict_rule["one_score_guest_big"] = one_score_guest_big_rule
-                    team_scores_dict["one_score_guest_big"] = one_score_guest_big
-                    team_scores_dict_rule["one_score_guest_small"] = one_score_guest_small_rule
-                    team_scores_dict["one_score_guest_small"] = one_score_guest_small
+                    # one_score_guest_small = ""
+                    # one_score_guest_small_rule = ""
+                    # one_score_guest_big = ""
+                    # one_score_guest_big_rule = ""
+                    team_scores_dict_rule["one_score_guest_big"] = None
+                    team_scores_dict["one_score_guest_big"] = None
+                    team_scores_dict_rule["one_score_guest_small"] = None
+                    team_scores_dict["one_score_guest_small"] = None
 
                 # 球队得分第二节
                 try:
@@ -717,14 +669,10 @@ class LanqiuSpider(scrapy.Spider):
                     team_scores_dict_rule["two_score_guest_small"] = two_score_guest_small_rule
                     team_scores_dict["two_score_guest_small"] = two_score_guest_small
                 except:
-                    two_score_guest_small = ""
-                    two_score_guest_small_rule = ""
-                    two_score_guest_big = ""
-                    two_score_guest_big_rule = ""
-                    team_scores_dict_rule["two_score_guest_big"] = two_score_guest_big_rule
-                    team_scores_dict["two_score_guest_big"] = two_score_guest_big
-                    team_scores_dict_rule["two_score_guest_small"] = two_score_guest_small_rule
-                    team_scores_dict["two_score_guest_small"] = two_score_guest_small
+                    team_scores_dict_rule["two_score_guest_big"] = None
+                    team_scores_dict["two_score_guest_big"] = None
+                    team_scores_dict_rule["two_score_guest_small"] = None
+                    team_scores_dict["two_score_guest_small"] = None
                 # 球队得分第三节
                 try:
                     three_score_guests = score_guest["o"]['ouq3']['v']
@@ -735,14 +683,10 @@ class LanqiuSpider(scrapy.Spider):
                     team_scores_dict_rule["three_score_guest_small"] = three_score_guest_small_rule
                     team_scores_dict["three_score_guest_small"] = three_score_guest_small
                 except:
-                    three_score_guest_small = ""
-                    three_score_guest_small_rule = ""
-                    three_score_guest_big = ""
-                    three_score_guest_big_rule = ""
-                    team_scores_dict_rule["three_score_guest_big"] = three_score_guest_big_rule
-                    team_scores_dict["three_score_guest_big"] = three_score_guest_big
-                    team_scores_dict_rule["three_score_guest_small"] = three_score_guest_small_rule
-                    team_scores_dict["three_score_guest_small"] = three_score_guest_small
+                    team_scores_dict_rule["three_score_guest_big"] = None
+                    team_scores_dict["three_score_guest_big"] = None
+                    team_scores_dict_rule["three_score_guest_small"] = None
+                    team_scores_dict["three_score_guest_small"] = None
                 # 球队得分第四节
                 try:
                     four_score_guests = score_guest["o"]['ouq4']['v']
@@ -753,14 +697,10 @@ class LanqiuSpider(scrapy.Spider):
                     team_scores_dict_rule["four_score_guest_small"] = four_score_guest_small_rule
                     team_scores_dict["four_score_guest_small"] = four_score_guest_small
                 except:
-                    four_score_guest_small = ""
-                    four_score_guest_small_rule = ""
-                    four_score_guest_big = ""
-                    four_score_guest_big_rule = ""
-                    team_scores_dict_rule["four_score_guest_big"] = four_score_guest_big_rule
-                    team_scores_dict["four_score_guest_big"] = four_score_guest_big
-                    team_scores_dict_rule["four_score_guest_small"] = four_score_guest_small_rule
-                    team_scores_dict["four_score_guest_small"] = four_score_guest_small
+                    team_scores_dict_rule["four_score_guest_big"] = None
+                    team_scores_dict["four_score_guest_big"] = None
+                    team_scores_dict_rule["four_score_guest_small"] = None
+                    team_scores_dict["four_score_guest_small"] = None
 
             # 联赛id
             item['league_id'] = league_id

+ 9 - 8
hg3535/spiders/roll_wangqiu.py

@@ -124,7 +124,7 @@ class WangqiuSpider(scrapy.Spider):
 
 # ----------------------------------------第一节让球分割线---------------------------------------------------------------------------
 
-            #第一节让
+            #第一节让
             try:
                 # 第一节让球
                 one_concedes = result['o']["ahs1"]["v"]
@@ -140,8 +140,7 @@ class WangqiuSpider(scrapy.Spider):
 
 # ----------------------------------------第二节让球分割线-----------------------------------------------------------------
 
-            #第二节让球
-            # 第二节让球
+            # 第二节让盘
             try:
                 two_concedes = result['o']["ahs2"]["v"]
                 concedes_dict_rule['two_dishes_home'] = two_concedes[1]
@@ -190,10 +189,12 @@ class WangqiuSpider(scrapy.Spider):
             bureaus_dict_rule = {}
             try:
                 bureaus = result['o']["ahfts"]["v"]
-                bureaus_dict_rule['concede_home'] = bureaus[1]# 添加前缀
-                bureaus_dict['concede_home'] = bureaus[5]#
-                bureaus_dict_rule['concede_guest'] = bureaus[3]#
-                bureaus_dict['concede_guest'] = bureaus[7]##
+                if bureaus:
+                    a = bureaus
+                bureaus_dict_rule['concede_home'] = bureaus[1]
+                bureaus_dict['concede_home'] = bureaus[5]
+                bureaus_dict_rule['concede_guest'] = bureaus[3]
+                bureaus_dict['concede_guest'] = bureaus[7]
             except:
                 bureaus_dict_rule['concede_home'] = ""
                 bureaus_dict['concede_home'] = ""
@@ -205,7 +206,7 @@ class WangqiuSpider(scrapy.Spider):
             total_number_dict_rule = {}
             try:  #总局数 滚球大小
                 total_numbers = result['o']["oufts"]["v"]
-                total_number_dict_rule['total_number_big'] = total_numbers[1] #添加前缀wp
+                total_number_dict_rule['total_number_big'] = total_numbers[1]
                 total_number_dict['total_number_big'] = total_numbers[5]
                 total_number_dict_rule['total_number_small'] = total_numbers[3]
                 total_number_dict['total_number_small'] = total_numbers[7]

+ 2 - 2
hg3535/spiders/roll_zuqiu.py

@@ -18,8 +18,8 @@ class ZuqiuSpider(scrapy.Spider):
         "ITEM_PIPELINES":{
             'hg3535.pipelines.Roll_Zuqiupipeline': 100,
         },
-        'LOG_LEVEL': 'DEBUG',
-        'LOG_FILE': "../hg3535/log/roll_zuqiu_{}_{}_{}.log".format(to_day.year, to_day.month,to_day.day)
+        # 'LOG_LEVEL': 'DEBUG',
+        # 'LOG_FILE': "../hg3535/log/roll_zuqiu_{}_{}_{}.log".format(to_day.year, to_day.month,to_day.day)
     }
     start_urls = ['https://hg3535z.com/odds2/d/getodds?sid=1&pt=4&ubt=am&pn=0&sb=2&dc=null&pid=0'] # 滚球菜单 足球滚球列url
 

+ 2 - 2
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,