更新篮球, 父级玩法错误

hg3535/.idea/workspace.xml

@@ -7,10 +7,10 @@
       <change beforePath="$PROJECT_DIR$/pipeline/jieshu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/jieshu.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_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/zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/zuqiu.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$/spiders/jieshu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/jieshu.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_zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_zuqiu.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" />
@@ -20,7 +20,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="1567834653952" 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="1567994061135" 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" />
@@ -49,74 +49,48 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="173">
-              <caret line="215" column="37" selection-start-line="215" selection-start-column="36" selection-end-line="215" selection-end-column="38" />
-              <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="413">
-              <caret line="165" column="69" lean-forward="true" selection-start-line="165" selection-start-column="69" selection-end-line="165" selection-end-column="69" />
-              <folding>
-                <element signature="e#0#15#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+        <entry file="file://$PROJECT_DIR$/main.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2418">
-              <caret line="52" column="4" selection-start-line="52" selection-start-column="4" selection-end-line="52" selection-end-column="77" />
+            <state relative-caret-position="280">
+              <caret line="14" column="43" selection-start-line="14" selection-start-column="43" selection-end-line="14" selection-end-column="43" />
               <folding>
-                <element signature="e#24#39#0" expanded="true" />
+                <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$/pipeline/bangqiu.py">
+        <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="538">
-              <caret line="157" column="22" selection-start-line="157" selection-start-column="12" selection-end-line="157" selection-end-column="22" />
+            <state relative-caret-position="-3689">
+              <caret line="39" column="23" selection-start-line="39" selection-start-column="23" selection-end-line="39" selection-end-column="23" />
               <folding>
-                <element signature="e#0#15#0" expanded="true" />
-                <element signature="e#4506#4774#0" />
-                <element signature="e#4542#4641#0" />
-                <element signature="e#4684#4774#0" />
+                <element signature="e#38#53#0" expanded="true" />
+                <element signature="e#2808#21219#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
+        <entry file="file://$PROJECT_DIR$/spiders/zuqiu.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" />
+            <state relative-caret-position="314">
+              <caret line="102" column="37" selection-start-line="102" selection-start-column="34" selection-end-line="102" selection-end-column="37" />
               <folding>
-                <element signature="e#46#61#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/roll_wangqiu.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="462">
-              <caret line="102" column="23" selection-start-line="102" selection-start-column="12" selection-end-line="102" selection-end-column="23" />
+            <state relative-caret-position="1366">
+              <caret line="119" column="44" selection-start-line="119" selection-start-column="44" selection-end-line="119" selection-end-column="44" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
               </folding>
@@ -125,45 +99,36 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="588">
-              <caret line="817" column="40" selection-start-line="817" selection-start-column="33" selection-end-line="817" selection-end-column="43" />
+            <state relative-caret-position="277">
+              <caret line="1121" column="53" selection-start-line="1121" selection-start-column="53" selection-end-line="1121" selection-end-column="53" />
               <folding>
-                <element signature="e#24#35#0" expanded="true" />
+                <element signature="e#18#33#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <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="262">
-              <caret line="142" column="17" lean-forward="true" selection-start-line="139" selection-end-line="153" selection-end-column="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/utils/helper.py">
+        <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="21" column="20" selection-end-line="34" />
+            <state relative-caret-position="246">
+              <caret line="37" selection-start-line="37" selection-end-line="37" />
               <folding>
-                <element signature="e#0#14#0" expanded="true" />
+                <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">
+        <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-14">
-              <caret line="116" column="22" selection-start-line="116" selection-start-column="12" selection-end-line="116" selection-end-column="22" />
+            <state relative-caret-position="197">
+              <caret line="49" column="27" lean-forward="true" selection-start-line="49" selection-start-column="27" selection-end-line="49" selection-end-column="27" />
               <folding>
-                <element signature="e#0#15#0" expanded="true" />
+                <element signature="e#18#33#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -180,7 +145,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>get_pcode</find>
       <find>match_time</find>
       <find>three_total_sizes_big</find>
       <find>None</find>
@@ -209,6 +173,7 @@
       <find>corner_ball</find>
       <find>Hgjieshu</find>
       <find>total_size</find>
+      <find>team_scores_dict</find>
       <find>p_code</find>
     </findStrings>
     <replaceStrings>
@@ -294,27 +259,27 @@
         <option value="$PROJECT_DIR$/spiders/guanjun.py" />
         <option value="$PROJECT_DIR$/pipeline/guanjun.py" />
         <option value="$PROJECT_DIR$/items.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_zuqiu.py" />
         <option value="$PROJECT_DIR$/change.py" />
         <option value="$PROJECT_DIR$/spiders/wangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/bangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_bangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/wangqiu.py" />
         <option value="$PROJECT_DIR$/settings.py" />
-        <option value="$PROJECT_DIR$/spiders/jieshu.py" />
         <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/zuqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/jieshu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
-        <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_wangqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
         <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/zuqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_zuqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/jieshu.py" />
+        <option value="$PROJECT_DIR$/spiders/jieshu.py" />
+        <option value="$PROJECT_DIR$/main.py" />
       </list>
     </option>
   </component>
@@ -337,11 +302,6 @@
               <item name="hg3535" type="b2602c69:ProjectViewProjectNode" />
               <item name="hg3535" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="hg3535" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hg3535" type="462c0819:PsiDirectoryNode" />
