Bläddra i källkod

更新篮球, 父级玩法错误

Your Name 6 år sedan
förälder
incheckning
1c2b46df80

+ 182 - 204
hg3535/.idea/workspace.xml

@@ -4,15 +4,10 @@
     <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$/pipeline/bangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/bangqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pipeline/guanjun.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/guanjun.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipeline/lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/lanqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pipeline/roll_bangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_bangqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pipeline/roll_lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_lanqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pipeline/roll_wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_wangqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pipeline/roll_zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_zuqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pipeline/wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/wangqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pipeline/zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/zuqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/bangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/bangqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/lanqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/roll_lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_lanqiu.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -22,7 +17,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="1568009717445" 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="1568021098926" 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$change.coverage" NAME="change Coverage Results" MODIFIED="1567749757856" 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" />
@@ -54,8 +49,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/main.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="8" column="37" lean-forward="true" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
+            <state relative-caret-position="180">
+              <caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
               <folding>
                 <element signature="e#0#10#0" expanded="true" />
               </folding>
@@ -64,10 +59,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-7902">
-              <caret line="599" selection-start-line="599" selection-end-line="600" selection-end-column="70" />
+            <state relative-caret-position="-2654">
+              <caret line="63" selection-start-line="63" selection-end-line="65" selection-end-column="40" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
               </folding>
@@ -76,22 +71,22 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
+        <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="329">
-              <caret line="93" column="39" selection-start-line="93" selection-start-column="39" selection-end-line="93" selection-end-column="39" />
+            <state relative-caret-position="150">
+              <caret line="75" column="53" lean-forward="true" selection-start-line="75" selection-start-column="53" selection-end-line="75" selection-end-column="53" />
               <folding>
-                <element signature="e#0#15#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$/pipeline/bangqiu.py">
+        <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="319">
-              <caret line="113" column="23" selection-start-line="113" selection-start-column="12" selection-end-line="113" selection-end-column="23" />
+            <state relative-caret-position="102">
+              <caret line="37" selection-start-line="37" selection-end-line="37" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
               </folding>
@@ -100,60 +95,12 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pipeline/guanjun.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="215">
-              <caret line="73" column="23" selection-start-line="73" selection-start-column="12" selection-end-line="73" selection-end-column="23" />
-              <folding>
-                <element signature="e#18#32#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="114" column="58" lean-forward="true" selection-start-line="114" selection-start-column="58" selection-end-line="114" selection-end-column="58" />
-              <folding>
-                <element signature="e#0#15#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1840">
-              <caret line="122" column="44" selection-start-line="122" selection-start-column="44" selection-end-line="122" selection-end-column="44" />
-              <folding>
-                <element signature="e#0#15#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
+        <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="460">
-              <caret line="110" column="52" lean-forward="true" selection-start-line="110" selection-start-column="52" selection-end-line="110" selection-end-column="52" />
+            <state relative-caret-position="-7023">
+              <caret line="281" column="60" selection-start-line="281" selection-start-column="60" selection-end-line="281" selection-end-column="60" />
               <folding>
-                <element signature="e#0#15#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="500">
-              <caret line="115" column="21" lean-forward="true" selection-start-line="115" selection-start-column="21" selection-end-line="115" selection-end-column="21" />
-              <folding>
-                <element signature="e#0#15#0" expanded="true" />
+                <element signature="e#24#39#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -170,8 +117,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>three_total_sizes_big</find>
-      <find>None</find>
       <find>lastnumber_dict</find>
       <find>last_numbers_dict</find>
       <find>capots_dict</find>
@@ -200,6 +145,8 @@
       <find>team_scores_dict</find>
       <find>p_code</find>
       <find>3438017</find>
+      <find>utime</find>
+      <find>rangqiu_daxiao</find>
     </findStrings>
     <replaceStrings>
       <replace>&quot;&quot;</replace>
@@ -287,32 +234,32 @@
         <option value="$PROJECT_DIR$/spiders/wangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
         <option value="$PROJECT_DIR$/settings.py" />
         <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
         <option value="$PROJECT_DIR$/spiders/jieshu.py" />
         <option value="$PROJECT_DIR$/pipeline/jieshu.py" />
