Переглянути джерело

更新篮球, 父级玩法错误

Your Name 6 роки тому
батько
коміт
fd2587a144

+ 209 - 142
hg3535/.idea/workspace.xml

@@ -4,9 +4,13 @@
     <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/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$/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/zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/zuqiu.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -16,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="1567766700183" 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$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" />
@@ -46,22 +50,22 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/main.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.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="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#10#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/lanqiu.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-800">
-              <caret line="143" column="106" selection-start-line="143" selection-start-column="106" selection-end-line="143" selection-end-column="106" />
+            <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>
@@ -69,37 +73,52 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="33" column="80" lean-forward="true" selection-start-line="33" selection-start-column="80" selection-end-line="33" selection-end-column="80" />
+            <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" />
               <folding>
-                <element signature="e#24#35#0" expanded="true" />
+                <element signature="e#24#39#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1931">
-              <caret line="156" column="112" selection-start-line="156" selection-start-column="112" selection-end-line="156" selection-end-column="112" />
+            <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>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-3529">
-              <caret line="30" column="33" lean-forward="true" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" />
+            <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#48#59#0" expanded="true" />
+                <element signature="e#0#15#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -108,8 +127,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="335">
-              <caret line="80" column="20" selection-start-line="80" selection-start-column="20" selection-end-line="80" selection-end-column="20" />
+            <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" />
               <folding>
                 <element signature="e#24#35#0" expanded="true" />
               </folding>
@@ -117,6 +136,39 @@
           </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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="420">
+              <caret line="21" column="20" selection-end-line="34" />
+              <folding>
+                <element signature="e#0#14#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="-14">
+              <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#15#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -128,8 +180,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>status</find>
-      <find>3206572</find>
       <find>get_pcode</find>
       <find>match_time</find>
       <find>three_total_sizes_big</find>
@@ -158,6 +208,8 @@
       <find>爱尔兰甲组联赛</find>
       <find>corner_ball</find>
       <find>Hgjieshu</find>
+      <find>total_size</find>
+      <find>p_code</find>
     </findStrings>
     <replaceStrings>
       <replace>&quot;&quot;</replace>
@@ -248,21 +300,21 @@
         <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/lanqiu.py" />
         <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/bangqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.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$/pipeline/roll_wangqiu.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$/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/lanqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
       </list>
     </option>
   </component>
@@ -300,6 +352,11 @@
               <item name="hg3535" type="462c0819:PsiDirectoryNode" />
               <item name="spiders" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="hg3535" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hg3535" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -605,14 +662,9 @@
       <workItem from="1566976385269" duration="13184000" />
       <workItem from="1566990066292" duration="35762000" />
       <workItem from="1567126891838" duration="187506000" />
-      <workItem from="1567765446416" duration="1707000" />
-    </task>
-    <task id="LOCAL-00002" summary="修改联赛url">
-      <created>1555727573940</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1555727573940</updated>
+      <workItem from="1567765446416" duration="3616000" />
+      <workItem from="1567826229018" duration="3226000" />
+      <workItem from="1567836768286" duration="3376000" />
     </task>
     <task id="LOCAL-00003" summary="修改联赛错误">
       <created>1555727734616</created>
@@ -950,11 +1002,18 @@
       <option name="project" value="LOCAL" />
       <updated>1567750676381</updated>
     </task>
-    <option name="localTasksCounter" value="51" />
+    <task id="LOCAL-00051" summary="更新">
+      <created>1567767196921</created>
+      <option name="number" value="00051" />
+      <option name="presentableId" value="LOCAL-00051" />
+      <option name="project" value="LOCAL" />
+      <updated>1567767196921</updated>
+    </task>
+    <option name="localTasksCounter" value="52" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1867887000" />
+    <option name="totallyTimeSpent" value="1876398000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -969,12 +1028,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.15458423" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.15778251" />
       <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.2446352" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" weight="0.3969957" />
       <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" />
@@ -984,7 +1043,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" visible="true" weight="0.119098715" />
+      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.76502144" />
       <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" />
@@ -1120,7 +1179,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_wangqiu.py</url>
-          <line>276</line>
+          <line>272</line>
           <option name="timeStamp" value="71" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1238,6 +1297,11 @@
           <line>62</line>
           <option name="timeStamp" value="215" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/jieshu.py</url>