-              <item name="log" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="hg3535" type="b2602c69:ProjectViewProjectNode" />
               <item name="hg3535" type="462c0819:PsiDirectoryNode" />
@@ -664,14 +624,8 @@
       <workItem from="1567126891838" duration="187506000" />
       <workItem from="1567765446416" duration="3616000" />
       <workItem from="1567826229018" duration="3226000" />
-      <workItem from="1567836768286" duration="3376000" />
-    </task>
-    <task id="LOCAL-00003" summary="修改联赛错误">
-      <created>1555727734616</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1555727734616</updated>
+      <workItem from="1567836768286" duration="10382000" />
+      <workItem from="1567990502559" duration="3452000" />
     </task>
     <task id="LOCAL-00004" summary="修改冠军，导入错误">
       <created>1555727939763</created>
@@ -1009,11 +963,18 @@
       <option name="project" value="LOCAL" />
       <updated>1567767196921</updated>
     </task>
-    <option name="localTasksCounter" value="52" />
+    <task id="LOCAL-00052" summary="更新篮球, 父级玩法错误">
+      <created>1567844689680</created>
+      <option name="number" value="00052" />
+      <option name="presentableId" value="LOCAL-00052" />
+      <option name="project" value="LOCAL" />
+      <updated>1567844689680</updated>
+    </task>
+    <option name="localTasksCounter" value="53" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1876398000" />
+    <option name="totallyTimeSpent" value="1886856000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1026,14 +987,13 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.15778251" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.11940298" />
       <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.3969957" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" weight="0.29613733" />
       <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" />
@@ -1043,7 +1003,7 @@
       <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.21459228" />
-      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.76502144" />
+      <window_info active="true" anchor="bottom" id="Run" order="12" sideWeight="0.87473345" visible="true" weight="0.6255365" />
       <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" />
@@ -1147,7 +1107,8 @@
     <MESSAGE value="'更新日志按天输出'" />
     <MESSAGE value="updata" />
     <MESSAGE value="更新" />
-    <option name="LAST_COMMIT_MESSAGE" value="更新" />
+    <MESSAGE value="更新篮球, 父级玩法错误" />
+    <option name="LAST_COMMIT_MESSAGE" value="更新篮球, 父级玩法错误" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1197,16 +1158,6 @@
           <line>84</line>
           <option name="timeStamp" value="104" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>295</line>
-          <option name="timeStamp" value="105" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>297</line>
-          <option name="timeStamp" value="106" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/saiguo.py</url>
           <line>47</line>
@@ -1217,14 +1168,9 @@
           <line>63</line>
           <option name="timeStamp" value="132" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>162</line>
-          <option name="timeStamp" value="135" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
-          <line>212</line>
+          <line>197</line>
           <option name="timeStamp" value="136" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1302,6 +1248,31 @@
           <line>37</line>
           <option name="timeStamp" value="216" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
+          <line>232</line>
+          <option name="timeStamp" value="218" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/roll_lanqiu.py</url>
+          <line>599</line>
+          <option name="timeStamp" value="220" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/roll_lanqiu.py</url>
+          <line>598</line>
+          <option name="timeStamp" value="221" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
+          <line>186</line>
+          <option name="timeStamp" value="225" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/zuqiu.py</url>
+          <line>102</line>
+          <option name="timeStamp" value="226" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -1512,18 +1483,7 @@
         <state relative-caret-position="-109" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-6291">
-          <caret line="10" selection-start-line="10" selection-end-line="10" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/log/zuqiu_2019_9_6.log">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1125" />
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/log/zuqiu_2019_9_6.log" />
     <entry file="file://C:/venv/Lib/site-packages/bson/son.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="139">
@@ -1571,176 +1531,187 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/middlewares.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="261">
+          <caret line="137" selection-start-line="137" selection-end-line="137" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1220">
-          <caret line="94" column="23" lean-forward="true" selection-start-line="94" selection-start-column="23" selection-end-line="94" selection-end-column="23" />
+        <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#0#15#0" expanded="true" />
+            <element signature="e#46#61#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
+    <entry file="file://$PROJECT_DIR$/settings.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-358">
-          <caret line="3" column="14" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
+        <state relative-caret-position="262">
+          <caret line="142" column="17" lean-forward="true" selection-start-line="139" selection-end-line="153" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/utils/helper.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="856">
-          <caret line="600" column="58" selection-start-line="600" selection-start-column="58" selection-end-line="600" selection-end-column="58" />
+        <state relative-caret-position="420">
+          <caret line="21" column="20" selection-end-line="34" />
           <folding>
-            <element signature="e#18#33#0" expanded="true" />
+            <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/middlewares.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="137" selection-start-line="137" selection-end-line="137" />
+        <state relative-caret-position="462">
+          <caret line="102" column="23" selection-start-line="102" selection-start-column="12" selection-end-line="102" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="38" selection-start-line="38" selection-end-line="38" />
+        <state relative-caret-position="538">
+          <caret line="157" column="22" selection-start-line="157" selection-start-column="12" selection-end-line="157" selection-end-column="22" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#4506#4774#0" />
+            <element signature="e#4542#4641#0" />
+            <element signature="e#4684#4774#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5125">
-          <caret line="490" column="36" selection-start-line="490" selection-start-column="36" selection-end-line="490" selection-end-column="36" />
+        <state relative-caret-position="4680">
+          <caret line="243" column="50" selection-start-line="243" selection-start-column="50" selection-end-line="243" selection-end-column="50" />
           <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$/main.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="21" column="38" selection-start-line="21" selection-start-column="38" selection-end-line="21" selection-end-column="38" />