-        <option value="$PROJECT_DIR$/main.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_zuqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/zuqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/wangqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/bangqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/guanjun.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_wangqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_zuqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_bangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/bangqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/guanjun.py" />
+        <option value="$PROJECT_DIR$/main.py" />
+        <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="505" />
-    <option name="y" value="54" />
+    <option name="x" value="-411" />
+    <option name="y" value="27" />
     <option name="width" value="1458" />
-    <option name="height" value="1017" />
+    <option name="height" value="1014" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -650,21 +597,7 @@
       <workItem from="1567765446416" duration="3616000" />
       <workItem from="1567826229018" duration="3226000" />
       <workItem from="1567836768286" duration="10382000" />
-      <workItem from="1567990502559" duration="14139000" />
-    </task>
-    <task id="LOCAL-00010" summary="联赛添加redis测试">
-      <created>1556014183609</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1556014183609</updated>
-    </task>
-    <task id="LOCAL-00011" summary="联赛添加冠军,联赛过滤">
-      <created>1556102057191</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1556102057191</updated>
+      <workItem from="1567990502559" duration="19640000" />
     </task>
     <task id="LOCAL-00012" summary="修改足球,篮球赔率表插入">
       <created>1556186556377</created>
@@ -995,11 +928,25 @@
       <option name="project" value="LOCAL" />
       <updated>1568009292368</updated>
     </task>
-    <option name="localTasksCounter" value="59" />
+    <task id="LOCAL-00059" summary="更新篮球, 父级玩法错误">
+      <created>1568010645894</created>
+      <option name="number" value="00059" />
+      <option name="presentableId" value="LOCAL-00059" />
+      <option name="project" value="LOCAL" />
+      <updated>1568010645894</updated>
+    </task>
+    <task id="LOCAL-00060" summary="更新篮球, 父级玩法错误">
+      <created>1568012509861</created>
+      <option name="number" value="00060" />
+      <option name="presentableId" value="LOCAL-00060" />
+      <option name="project" value="LOCAL" />
+      <updated>1568012509861</updated>
+    </task>
+    <option name="localTasksCounter" value="61" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1897543000" />
+    <option name="totallyTimeSpent" value="1903044000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1014,12 +961,12 @@
     <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.15245202" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.15245202" />
       <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.2274678" />
+      <window_info active="true" anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" visible="true" weight="0.17596567" />
       <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" />
@@ -1027,9 +974,9 @@
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.1555794" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50692964" side_tool="true" weight="0.38519314" />
-      <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49307036" weight="0.3530043" />
-      <window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" weight="0.2693133" />
-      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" visible="true" weight="0.20386267" />
+      <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49307036" weight="0.15987125" />
+      <window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" weight="0.37017167" />
+      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.5665236" />
       <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" />
@@ -1146,7 +1093,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_bangqiu.py</url>
-          <line>74</line>
+          <line>76</line>
           <option name="timeStamp" value="58" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1166,7 +1113,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_wangqiu.py</url>
-          <line>275</line>
+          <line>277</line>
           <option name="timeStamp" value="71" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1201,12 +1148,12 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_bangqiu.py</url>
-          <line>207</line>
+          <line>209</line>
           <option name="timeStamp" value="164" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_bangqiu.py</url>
-          <line>226</line>
+          <line>228</line>
           <option name="timeStamp" value="165" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1276,7 +1223,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>236</line>
+          <line>238</line>
           <option name="timeStamp" value="218" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1291,7 +1238,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>190</line>
+          <line>192</line>
           <option name="timeStamp" value="225" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1304,6 +1251,36 @@
           <line>81</line>
           <option name="timeStamp" value="231" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