+          <line>37</line>
+          <option name="timeStamp" value="216" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -1395,13 +1459,6 @@
         </state>
       </provider>
     </entry>
-    <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://$USER_HOME$/AppData/Local/Programs/Python/Python37/Lib/logging/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="108">
@@ -1455,225 +1512,235 @@
         <state relative-caret-position="-109" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/helper.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="6" column="9" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="12" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
+        <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$/spiders/roll_bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/log/zuqiu_2019_9_6.log">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
+        <state relative-caret-position="-1125" />
+      </provider>
+    </entry>
+    <entry file="file://C:/venv/Lib/site-packages/bson/son.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="139">
+          <caret line="78" selection-start-line="78" selection-end-line="78" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/change.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <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="240">
+          <caret line="12" selection-start-line="12" selection-end-line="12" />
           <folding>
-            <element signature="e#24#39#0" expanded="true" />
+            <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/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 relative-caret-position="400">
+          <caret line="30" column="33" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" />
+          <folding>
+            <element signature="e#48#59#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/settings.py">
+    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="247">
-          <caret line="148" column="40" selection-start-line="148" selection-start-column="40" selection-end-line="148" selection-end-column="40" />
+        <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$/pipeline/roll_wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="131" column="72" selection-start-line="131" selection-start-column="72" selection-end-line="131" selection-end-column="72" />
+        <state relative-caret-position="1860">
+          <caret line="147" column="116" selection-start-line="147" selection-start-column="116" selection-end-line="147" selection-end-column="116" />
           <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$/pipeline/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="123" column="66" selection-start-line="123" selection-start-column="66" selection-end-line="123" selection-end-column="66" />
+        <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" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <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="1280">
-          <caret line="115" column="66" selection-start-line="115" selection-start-column="66" selection-end-line="115" selection-end-column="66" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="777">
-          <caret line="41" column="33" lean-forward="true" selection-start-line="41" selection-start-column="33" selection-end-line="41" selection-end-column="33" />
+        <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" />
           <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$/log/zuqiu_2019_9_6.log">
+    <entry file="file://$PROJECT_DIR$/middlewares.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1125" />
+        <state relative-caret-position="261">
+          <caret line="137" selection-start-line="137" selection-end-line="137" />
+        </state>
       </provider>
     </entry>
-    <entry file="file://C:/venv/Lib/site-packages/bson/son.py">
+    <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="139">
-          <caret line="78" selection-start-line="78" selection-end-line="78" />
+        <state relative-caret-position="190">
+          <caret line="38" selection-start-line="38" selection-end-line="38" />
+          <folding>
+            <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$/spiders/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="11660">
-          <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="5125">
+          <caret line="490" column="36" selection-start-line="490" selection-start-column="36" selection-end-line="490" selection-end-column="36" />
           <folding>
-            <element signature="e#18#33#0" expanded="true" />
+            <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="460">
-          <caret line="56" column="37" lean-forward="true" selection-start-line="56" selection-start-column="37" selection-end-line="56" selection-end-column="37" />
+        <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" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#0#10#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-169">
-          <caret line="20" selection-start-line="20" selection-end-line="20" />
+        <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" />
           <folding>
-            <element signature="e#18#32#0" expanded="true" />
+            <element signature="e#38#53#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/change.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="12" selection-start-line="12" selection-end-line="12" />
+        <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#11#0" expanded="true" />
+            <element signature="e#46#61#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/settings.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="9260">
-          <caret line="490" column="36" selection-start-line="490" selection-start-column="36" selection-end-line="490" selection-end-column="36" />
-          <folding>
-            <element signature="e#24#35#0" expanded="true" />
-          </folding>
+        <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$/main.py">
+    <entry file="file://$PROJECT_DIR$/utils/helper.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="420">
+          <caret line="21" column="20" selection-end-line="34" />
           <folding>
-            <element signature="e#0#10#0" expanded="true" />
+            <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1895">
-          <caret line="147" column="116" selection-start-line="147" selection-start-column="116" selection-end-line="147" selection-end-column="116" />
+        <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/roll_zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="45" column="45" lean-forward="true" selection-start-line="45" selection-start-column="45" selection-end-line="45" selection-end-column="45" />
+        <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#38#53#0" expanded="true" />
+            <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/wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3529">
-          <caret line="30" column="33" lean-forward="true" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" />
+        <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" />
           <folding>