+        <state relative-caret-position="140">
+          <caret line="17" selection-start-line="17" selection-end-line="17" />
           <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$/spiders/roll_zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="20">
-          <caret line="39" column="23" selection-start-line="39" selection-start-column="23" selection-end-line="39" selection-end-column="23" />
+        <state relative-caret-position="11800">
+          <caret line="599" selection-start-line="599" selection-end-line="599" />
           <folding>
-            <element signature="e#38#53#0" expanded="true" />
+            <element signature="e#24#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.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" />
+        <state relative-caret-position="3060">
+          <caret line="162" column="27" selection-start-line="162" selection-start-column="27" selection-end-line="162" selection-end-column="27" />
           <folding>
-            <element signature="e#46#61#0" expanded="true" />
+            <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/settings.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="262">
-          <caret line="142" column="17" lean-forward="true" selection-start-line="139" selection-end-line="153" selection-end-column="54" />
+        <state relative-caret-position="20">
+          <caret line="10" selection-start-line="10" selection-end-line="10" selection-end-column="55" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/helper.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="21" column="20" selection-end-line="34" />
+        <state relative-caret-position="20">
+          <caret line="116" column="22" selection-start-line="116" selection-start-column="12" selection-end-line="116" selection-end-column="22" />
           <folding>
-            <element signature="e#0#14#0" expanded="true" />
+            <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$/spiders/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="102" column="23" selection-start-line="102" selection-start-column="12" selection-end-line="102" selection-end-column="23" />
+        <state relative-caret-position="314">
+          <caret line="102" column="37" selection-start-line="102" selection-start-column="34" selection-end-line="102" selection-end-column="37" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="538">
-          <caret line="157" column="22" selection-start-line="157" selection-start-column="12" selection-end-line="157" selection-end-column="22" />
+        <state relative-caret-position="1366">
+          <caret line="119" column="44" selection-start-line="119" selection-start-column="44" selection-end-line="119" selection-end-column="44" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
-            <element signature="e#4506#4774#0" />
-            <element signature="e#4542#4641#0" />
-            <element signature="e#4684#4774#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-14">
-          <caret line="116" column="22" selection-start-line="116" selection-start-column="12" selection-end-line="116" selection-end-column="22" />
+        <state relative-caret-position="-3689">
+          <caret line="39" column="23" selection-start-line="39" selection-start-column="23" selection-end-line="39" selection-end-column="23" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#38#53#0" expanded="true" />
+            <element signature="e#2808#21219#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="588">
-          <caret line="817" column="40" selection-start-line="817" selection-start-column="33" selection-end-line="817" selection-end-column="43" />
+        <state relative-caret-position="277">
+          <caret line="1121" column="53" selection-start-line="1121" selection-start-column="53" selection-end-line="1121" selection-end-column="53" />
           <folding>
-            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#18#33#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="413">
-          <caret line="165" column="69" lean-forward="true" selection-start-line="165" selection-start-column="69" selection-end-line="165" selection-end-column="69" />
+        <state relative-caret-position="197">
+          <caret line="49" column="27" lean-forward="true" selection-start-line="49" selection-start-column="27" selection-end-line="49" selection-end-column="27" />
           <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/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="173">
-          <caret line="215" column="37" selection-start-line="215" selection-start-column="36" selection-end-line="215" selection-end-column="38" />
+        <state relative-caret-position="246">
+          <caret line="37" selection-start-line="37" selection-end-line="37" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2418">
-          <caret line="52" column="4" selection-start-line="52" selection-start-column="4" selection-end-line="52" selection-end-column="77" />
+        <state relative-caret-position="280">
+          <caret line="14" column="43" selection-start-line="14" selection-start-column="43" selection-end-line="14" selection-end-column="43" />
           <folding>
-            <element signature="e#24#39#0" expanded="true" />
+            <element signature="e#0#10#0" expanded="true" />
           </folding>
         </state>
       </provider>

hg3535/main.py

@@ -11,13 +11,13 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 # execute(["scrapy", "crawl", "wangqiu"])
 # execute(["scrapy", "crawl", "wqbodan"])
 # execute(["scrapy", "crawl", "bangqiu"])
-# execute(["scrapy", "crawl", "roll_zuqiu"]) # 滚球足球 回来要解开这个注释 其他全部解封
+execute(["scrapy", "crawl", "roll_zuqiu"]) # 滚球足球 回来要解开这个注释 其他全部解封
 # execute(["scrapy", "crawl", "roll_lanqiu"]) #滚球篮球
 # execute(["scrapy", "crawl", "roll_wangqiu"]) #滚球网球
 # execute(["scrapy", "crawl", "roll_bangqiu"])  # 滚球棒球
 # 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结束时间更新状态

hg3535/pipeline/jieshu.py

@@ -1,4 +1,6 @@
 # import datetime
+import datetime
+
 import pymongo
 # import time
 import logging
@@ -40,7 +42,7 @@ class Jieshuqiupipeline(object):
             game_code = "bq"
         status_dict = {"game_code": game_code, "title": "match_status", "source": "hg3535"}
         data_list = []