+          <line>246</line>
+          <option name="timeStamp" value="232" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
+          <line>260</line>
+          <option name="timeStamp" value="233" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
+          <line>274</line>
+          <option name="timeStamp" value="234" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
+          <line>288</line>
+          <option name="timeStamp" value="235" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
+          <line>302</line>
+          <option name="timeStamp" value="236" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
+          <line>316</line>
+          <option name="timeStamp" value="238" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -1451,16 +1428,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="28">
-          <caret line="20" column="10" lean-forward="true" selection-start-line="20" selection-start-column="10" selection-end-line="20" selection-end-column="10" />
-          <folding>
-            <element signature="e#38#53#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/items.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="138">
@@ -1501,16 +1468,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="33" column="80" selection-start-line="33" selection-start-column="80" selection-end-line="33" selection-end-column="80" />
-          <folding>
-            <element signature="e#24#35#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/middlewares.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="261">
@@ -1518,16 +1475,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-18">
-          <caret line="83" column="32" selection-start-line="83" selection-start-column="20" selection-end-line="83" selection-end-column="51" />
-          <folding>
-            <element signature="e#46#61#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="262">
@@ -1545,16 +1492,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="11800">
-          <caret line="599" selection-start-line="599" selection-end-line="599" />
-          <folding>
-            <element signature="e#24#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="20">
@@ -1580,16 +1517,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="251">
-          <caret line="36" column="44" lean-forward="true" selection-start-line="36" selection-start-column="44" selection-end-line="36" selection-end-column="44" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/requirements.txt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-360" />
@@ -1626,122 +1553,173 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="122">
-          <caret line="74" selection-start-line="74" selection-end-line="74" />
+        <state relative-caret-position="440">
+          <caret line="114" column="58" lean-forward="true" selection-start-line="114" selection-start-column="58" selection-end-line="114" selection-end-column="58" />
           <folding>
-            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/guanjun.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="48" column="13" lean-forward="true" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" />
+        <state relative-caret-position="215">
+          <caret line="73" column="23" selection-start-line="73" selection-start-column="12" selection-end-line="73" selection-end-column="23" />
           <folding>
-            <element signature="e#18#33#0" expanded="true" />
+            <element signature="e#18#32#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="8" column="37" lean-forward="true" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
+        <state relative-caret-position="319">
+          <caret line="113" column="23" selection-start-line="113" selection-start-column="12" selection-end-line="113" selection-end-column="23" />
           <folding>
-            <element signature="e#0#10#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="11612">
+          <caret line="599" selection-start-line="599" selection-end-line="600" selection-end-column="70" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="10578">
-          <caret line="1142" lean-forward="true" selection-start-line="1142" selection-end-line="1142" />
+        <state relative-caret-position="280">
+          <caret line="44" column="64" selection-start-line="44" selection-start-column="60" selection-end-line="44" selection-end-column="68" />
           <folding>
             <element signature="e#18#33#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-7902">
-          <caret line="599" selection-start-line="599" selection-end-line="600" selection-end-column="70" />
+        <state relative-caret-position="199">
+          <caret line="632" column="99" selection-start-line="632" selection-start-column="99" selection-end-line="632" selection-end-column="99" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#18#33#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="440">
-          <caret line="114" column="58" lean-forward="true" selection-start-line="114" selection-start-column="58" selection-end-line="114" selection-end-column="58" />
+          <caret line="59" selection-start-line="59" selection-end-line="61" selection-end-column="40" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="460">
-          <caret line="110" column="52" lean-forward="true" selection-start-line="110" selection-start-column="52" selection-end-line="110" selection-end-column="52" />
+        <state relative-caret-position="-2689">
+          <caret line="99" column="16" lean-forward="true" selection-start-line="99" selection-start-column="16" selection-end-line="99" selection-end-column="16" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1840">
-          <caret line="122" column="44" selection-start-line="122" selection-start-column="44" selection-end-line="122" selection-end-column="44" />
+        <state relative-caret-position="-2178">
+          <caret line="83" column="32" selection-start-line="83" selection-start-column="32" selection-end-line="83" selection-end-column="32" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#46#61#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="500">
-          <caret line="115" column="21" lean-forward="true" selection-start-line="115" selection-start-column="21" selection-end-line="115" selection-end-column="21" />
+        <state relative-caret-position="28">
+          <caret line="20" column="10" lean-forward="true" selection-start-line="20" selection-start-column="10" selection-end-line="20" selection-end-column="10" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#38#53#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="1402">
+          <caret line="240" column="39" lean-forward="true" selection-start-line="240" selection-start-column="24" selection-end-line="240" selection-end-column="39" />
+          <folding>
+            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#3127#11143#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="329">
-          <caret line="93" column="39" selection-start-line="93" selection-start-column="39" selection-end-line="93" selection-end-column="39" />
+        <state relative-caret-position="433">
+          <caret line="309" lean-forward="true" selection-start-line="309" selection-end-line="309" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="319">
-          <caret line="113" column="23" selection-start-line="113" selection-start-column="12" selection-end-line="113" selection-end-column="23" />
+        <state relative-caret-position="-2654">
+          <caret line="63" selection-start-line="63" selection-end-line="65" selection-end-column="40" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/guanjun.py">
+    <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="215">
-          <caret line="73" column="23" selection-start-line="73" selection-start-column="12" selection-end-line="73" selection-end-column="23" />
+        <state relative-caret-position="102">
+          <caret line="37" selection-start-line="37" selection-end-line="37" />
           <folding>