-            <element signature="e#48#59#0" expanded="true" />
+            <element signature="e#0#15#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="335">
-          <caret line="80" column="20" selection-start-line="80" selection-start-column="20" selection-end-line="80" selection-end-column="20" />
+        <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" />
           <folding>
             <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-800">
-          <caret line="143" column="106" selection-start-line="143" selection-start-column="106" selection-end-line="143" selection-end-column="106" />
+        <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>
-    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="33" column="80" lean-forward="true" selection-start-line="33" selection-start-column="80" selection-end-line="33" selection-end-column="80" />
+        <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#24#35#0" expanded="true" />
+            <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$/spiders/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1931">
-          <caret line="156" column="112" selection-start-line="156" selection-start-column="112" selection-end-line="156" selection-end-column="112" />
+        <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" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#24#39#0" expanded="true" />
           </folding>
         </state>
       </provider>

+ 2 - 2
hg3535/main.py

@@ -5,7 +5,7 @@ from scrapy.cmdline import execute
 # print(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 # execute(["scrapy", "crawl", "liansai"])
-execute(["scrapy", "crawl", "zuqiu"])
+# execute(["scrapy", "crawl", "zuqiu"])
 # execute(["scrapy", "crawl", "lanqiu"])
 # execute(["scrapy", "crawl", "guanjun"])
 # execute(["scrapy", "crawl", "wangqiu"])
@@ -18,6 +18,6 @@ execute(["scrapy", "crawl", "zuqiu"])
 # 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结束时间更新状态

+ 11 - 13
hg3535/pipeline/jieshu.py

@@ -2,9 +2,7 @@
 import pymongo
 # import time
 import logging
-
-# import redis
-# from twisted.internet import defer, reactor
+from twisted.internet import defer, reactor
 import redis
 
 from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, MATCH_STATUS
@@ -19,15 +17,15 @@ class Jieshuqiupipeline(object):
         self.db = self.mongo[M_DB]
         self.rls = redis.Redis(host=R_HOST, port=R_POST, db=R_DB, password=R_PASSWORD)
 
-    # @defer.inlineCallbacks
-    # def process_item(self, item, spider):
-    #     out = defer.Deferred()
-    #     reactor.callInThread(self._do_calculation, item, out)
-    #     yield out
-    #     defer.returnValue(item)
-    # def _do_calculation(self, item, out):
-
+    @defer.inlineCallbacks
     def process_item(self, item, spider):
+        out = defer.Deferred()
+        reactor.callInThread(self._do_calculation, item, out)
+        yield out
+        defer.returnValue(item)
+    def _do_calculation(self, item, out):
+
+    # def process_item(self, item, spider):
         logger = logging.getLogger(__name__)
         ball = item['ball']
         match_id = item['match_id']
@@ -48,7 +46,7 @@ class Jieshuqiupipeline(object):
         res = Helper.async_post(MATCH_STATUS, status_dict)
         if res:
             if "成功" in res:
-                self.db.match_status35.insert(status_dict)
+                self.db.match_status35.insert(data)
                 self.rls.srem('hg3535.gunqiu.ids', match_id)
                 logger.info('{},赛事结果状态交成功, {}'.format(game_code, res))
                 logger.info(status_dict)
@@ -58,4 +56,4 @@ class Jieshuqiupipeline(object):
         else:
             logger.warning('{},赛事结果状态接口异常提交失败, {}'.format(game_code, res))
             logger.warning(status_dict)
-        # reactor.callFromThread(out.callback, item)
+        reactor.callFromThread(out.callback, item)

+ 2 - 2
hg3535/pipeline/lanqiu.py

@@ -106,7 +106,7 @@ class Lanqiupipeline(object):
             if res:
                 if '成功' in res:
                     logger.info('篮球联赛提交成功, {}'.format(res))
-                    self.db.hg3535_lq_league.insert(league_list)
+                    self.db.hg3535_lq_league.insert(league_data)
                     logger.info(league_dict)
                 else:
                     logger.warning('篮球联赛提交失败, {}'.format(res))