-        data = {'match_id': match_id, 'status': 2, "is_rollball": 0, "is_today": 0, "is_morningplate": 0, "is_stringscene": 0, "is_horn": 0}
+        data = {'match_id': match_id, 'status': 2, "is_rollball": 0, "is_today": 0, "is_morningplate": 0, "is_stringscene": 0, "is_horn": 0, 'game_code': game_code, 'update': datetime.datetime.now()}
         data_list.append(data)
         status_dict['data'] = data_list
         res = Helper.async_post(MATCH_STATUS, status_dict)

hg3535/pipeline/lanqiu.py

@@ -30,7 +30,6 @@ class Lanqiupipeline(object):
         league_id = item['league_id']
         # 联赛名
         league_name = item['league_name']
-        # result = item['result']
         # 比赛id
         match_id = item['game_id']
         # 球队1
@@ -39,8 +38,6 @@ class Lanqiupipeline(object):
         team_guest = item['team_guest']
         # 数量(97>)
         tag_number = item['number']
-        # 比赛状态
-        # zhuangtai = item['zhuangtai']
         # 日期
         try:
             data_game = item['data_game'].split("/")
@@ -58,19 +55,9 @@ class Lanqiupipeline(object):
         time_game = str(item['time_game'])
         # 比赛时间，时间戳
         us_time = "2019" + "-" + month + "-" + day + " " + time_game + ":00"
-        # r_ctime = "2019" + "-" + month + "-" + day
         # 现在时间，时间戳
         utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
-        # expire_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time() + 60))
-        # # 队1分数
-        # score_home = item['score_home']
-        # # 队2分数
-        # score_guest = item['score_guest']
-        # # 第几节
-        # jijie = item['jijie']
-        # # 球队得分
-        # qiudui = item['qiudui']
-        pt = item['pt']
+        pt = str(item['pt'])
         # 让球
         concedes_dict = item['concede']
         concedes_dict_rule = item['concede_rule']
@@ -87,8 +74,6 @@ class Lanqiupipeline(object):
         # 球队得分大小
         team_scores_dict = item['team_score']
         team_scores_dict_rule = item['team_score_rule']
-        # 让球
-        # lanqiu = item['lanqiu']
         match_date, match_time, time3 = new_time(us_time)
         uuid = Helper.genearte_uuid(league_name + 'hg3535')
         # 让球 数据插入数据库
@@ -117,12 +102,12 @@ class Lanqiupipeline(object):
             logger.info('篮球联赛已存在')
 
         """赛事"""
-        if pt == 3:
+        if pt == '3':
             is_rollball = 0
             is_today = 0
             is_morningplate = 0
             is_stringscene = 1
-        elif pt == 2:
+        elif pt == '2':
             is_rollball = 0
             is_today = 0
             is_morningplate = 1
@@ -296,7 +281,7 @@ class Lanqiupipeline(object):
                                 odds_only, sole, 'hg3535', '0', '']
                 capots_data = dict(zip(capots_key, capots_value))
                 data_list.append(capots_data)
-        if pt == 3:
+        if pt == '3':
             ris_stringscene = 1
         else:
             ris_stringscene = 0

hg3535/pipeline/roll_lanqiu.py

@@ -25,15 +25,12 @@ class Roll_Lanqiupipeline(object):
 
     # def process_item(self, item, spider):
     def _do_calculation(self, item, out):
-        url = 'http://admin.5gogo.com'
-        roll_lq = []
         # 使用twisted将mysql插入变成异步执行
         logger = logging.getLogger(__name__)
         # 联赛id
         league_id = item['league_id']
         # 联赛名
         league_name = item['league_name']
-        # result = item['result']
         # 比赛id
         match_id = item['game_id']
         # 球队1 #home_team
@@ -43,9 +40,6 @@ class Roll_Lanqiupipeline(object):
         # 数量(97>)
         number = item['number']
         # 比赛状态
-        zhuangtai = item['zhuangtai']
-        # 日期
-        # data_game = item['data_game']
         result_mark = item['score_dict']
         try:
             data_game = item['data_game'].split("/")
@@ -61,10 +55,6 @@ class Roll_Lanqiupipeline(object):
             day = str(data_game[0])
         # 比赛时间
         time_game = str(item['time_game'])
-        # 比赛时间，时间戳
-        ctime = "2019" + "-" + month + "-" + day + "" + time_game + ":00"
-        r_ctime = "2019" + "-" + month + "-" + day
-        expire_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time() + 60))  # 过期时间
         # 现在时间，时间戳
         utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
         match_date = datetime.datetime.now().strftime("%Y-%m-%d")
@@ -75,7 +65,6 @@ class Roll_Lanqiupipeline(object):
         # 第几节
         jijie = item['jijie']
         # 球队得分
-        qiudui = item['qiudui']
         pt = 4
         match_score = "{}:{}".format(score_home, score_guest)
         concedes_dict = item['concede']
@@ -92,7 +81,7 @@ class Roll_Lanqiupipeline(object):
         last_time = "{}-12-31 23:59:59".format(datetime.datetime.now().year)
 
         uuid = Helper.genearte_uuid(league_name + 'hg3535')
-        if self.db.lq_league35.find({'lg_id': league_id}).count() < 1:
+        if self.db.lq_league35222.find({'lg_id': league_id}).count() < 1:
             league_dict = {"game_code": "lq", "title": "league", "source": "hg3535"}
             league_list = []
             league_key = ["name_chinese", "kind", "match_mode", "if_stop", "last_time", "lg_id", "source", "uuid"]