-            <element signature="e#18#32#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/main.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#10#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="75" column="53" lean-forward="true" selection-start-line="75" selection-start-column="53" selection-end-line="75" selection-end-column="53" />
+          <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="-7023">
+          <caret line="281" column="60" selection-start-line="281" selection-start-column="60" selection-end-line="281" selection-end-column="60" />
+          <folding>
+            <element signature="e#24#39#0" expanded="true" />
           </folding>
         </state>
       </provider>

+ 2 - 2
hg3535/main.py

@@ -6,7 +6,7 @@ from scrapy.cmdline import execute
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 # execute(["scrapy", "crawl", "liansai"])
 # execute(["scrapy", "crawl", "zuqiu"])
-# execute(["scrapy", "crawl", "lanqiu"])
+execute(["scrapy", "crawl", "lanqiu"])
 # execute(["scrapy", "crawl", "guanjun"])
 # execute(["scrapy", "crawl", "wangqiu"])
 # execute(["scrapy", "crawl", "wqbodan"])
@@ -18,6 +18,6 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 # execute(["scrapy", "crawl", "ball_status"]) #滚球id本地存
 # execute(["scrapy", "crawl", "ball_status_update"]) #滚球id结束时间更新状态
 # execute(["scrapy", "crawl", "saiguo"]) #滚球id结束时间更新状态
-execute(["scrapy", "crawl", "jieshu"]) #滚球id结束时间更新状态
+# execute(["scrapy", "crawl", "jieshu"]) #滚球id结束时间更新状态
 # execute(["scrapy", "crawl", "wq_jieshu"]) #滚球id结束时间更新状态
 # execute(["scrapy", "crawl", "bq_jieshu"]) #滚球id结束时间更新状态

+ 9 - 9
hg3535/pipeline/lanqiu.py

@@ -15,16 +15,16 @@ class Lanqiupipeline(object):
         self.mongo = pymongo.MongoClient(host=M_HOST, username=M_USER, password=M_PASSWORD, port=M_POST)
         self.db = self.mongo[M_DB]
 
-    @defer.inlineCallbacks
-    def process_item(self, item, spider):
-        out = defer.Deferred()
-        reactor.callInThread(self._do_calculation, item, out)
-        yield out
-        defer.returnValue(item)
-
+    # @defer.inlineCallbacks
     # def process_item(self, item, spider):
+    #     out = defer.Deferred()
+    #     reactor.callInThread(self._do_calculation, item, out)
+    #     yield out
+    #     defer.returnValue(item)
+
+    def process_item(self, item, spider):
 
-    def _do_calculation(self, item, out):
+    # def _do_calculation(self, item, out):
         logger = logging.getLogger(__name__)
         # 联赛id
         league_id = item['league_id']
@@ -306,4 +306,4 @@ class Lanqiupipeline(object):
                 logger.warning(odds_dict)
         else:
             logger.info('详细赔率列表为空')
-        reactor.callFromThread(out.callback, item)
+        # reactor.callFromThread(out.callback, item)

+ 1 - 1
hg3535/spiders/bangqiu.py

@@ -72,7 +72,7 @@ class BqrangqiuSpider(scrapy.Spider):
             new_data = new_datas["es"]
             item = Bangqiu()
             for result in new_data:
-                if result['pci']["ctid"] is 0:
+                if result['pci']["ctid"] == 0:
 
                     # 比赛id
                     game_id = str(result['k'])

+ 19 - 19
hg3535/spiders/lanqiu.py

@@ -272,7 +272,7 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict["tns_h"] = ""
                     # 第一节总分大小
                     try:
-                        one_total_sizes = result['o']["ou1st"]["v"]
+                        one_total_sizes = result['o']["ouq1"]["v"]
                         one_total_sizes_big_rule, one_total_size_big, one_total_sizes_small_rule, one_total_sizes_small = rangqiu_daxiao(
                             inner=one_total_sizes, pt=pt)
                         total_sizes_dict_rule["tnb_1"] = one_total_sizes_big_rule