@@ -149,7 +149,7 @@ class Lanqiupipeline(object):
             if res:
                 if '成功' in res:
                     logger.info('篮球赛事提交成功, {}'.format(res))
-                    self.db.hg3535_lq_competition.insert(match_list)
+                    self.db.hg3535_lq_competition.insert(match_data)
                     logger.info(match_dict)
                 else:
                     logger.warning('篮球赛事提交失败, {}'.format(res))

+ 5 - 5
hg3535/pipeline/roll_lanqiu.py

@@ -104,7 +104,7 @@ class Roll_Lanqiupipeline(object):
             if res:
                 if '成功' in res:
                     logger.info('篮球滚球联赛提交成功, {}'.format(res))
-                    self.db.hg3535_lq_league.insert(league_list)
+                    self.db.hg3535_lq_league.insert(league_data)
                     logger.info(league_dict)
                 else:
                     logger.warning('篮球滚球联赛提交失败, {}'.format(res))
@@ -129,7 +129,7 @@ class Roll_Lanqiupipeline(object):
             if res:
                 if '成功' in res:
                     logger.info('篮球滚球赛事提交成功, {}'.format(res))
-                    self.db.hg3535_lq_competition.insert(match_list)
+                    self.db.hg3535_lq_competition.insert(match_data)
                     logger.info(match_dict)
                 else:
                     logger.warning('篮球滚球赛事提交失败, {}'.format(res))
@@ -164,14 +164,14 @@ class Roll_Lanqiupipeline(object):
                 if value:
                     for index, total_sizes_value in enumerate(value):
                         condition = total_sizes_dict_rule[key][index]
-                        hash_str = "total_size" + str(key) + str(index) + str(condition) + str(
+                        hash_str = "TN" + str(key) + str(index) + str(condition) + str(
                             total_sizes_value) + "hg3535" + str(match_id)
-                        sole_str = "total_size" + str(key) + str(index) + str(match_id) + "hg3535"
+                        sole_str = "TN" + str(key) + str(index) + str(match_id) + "hg3535"
                         odds_only = Helper.genearte_MD5(hash_str, pt)
                         sole = Helper.genearte_MD5(sole_str, pt)
                         total_sizes_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                            "condition", "odds_only", "sole", "source", "type", "team"]