@@ -104,7 +93,7 @@ class Roll_Lanqiupipeline(object):
             if res:
                 if '成功' in res:
                     logger.info('篮球滚球联赛提交成功, {}'.format(res))
-                    self.db.hg3535_lq_league.insert(league_data)
+                    self.db.lq_league35222.insert(league_data)
                     logger.info(league_dict)
                 else:
                     logger.warning('篮球滚球联赛提交失败, {}'.format(res))
@@ -191,14 +180,12 @@ class Roll_Lanqiupipeline(object):
                     odd_evens_data = dict(zip(odd_evens_key, odd_evens_value))
                     data_list.append(odd_evens_data)
 
-        lastnumber_dict = {'0或5': '_zero_five', '1或6': '_one_six', '2或7': '_two_seven', '3或8': '_three_eight',
-                           '4或9': '_four_nine'}
+        lastnumber_dict = {'0或5': 'lnh0', '1或6': 'lnh1', '2或7': 'lnh2', '3或8': 'lnh3', '4或9': 'lnh4'}
         last_home = last_numbers_dict['last_home']
         if last_home:
             for key, value in last_home.items():
-                odds_code = 'last_home' + lastnumber_dict[key]
-                condition = lastnumber_dict[key]
-                hash_str = "LN" + odds_code + '0' + str(condition) + str(
+                odds_code =lastnumber_dict[key]
+                hash_str = "LN" + odds_code + '0' + str(key) + str(
                     value) + "hg3535" + str(match_id)
                 sole_str = "LN" + str(key) + '0' + str(match_id) + "hg3535"
                 odds_only = Helper.genearte_MD5(hash_str, pt)
@@ -206,23 +193,23 @@ class Roll_Lanqiupipeline(object):
                 last_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                  "condition", "odds_only", "sole", "source", "type", "team"]
                 last_home_value = [match_id, league_id, odds_code, "0", 0, 'LN', value,
-                                   condition, odds_only, sole, "hg3535", "0", ""]
+                                   key, odds_only, sole, "hg3535", "0", ""]
                 last_home_data = dict(zip(last_home_key, last_home_value))
                 data_list.append(last_home_data)
 
         last_guest = last_numbers_dict['last_guest']
         if last_guest:
             for key, value in last_guest.items():
-                odds_code = 'last_guest' + lastnumber_dict[key]
-                condition = lastnumber_dict[key]
-                hash_str = "LN" + odds_code + '0' + str(condition) + str(value) + "hg3535" + str(match_id)
+                odds_code = lastnumber_dict[key]
+                # condition = lastnumber_dict[key]
+                hash_str = "LN" + odds_code + '0' + str(key) + str(value) + "hg3535" + str(match_id)
                 sole_str = "LN" + str(key) + '0' + str(match_id) + "hg3535"
                 odds_only = Helper.genearte_MD5(hash_str, pt)
                 sole = Helper.genearte_MD5(sole_str, pt)
                 last_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                   "condition", "odds_only", "sole", "source", "type", "team"]
                 last_guest_value = [match_id, league_id, odds_code, "0", 0, 'LN', value,
-                                    condition, odds_only, sole, "hg3535", "0", ""]
+                                    key, odds_only, sole, "hg3535", "0", ""]
                 last_guest_data = dict(zip(last_guest_key, last_guest_value))
                 data_list.append(last_guest_data)
 

hg3535/pipeline/roll_zuqiu.py

@@ -79,7 +79,7 @@ class Roll_Zuqiupipeline(object):
             res = Helper.async_post(LEAGUE_URL, league_dict)
             if res:
                 if "成功" in res:
-                    self.db.hg3535_zq_league.insert(league_list)
+                    self.db.zq_league35.insert(league_list)
                     logger.info('足球滚球联赛提交成功, {}'.format(res))
                     logger.info(league_dict)
                 else:
@@ -615,16 +615,16 @@ class Roll_Zuqiupipeline(object):
             horn_scoreh = horn_team['horn_scoreh']
             horn_scoreg = horn_team['horn_scoreg']
             all_goal = int(horn_scoreh) + int(horn_scoreg)
-            match_id = horn_team['horn_id']
+            horn_id = horn_team['horn_id']
             # half_way = item['half_way']
             match_score = "{}:{}".format(horn_scoreh, horn_scoreg)
-            if self.db.zq_competition35.find({"match_id": match_id, 'is_rollball': 1}).count() < 1:
+            if self.db.zq_competition35.find({"match_id": horn_id, 'is_rollball': 1}).count() < 1:
                 match_list = []
                 match_dict = {"game_code": "zq", "title": "match", "source": "hg3535"}
                 match_kay = ["home_team", "guest_team", "lg_id", "status", "match_id", "match_date", "match_time",
                              "tag", "source", "is_rollball", "is_morningplate", "is_stringscene", "us_time", "uuid",
                              "half_match_id", "is_today", "is_horn"]