@@ -286,7 +286,7 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict["tns_1"] = ""
                     # 第二节场总分大小
                     try:
-                        two_total_sizes = result['o']["ou1st"]["v"]
+                        two_total_sizes = result['o']["ouq2"]["v"]
                         two_total_sizes_big_rule, two_total_sizes_big, two_total_sizes_small_rule, two_total_sizes_small = rangqiu_daxiao(
                             inner=two_total_sizes, pt=pt)
                         total_sizes_dict_rule["tnb_2"] = two_total_sizes_big_rule
@@ -300,7 +300,7 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict["tns_2"] = ""
                     # 第三节总分大小
                     try:
-                        three_total_sizes = result['o']["ou1st"]["v"]
+                        three_total_sizes = result['o']["ouq3"]["v"]
                         three_total_sizes_big_rule, three_total_sizes_big, three_total_sizes_small_rule, three_total_sizes_small = rangqiu_daxiao(
                             inner=three_total_sizes, pt=pt)
                         total_sizes_dict_rule["tnb_3"] = three_total_sizes_big_rule
@@ -314,7 +314,7 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict["tns_3"] = ""
                     # 第四节总分大小
                     try:
-                        four_total_sizes = result['o']["ou1st"]["v"]
+                        four_total_sizes = result['o']["ouq4"]["v"]
                         four_total_sizes_big_rule, four_total_sizes_big, four_total_sizes_small_rule, four_total_sizes_small = rangqiu_daxiao(
                             inner=four_total_sizes, pt=pt)
                         total_sizes_dict_rule["tnb_4"] = four_total_sizes_big_rule
@@ -497,7 +497,7 @@ class LanqiuSpider(scrapy.Spider):
 
                     # 第四节独赢
                     try:
-                        four_capots = result['o']["mlq2"]["v"]
+                        four_capots = result['o']["mlq4"]["v"]
                         four_capot_list = [four_capots[i] for i in range(len(four_capots)) if i % 2 == 1]
                         four_capot_home = four_capot_list[0]
                         four_capot_guest = four_capot_list[1]
@@ -507,7 +507,7 @@ class LanqiuSpider(scrapy.Spider):
                         capots_dict["ch_4"] = ""
                         capots_dict["cg_4"] = ""
 
-                # ---------------------------------------------------华丽分割线列表es[1]--------------------------------------------------
+                # ---------------------------------------------------华丽分割线列表es[1]-----------------------------------
                 # 球队得分 全场主队 home
                 if result['pci']['ctid'] == 41:
                     try:
@@ -519,7 +519,7 @@ class LanqiuSpider(scrapy.Spider):
                         try:
                             score_homes = score_home["o"]["ou"]['v']
                             score_home_big_rule, score_home_big, score_home_small_rule, score_home_small = rangqiu_daxiao(
-                                inner=score_homes)
+                                inner=score_homes, pt=pt)
                             team_scores_dict_rule["tbhb"] = score_home_big_rule
                             team_scores_dict["tbhb"] = score_home_big
                             team_scores_dict_rule["tbhs"] = score_home_small_rule
@@ -534,7 +534,7 @@ class LanqiuSpider(scrapy.Spider):
                             half_score_homes = score_home['o']['ou1st']['v']
                             # 球队得分 上半场主队 大条件
                             half_score_home_big_rule, half_score_home_big, half_score_home_small_rule, half_score_home_small = rangqiu_daxiao(
-                                inner=half_score_homes)
+                                inner=half_score_homes, pt=pt)
                             team_scores_dict_rule["tbhb_h"] = half_score_home_big_rule
                             team_scores_dict["tbhb_h"] = half_score_home_big
                             team_scores_dict_rule["tbhs_h"] = half_score_home_small_rule
@@ -549,7 +549,7 @@ class LanqiuSpider(scrapy.Spider):
                         try:
                             one_score_homes = score_home['o']["ouq1"]["v"]
                             one_score_home_big_rule, one_score_home_big, one_score_home_small_rule, one_score_home_small = rangqiu_daxiao(
-                                inner=one_score_homes)
+                                inner=one_score_homes, pt=pt)
                             team_scores_dict_rule["tbhb_1"] = one_score_home_big_rule
                             team_scores_dict["tbhb_1"] = one_score_home_big
                             team_scores_dict_rule["tbhs_1"] = one_score_home_small_rule