-                        total_sizes_value = [match_id, league_id, key, "0", index, 'total_size', total_sizes_value,
+                        total_sizes_value = [match_id, league_id, key, "0", index, 'TN', total_sizes_value,
                                              condition, odds_only, sole, "hg3535", "0", ""]
                         total_sizes_data = dict(zip(total_sizes_key, total_sizes_value))
                         data_list.append(total_sizes_data)

+ 0 - 4
hg3535/pipeline/roll_wangqiu.py

@@ -3,11 +3,7 @@ import pymongo
 import time
 import logging
 import json
-# from .ball_func import fuhao
 from ..utils.helper import Helper
-# from .ball_func import get_pcode, new_time, out_time
-# from concurrent.futures import ThreadPoolExecutor
-# from requests_futures.sessions import FuturesSession
 from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, LEAGUE_URL, ODDS_URL, MATCH_URL, MATCH_RESULT, MATCH_STATUS
 from twisted.internet import defer, reactor
 

+ 2 - 2
hg3535/pipeline/zuqiu.py

@@ -87,12 +87,12 @@ class Zuqiupipeline(object):
             logging.info('{},联赛已存在, 不提交'.format(league_name))
         pt_dict = {'1': 'is_today', '2': 'is_morningplate', '3': 'is_stringscene', '4': 'is_rollball'}
         pt_status = pt_dict[pt]
-        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

+ 0 - 32
hg3535/spiders/lanqiu.py

@@ -623,10 +623,6 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict_rule["tbhs_h"] = half_score_home_small_rule
                             team_scores_dict["tbhs_h"] = half_score_home_small
                         except:
-                            # half_score_home_small = ""
-                            # half_score_home_small_rule = ""
-                            # half_score_home_big = ""
-                            # half_score_home_big_rule = ""
                             team_scores_dict_rule["tbhb_h"] = ""
                             team_scores_dict["tbhb_h"] = ""
                             team_scores_dict_rule["tbhs_h"] = ""
@@ -642,10 +638,6 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict_rule["tbhs_1"] = one_score_home_small_rule
                             team_scores_dict["tbhs_1"] = one_score_home_small
                         except:
-                            # one_score_home_small = ""
-                            # one_score_home_small_rule = ""
-                            # one_score_home_big = ""
-                            # one_score_home_big_rule = ""
                             team_scores_dict_rule["tbhb_1"] = ""
                             team_scores_dict["tbhb_1"] = ""
                             team_scores_dict_rule["tbhs_1"] = ""
@@ -661,10 +653,6 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict_rule["tbhs_2"] = two_score_home_small_rule
                             team_scores_dict["tbhs_2"] = two_score_home_small
                         except:
-                            # two_score_home_small = ""
-                            # two_score_home_small_rule = ""
-                            # two_score_home_big = ""
-                            # two_score_home_big_rule = ""
                             team_scores_dict_rule["tbhb_2"] = ""
                             team_scores_dict["tbhb_2"] = ""
                             team_scores_dict_rule["tbhs_2"] = ""
@@ -680,10 +668,6 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict_rule["tbhs_3"] = three_score_home_small_rule
                             team_scores_dict["ybhs_3"] = three_score_home_small
                         except:
-                            # three_score_home_small = ""
-                            # three_score_home_small_rule = ""
-                            # three_score_home_big = ""
-                            # three_score_home_big_rule = ""
                             team_scores_dict_rule["tbhb_3"] = ""
                             team_scores_dict["tbhb_3"] = ""
                             team_scores_dict_rule["tbhs_3"] = ""
@@ -699,10 +683,6 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict_rule["tbhs_4"] = four_score_home_small_rule
                             team_scores_dict["tbhs_4"] = four_score_home_small
                         except:
-                            # four_score_home_small = ""
-                            # four_score_home_small_rule = ""
-                            # four_score_home_big = ""
-                            # four_score_home_big_rule = ""
                             team_scores_dict_rule["tbhb_4"] = ""
                             team_scores_dict["tbhb_4"] = ""
                             team_scores_dict_rule["tbhs_4"] = ""
@@ -726,10 +706,6 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict_rule["tbgs"] = score_guest_small_rule
                             team_scores_dict["tbgs"] = score_guest_small
                         except:
-                            # score_guest_small = ""
-                            # score_guest_small_rule = ""
-                            # score_guest_big = ""
-                            # score_guest_big_rule = ""
                             team_scores_dict_rule["tbgb"] = ""
                             team_scores_dict["tbgb"] = ""
                             team_scores_dict_rule["tbgs"] = ""
@@ -745,10 +721,6 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict_rule["tbgs_h"] = half_score_guest_small_rule
                             team_scores_dict["tbgs_h"] = half_score_guest_small
                         except:
-                            # half_score_guest_small = ""
-                            # half_score_guest_small_rule = ""
-                            # half_score_guest_big = ""
-                            # half_score_guest_big_rule = ""
                             team_scores_dict_rule["tbgb_h"] = ""
                             team_scores_dict["tbgb_h"] = ""
                             team_scores_dict_rule["tbgs_h"] = ""
@@ -763,10 +735,6 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict_rule["tbgs_1"] = one_score_guest_small_rule
                             team_scores_dict["tbgs_1"] = one_score_guest_small
                         except:
-                            # one_score_guest_small = ""
-                            # one_score_guest_small_rule = ""
-                            # one_score_guest_big = ""
-                            # one_score_guest_big_rule = ""
                             team_scores_dict_rule["tbgb_1"] = ""
                             team_scores_dict["tbgb_1"] = ""
                             team_scores_dict_rule["tbgs_1"] = ""

+ 0 - 1
hg3535/spiders/roll_zuqiu.py

@@ -42,7 +42,6 @@ class ZuqiuSpider(scrapy.Spider):
                         es = es['es']
                         for e in es:
                             match_id = e['k']
-                            # print(match_id)
                             up_time = str(time.time()) + '&' + 'zq'
                             self.rls.sadd('hg3535.gunqiu.ids', match_id)
                             self.rls.hset('hg3535.ball.ids', match_id, up_time)