-                match_value = [team_home, team_guest, league_id, 1, match_id, match_date, '00:00', number,
+                match_value = [team_home, team_guest, league_id, 1, horn_id, match_date, '00:00', number,
                                "hg3535", 1, 0, 0, utime, uuid, 0, 0, 1]
                 match_data = dict(zip(match_kay, match_value))
                 match_list.append(match_data)

hg3535/spiders/jieshu.py

@@ -44,6 +44,8 @@ class HgjieshuSpider(scrapy.Spider):
                 item['match_id'] = match_id
                 # item['status'] = status
                 yield item
+            else:
+                return
         except Exception as e:
             logger.warning(e)
             return

hg3535/spiders/lanqiu.py

@@ -161,10 +161,6 @@ class LanqiuSpider(scrapy.Spider):
                         concedes_dict_rule['cog'] = concede_guest_rule
                         concedes_dict['cog'] = concede_guest
                     except:
-                        # concede_guest = ""
-                        # concede_guest_rule = ""
-                        # concede_home = ""
-                        # concede_home_rule = ""
                         concedes_dict_rule['coh'] = ""
                         concedes_dict['coh'] = ""
                         concedes_dict_rule['cog'] = ""
@@ -181,10 +177,6 @@ class LanqiuSpider(scrapy.Spider):
                         concedes_dict['cog_h'] = half_concede_guest
 
                     except:
-                        # half_concede_home_rule = ""
-                        # half_concede_home = ""
-                        # half_concede_guest_rule = ""
-                        # half_concede_guest = ""
                         concedes_dict_rule['coh_h'] = ""
                         concedes_dict['coh_h'] = ""
                         concedes_dict_rule['cog_h'] = ""
@@ -201,10 +193,6 @@ class LanqiuSpider(scrapy.Spider):
                         concedes_dict['cog_1'] = one_concede_guest
 
                     except:
-                        # one_concede_guest = ""
-                        # one_concede_guest_rule = ""
-                        # one_concede_home = ""
-                        # one_concede_home_rule = ""
                         concedes_dict_rule['coh_1'] = ""
                         concedes_dict['coh_1'] = ""
                         concedes_dict_rule['cog_1'] = ""
@@ -219,10 +207,6 @@ class LanqiuSpider(scrapy.Spider):
                         concedes_dict_rule['cog_2'] = two_concede_guest_rule
                         concedes_dict['cog_2'] = two_concede_guest
                     except:
-                        # two_concede_guest = ""
-                        # two_concede_guest_rule = ""
-                        # two_concede_home = ""
-                        # two_concede_home_rule = ""
                         concedes_dict_rule['coh_2'] = ""
                         concedes_dict['coh_2'] = ""
                         concedes_dict_rule['cog_2'] = ""
@@ -238,10 +222,6 @@ class LanqiuSpider(scrapy.Spider):
                         concedes_dict['cog_3'] = three_concede_guest
 
                     except:
-                        # three_concede_guest = ""
-                        # three_concede_guest_rule = ""
-                        # three_concede_home = ""
-                        # three_concede_home_rule = ""
                         concedes_dict_rule['coh_3'] = ""
                         concedes_dict['coh_3'] = ""
                         concedes_dict_rule['cog_3'] = ""
@@ -257,10 +237,6 @@ class LanqiuSpider(scrapy.Spider):
                         concedes_dict['cog_4'] = four_concede_guest
 
                     except:
-                        # four_concede_guest = ""
-                        # four_concede_guest_rule = ""
-                        # four_concede_home = ""
-                        # four_concede_home_rule = ""
                         concedes_dict_rule['coh_4'] = ""
                         concedes_dict['coh_4'] = ""
                         concedes_dict_rule['cog_4'] = ""
@@ -276,10 +252,6 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict_rule["tns"] = total_sizes_small_rule
                         total_sizes_dict["tns"] = total_sizes_small
                     except:
-                        # total_sizes_big_rule = ""
-                        # total_sizes_big = ""
-                        # total_sizes_small_rule = ""
-                        # total_sizes_small = ""
                         total_sizes_dict_rule["tnb"] = ""
                         total_sizes_dict["tnb"] = ""
                         total_sizes_dict_rule["tns"] = ""
@@ -294,10 +266,6 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict_rule["tns_h"] = half_total_sizes_small_rule
                         total_sizes_dict["tns_h"] = 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["tnb_h"] = ""
                         total_sizes_dict["tnb_h"] = ""
                         total_sizes_dict_rule["tns_h"] = ""
@@ -312,10 +280,6 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict_rule["tns_1"] = one_total_sizes_small_rule
                         total_sizes_dict["tns_1"] = 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["tnb_1"] = ""
                         total_sizes_dict["tnb_1"] = ""
                         total_sizes_dict_rule["tns_1"] = ""
@@ -330,10 +294,6 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict_rule["tns_2"] = two_total_sizes_small_rule
                         total_sizes_dict["tns_2"] = 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["tnb_2"] = ""
                         total_sizes_dict["tnb_2"] = ""
                         total_sizes_dict_rule["tns_2"] = ""
@@ -348,10 +308,6 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict_rule["tns_3"] = three_total_sizes_small_rule
                         total_sizes_dict["tns_3"] = 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["tnb_3"] = ""
                         total_sizes_dict["tnb_3"] = ""
                         total_sizes_dict_rule["tns_3"] = ""
@@ -366,10 +322,6 @@ class LanqiuSpider(scrapy.Spider):
                         total_sizes_dict_rule["tns_4"] = four_total_sizes_small_rule
                         total_sizes_dict["tns_4"] = 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["tnb_4"] = ""
                         total_sizes_dict["tnb_4"] = ""
                         total_sizes_dict_rule["tns_4"] = ""
@@ -380,7 +332,6 @@ 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["tss"] = odd_evens[1]
                         odd_evens_dict_rule['tss'] = '单'
                         odd_evens_dict["tsd"] = odd_evens[3]
@@ -396,7 +347,6 @@ class LanqiuSpider(scrapy.Spider):
                     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["tss_h"] = half_odd_evens[1]
                         odd_evens_dict_rule['tss_h'] = '单'
                         odd_evens_dict["tsd_h"] = half_odd_evens[3]
@@ -412,14 +362,11 @@ class LanqiuSpider(scrapy.Spider):
                     # 总分:单/双-第一节
                     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["tss_1"] = one_odd_evens[1]
                         odd_evens_dict_rule['tss_1'] = '单'
                         odd_evens_dict["tsd_1"] = one_odd_evens[3]
                         odd_evens_dict_rule['tsd_1'] = '双'
                     except:
-                        # one_odd_even_odd = ""
-                        # one_odd_even_even = ""
                         odd_evens_dict["tss_1"] = ""
                         odd_evens_dict_rule['tss_1'] = '单'
                         odd_evens_dict["tsd_1"] = ""
@@ -428,14 +375,11 @@ class LanqiuSpider(scrapy.Spider):
                     # 总分:单/双-第二节
                     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["tss_2"] = two_odd_evens[1]
                         odd_evens_dict_rule['tss_2'] = '单'
                         odd_evens_dict["tsd_2"] = two_odd_evens[3]
                         odd_evens_dict_rule['tsd_2'] = '双'
                     except:
-                        # two_odd_even_odd = ""
-                        # two_odd_even_even = ""
                         odd_evens_dict["tss_2"] = ""
                         odd_evens_dict_rule['tss_2'] = '单'
                         odd_evens_dict["tsd_2"] = ""
@@ -444,14 +388,11 @@ class LanqiuSpider(scrapy.Spider):
                     # 总分:单/双-第三节
                     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["tss_3"] = three_odd_evens[1]
                         odd_evens_dict_rule['tss_3'] = '单'
                         odd_evens_dict["tsd_3"] = three_odd_evens[3]
                         odd_evens_dict_rule['tsd_3'] = '双'
                     except:
-                        # three_odd_even_odd = ""
-                        # three_odd_even_even = ""
                         odd_evens_dict["tss_3"] = ""
                         odd_evens_dict_rule['tss_3'] = '单'
                         odd_evens_dict["tsd_3"] = ""
@@ -466,8 +407,6 @@ class LanqiuSpider(scrapy.Spider):
                         odd_evens_dict["tsd_4"] = four_odd_evens[3]
                         odd_evens_dict_rule['tsd_4'] = '双'
                     except:
-                        # four_odd_even_odd = ""
-                        # four_odd_even_even = ""
                         odd_evens_dict["tss_4"] = ""
                         odd_evens_dict_rule['tss_4'] = '单'
                         odd_evens_dict["tsd_4"] = ""
@@ -480,9 +419,6 @@ class LanqiuSpider(scrapy.Spider):
                         last_home = {last_numbers[0][0]: last_numbers[0][2], last_numbers[1][0]: last_numbers[1][2],
                                      last_numbers[2][0]: last_numbers[2][2], last_numbers[3][0]: last_numbers[3][2],
                                      last_numbers[4][0]: last_numbers[4][2]}
-                        # if last_numbers:
-                        #     for last_number in last_numbers:
-                        #         last_home[last_number[0]] = last_number[2]
                     except:
                         last_home = {}
                     last_numbers_dict["last_home"] = last_home
@@ -494,9 +430,6 @@ class LanqiuSpider(scrapy.Spider):
                                       new_last_numbers[2][0]: new_last_numbers[2][2],
                                       new_last_numbers[3][0]: new_last_numbers[3][2],
                                       new_last_numbers[4][0]: new_last_numbers[4][2]}