@@ -564,7 +564,7 @@ class LanqiuSpider(scrapy.Spider):
                         try:
                             two_score_homes = score_home['o']["ouq2"]["v"]
                             two_score_home_big_rule, two_score_home_big, two_score_home_small_rule, two_score_home_small = rangqiu_daxiao(
-                                inner=two_score_homes)
+                                inner=two_score_homes, pt=pt)
                             team_scores_dict_rule["tbhb_2"] = two_score_home_big_rule
                             team_scores_dict["tbhb_2"] = two_score_home_big
                             team_scores_dict_rule["tbhs_2"] = two_score_home_small_rule
@@ -579,7 +579,7 @@ class LanqiuSpider(scrapy.Spider):
                         try:
                             three_score_homes = score_home['o']["ouq3"]["v"]
                             three_score_home_big_rule, three_score_home_big, three_score_home_small_rule, three_score_home_small = rangqiu_daxiao(
-                                inner=three_score_homes)
+                                inner=three_score_homes, pt=pt)
                             team_scores_dict_rule["tbhb_3"] = three_score_home_big_rule
                             team_scores_dict["tbhb_3"] = three_score_home_big
                             team_scores_dict_rule["tbhs_3"] = three_score_home_small_rule
@@ -594,7 +594,7 @@ class LanqiuSpider(scrapy.Spider):
                         try:
                             four_score_homes = score_home['o']["ouq4"]["v"]
                             four_score_home_big_rule, four_score_home_big, four_score_home_small_rule, four_score_home_small = rangqiu_daxiao(
-                                inner=four_score_homes)
+                                inner=four_score_homes, pt=pt)
                             team_scores_dict_rule["tbhb_4"] = four_score_home_big_rule
                             team_scores_dict["tbhb_4"] = four_score_home_big
                             team_scores_dict_rule["tbhs_4"] = four_score_home_small_rule
@@ -605,7 +605,7 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict_rule["tbhs_4"] = ""
                             team_scores_dict["tbhs_4"] = ""
 
-                # ---------------------------------------------------华丽分割线列表es[2]--------------------------------------------------
+                # ---------------------------------------------------华丽分割线列表es[2]-----------------------------------
                 # 球队得分 客队 guest
                 if result['pci']['ctid'] == 42:
                     try:
@@ -617,7 +617,7 @@ class LanqiuSpider(scrapy.Spider):
                             # 球队得分: 大 / 小
                             score_guests = score_guest["o"]["ou"]['v']
                             score_guest_big_rule, score_guest_big, score_guest_small_rule, score_guest_small = rangqiu_daxiao(
-                                inner=score_guests)
+                                inner=score_guests, pt=pt)
                             team_scores_dict_rule["tbgb"] = score_guest_big_rule
                             team_scores_dict["tbgb"] = score_guest_big
                             team_scores_dict_rule["tbgs"] = score_guest_small_rule
@@ -632,7 +632,7 @@ class LanqiuSpider(scrapy.Spider):
                         try:
                             half_score_guests = score_guest["o"]['ou1st']['v']
                             half_score_guest_big_rule, half_score_guest_big, half_score_guest_small_rule, half_score_guest_small = rangqiu_daxiao(
-                                inner=half_score_guests)
+                                inner=half_score_guests, pt=pt)
                             team_scores_dict_rule["tbgb_h"] = half_score_guest_big_rule
                             team_scores_dict["tbgb_h"] = half_score_guest_big
                             team_scores_dict_rule["tbgs_h"] = half_score_guest_small_rule
@@ -646,7 +646,7 @@ class LanqiuSpider(scrapy.Spider):
                         try:
                             one_score_guests = score_guest["o"]['ouq1']['v']
                             one_score_guest_big_rule, one_score_guest_big, one_score_guest_small_rule, one_score_guest_small = rangqiu_daxiao(
-                                inner=one_score_guests)
+                                inner=one_score_guests, pt=pt)
                             team_scores_dict_rule["tbgb_1"] = one_score_guest_big_rule
                             team_scores_dict["tbgb_1"] = one_score_guest_big
                             team_scores_dict_rule["tbgs_1"] = one_score_guest_small_rule
@@ -661,7 +661,7 @@ class LanqiuSpider(scrapy.Spider):
                         try:
                             two_score_guests = score_guest["o"]['ouq2']['v']
                             two_score_guest_big_rule, two_score_guest_big, two_score_guest_small_rule, two_score_guest_small = rangqiu_daxiao(
-                                inner=two_score_guests)
+                                inner=two_score_guests, pt=pt)
                             team_scores_dict_rule["tbgb_2"] = two_score_guest_big_rule
                             team_scores_dict["tbgb_2"] = two_score_guest_big
                             team_scores_dict_rule["tbgs_2"] = two_score_guest_small_rule
@@ -675,7 +675,7 @@ class LanqiuSpider(scrapy.Spider):
                         try:
                             three_score_guests = score_guest["o"]['ouq3']['v']
                             three_score_guest_big_rule, three_score_guest_big, three_score_guest_small_rule, three_score_guest_small = rangqiu_daxiao(
-                                inner=three_score_guests)
+                                inner=three_score_guests, pt=pt)
                             team_scores_dict_rule["tbgb_3"] = three_score_guest_big_rule
                             team_scores_dict["tbgb_3"] = three_score_guest_big
                             team_scores_dict_rule["tbgs_3"] = three_score_guest_small_rule
@@ -689,7 +689,7 @@ class LanqiuSpider(scrapy.Spider):
                         try:
                             four_score_guests = score_guest["o"]['ouq4']['v']
                             four_score_guest_big_rule, four_score_guest_big, four_score_guest_small_rule, four_score_guest_small = rangqiu_daxiao(
-                                inner=four_score_guests)
+                                inner=four_score_guests, pt=pt)
                             team_scores_dict_rule["tbgb_4"] = four_score_guest_big_rule
                             team_scores_dict["tbgb_4"] = four_score_guest_big
                             team_scores_dict_rule["tbgs_4"] = four_score_guest_small_rule

+ 5 - 5
hg3535/spiders/roll_lanqiu.py

@@ -237,7 +237,7 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict["tns_h"] = ""
                     # 第一节总分大小
                     try:
-                        one_total_sizes = result['o']["ou1st"]["v"]
+                        one_total_sizes = result['o']["ouq1"]["v"]
                         one_total_sizes_big_rule, one_total_sizes_big, one_total_sizes_small_rule, one_total_sizes_small = rangqiu_daxiao(
                             inner=one_total_sizes)
                         total_sizes_dict_rule["tnb_1"] = one_total_sizes_big_rule
@@ -251,7 +251,7 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict["tns_1"] = ""
                     # 第二节场总分大小
                     try:
-                        two_total_sizes = result['o']["ou2st"]["v"]
+                        two_total_sizes = result['o']["ouq2"]["v"]
                         two_total_sizes_big_rule, two_total_sizes_big, two_total_sizes_small_rule, two_total_sizes_small = rangqiu_daxiao(
                             inner=two_total_sizes)
                         total_sizes_dict_rule["tnb_2"] = two_total_sizes_big_rule
@@ -265,7 +265,7 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict["tns_2"] = ""
                     # 第三节总分大小
                     try:
-                        three_total_sizes = result['o']["ou3st"]["v"]
+                        three_total_sizes = result['o']["ouq3"]["v"]
                         three_total_sizes_big_rule, three_total_sizes_big, three_total_sizes_small_rule, three_total_sizes_small = rangqiu_daxiao(
                             inner=three_total_sizes)
                         total_sizes_dict_rule["tnb_3"] = three_total_sizes_big_rule
@@ -279,7 +279,7 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict["tns_3"] = ""
                     # 第四节总分大小
                     try:
-                        four_total_sizes = result['o']["ou4st"]["v"]
+                        four_total_sizes = result['o']["ouq4"]["v"]
                         four_total_sizes_big_rule, four_total_sizes_big, four_total_sizes_small_rule, four_total_sizes_small = rangqiu_daxiao(
                             inner=four_total_sizes)
                         total_sizes_dict_rule["tnb_4"] = four_total_sizes_big_rule
@@ -463,7 +463,7 @@ class LanqiuSpider(scrapy.Spider):
 
                     # 第四节独赢
                     try:
-                        four_capots = result['o']["mlq2"]["v"]
+                        four_capots = result['o']["mlq4"]["v"]
                         four_capot_list = [four_capots[i] for i in range(len(four_capots)) if i % 2 == 1]
                         four_capot_home = four_capot_list[0]
                         four_capot_guest = four_capot_list[1]