-                        # if new_last_numbers:
-                        #     for new_last_number in new_last_numbers:
-                        #         last_guest[new_last_number[0]] = new_last_number[2]
                     except:
                         last_guest = {}
                     last_numbers_dict["last_guest"] = last_guest
@@ -511,8 +444,6 @@ class LanqiuSpider(scrapy.Spider):
                         capots_dict["ch"] = capot_home
                         capots_dict["cg"] = capot_guest
                     except:
-                        # capot_home = ""
-                        # capot_guest = ""
                         capots_dict["ch"] = ""
                         capots_dict["cg"] = ""
 
@@ -525,8 +456,6 @@ class LanqiuSpider(scrapy.Spider):
                         capots_dict["ch_h"] = half_capot_home
                         capots_dict["cg_h"] = half_capot_guest
                     except:
-                        # half_capot_home = ""
-                        # half_capot_guest = ""
                         capots_dict["ch_h"] = ""
                         capots_dict["cg_h"] = ""
 
@@ -539,8 +468,6 @@ class LanqiuSpider(scrapy.Spider):
                         capots_dict["ch_1"] = one_capot_home
                         capots_dict["cg_1"] = one_capot_guest
                     except:
-                        # one_capot_home = ""
-                        # one_capot_guest = ""
                         capots_dict["ch_1"] = ""
                         capots_dict["cg_1"] = ""
 
@@ -553,8 +480,6 @@ class LanqiuSpider(scrapy.Spider):
                         capots_dict["ch_2"] = two_capot_home
                         capots_dict["cg_2"] = two_capot_guest
                     except:
-                        # two_capot_home = ""
-                        # two_capot_guest = ""
                         capots_dict["ch_2"] = ""
                         capots_dict["cg_2"] = ""
 
@@ -567,8 +492,6 @@ class LanqiuSpider(scrapy.Spider):
                         capots_dict["ch_3"] = three_capot_home
                         capots_dict["cg_3"] = three_capot_guest
                     except:
-                        # three_capot_home = ""
-                        # three_capot_guest = ""
                         capots_dict["ch_3"] = ""
                         capots_dict["cg_3"] = ""
 
@@ -581,8 +504,6 @@ class LanqiuSpider(scrapy.Spider):
                         capots_dict["ch_4"] = four_capot_home
                         capots_dict["cg_4"] = four_capot_guest
                     except:
-                        # four_capot_home = ""
-                        # four_capot_guest = ""
                         capots_dict["ch_4"] = ""
                         capots_dict["cg_4"] = ""
 
@@ -604,10 +525,6 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict_rule["tbhs"] = score_home_small_rule
                             team_scores_dict["tbhs"] = score_home_small
                         except:
-                            # score_home_small = ""
-                            # score_home_small_rule = ""
-                            # score_home_big_rule = ""
-                            # score_home_big = ""
                             team_scores_dict_rule["tbhb"] = ""
                             team_scores_dict["tbhb"] = ""
                             team_scores_dict_rule["tbhs"] = ""

hg3535/spiders/roll_lanqiu.py

@@ -86,6 +86,8 @@ class LanqiuSpider(scrapy.Spider):
             league_name = new_datas.get("c", "").get("n", "")
             new_data = new_datas.get("es", "")
             # result = new_data[0]
+            team_scores_dict = {}
+            team_scores_dict_rule = {}
             for result in new_data:
                 ctid = result['pci']['ctid']
                 if ctid == 0:
@@ -497,10 +499,8 @@ class LanqiuSpider(scrapy.Spider):
                     except:
                         pass
 
-                # ---------------------------------------------------华丽分割线列表es[1]--------------------------------------------------
+                # ---------------------------------------------------华丽分割线列表es[1]-----------------------------------
                 # 球队得分大/小 全场主队 home
-                team_scores_dict = {}
-                team_scores_dict_rule = {}
                 if ctid == 41:
                     if result:
                         try:
@@ -590,8 +590,7 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict["tbhb_4"] = ""
                             team_scores_dict_rule["tbhs_4"] = ""
                             team_scores_dict["tbhs_4"] = ""
-
-                # ---------------------------------------------------华丽分割线列表es[2]--------------------------------------------------
+                # ---------------------------------------------------华丽分割线列表es[2]-----------------------------------
                 # 球队得分 客队 guest
                 if ctid == 42:
                     if result:
@@ -682,43 +681,42 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict["tbgs_4"] = ""
                 # 篮球详细比分
 
-
-                # 联赛id
-                item['league_id'] = league_id
-                # 联赛名
-                item['league_name'] = league_name
-                # item['result'] = result
-                # 比赛id
-                item['game_id'] = game_id
-                # 球队1
-                item['team_home'] = team_home
-                # 球队2
-                item['team_guest'] = team_guest
-                # 数量(97>)
-                item['number'] = number
-                # 比赛状态
-                item['zhuangtai'] = zhuangtai
-                # 日期
-                item['data_game'] = data_game
-                # 开赛时间
-                item['time_game'] = time_game
-                # 队1分数
-                item['score_home'] = score_home1
-                # 队2分数
-                item['score_guest'] = score_guest1
-                # 第几节
-                item['jijie'] = jijie
-                # 球队得分
-                item['qiudui'] = qiudui
-                item['concede'] = concedes_dict
-                item['concede_rule'] = concedes_dict_rule
-                item['odd_even'] = odd_evens_dict
-                item['odd_even_rule'] = odd_evens_dict_rule
-                item['total_size'] = total_sizes_dict
-                item['total_size_rule'] = total_sizes_dict_rule
-                item['last_number'] = last_numbers_dict
-                item['capot'] = capots_dict
-                item['team_score'] = team_scores_dict
-                item['team_score_rule'] = team_scores_dict_rule
-                item['score_dict'] = score_dict
-                yield item
+            # 联赛id
+            item['league_id'] = league_id
+            # 联赛名
+            item['league_name'] = league_name
+            # item['result'] = result
+            # 比赛id
+            item['game_id'] = game_id
+            # 球队1
+            item['team_home'] = team_home
+            # 球队2
+            item['team_guest'] = team_guest
+            # 数量(97>)
+            item['number'] = number
+            # 比赛状态
+            item['zhuangtai'] = zhuangtai
+            # 日期
+            item['data_game'] = data_game
+            # 开赛时间
+            item['time_game'] = time_game
+            # 队1分数
+            item['score_home'] = score_home1
+            # 队2分数
+            item['score_guest'] = score_guest1
+            # 第几节
+            item['jijie'] = jijie
+            # 球队得分
+            item['qiudui'] = qiudui
+            item['concede'] = concedes_dict
+            item['concede_rule'] = concedes_dict_rule
+            item['odd_even'] = odd_evens_dict
+            item['odd_even_rule'] = odd_evens_dict_rule
+            item['total_size'] = total_sizes_dict
+            item['total_size_rule'] = total_sizes_dict_rule
+            item['last_number'] = last_numbers_dict
+            item['capot'] = capots_dict
+            item['team_score'] = team_scores_dict
+            item['team_score_rule'] = team_scores_dict_rule
+            item['score_dict'] = score_dict
+            yield item