瀏覽代碼

更新篮球, 父级玩法错误

Your Name 6 年之前
父節點
當前提交
abaa501927

+ 145 - 151
hg3535/.idea/workspace.xml

@@ -2,13 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7fa42e97-ddea-4404-91db-5a9ccc162649" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pipeline/jieshu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/jieshu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pipeline/bangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/bangqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pipeline/lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/lanqiu.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipeline/roll_bangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_bangqiu.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipeline/roll_lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_lanqiu.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipeline/roll_wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_wangqiu.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipeline/roll_zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_zuqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/spiders/jieshu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/jieshu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pipeline/wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/wangqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pipeline/zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/zuqiu.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -18,7 +21,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="1567995987834" 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="1568007845292" 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" />
@@ -50,8 +53,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/main.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="21" column="39" selection-start-line="21" selection-start-column="39" selection-end-line="21" selection-end-column="39" />
+            <state relative-caret-position="180">
+              <caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
               <folding>
                 <element signature="e#0#10#0" expanded="true" />
               </folding>
@@ -60,31 +63,22 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <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="-8769">
-              <caret line="102" column="37" selection-start-line="102" selection-start-column="34" selection-end-line="102" selection-end-column="37" />
+            <state relative-caret-position="389">
+              <caret line="138" column="64" selection-start-line="138" selection-start-column="20" selection-end-line="138" selection-end-column="124" />
               <folding>
-                <element signature="e#24#35#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_wangqiu.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-5389">
-              <caret line="6" column="110" selection-start-line="6" selection-start-column="110" selection-end-line="6" selection-end-column="110" />
-            </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="5531">
-              <caret line="292" selection-start-line="292" selection-end-line="309" selection-end-column="41" />
+            <state relative-caret-position="400">
+              <caret line="157" selection-start-line="157" selection-end-line="158" selection-end-column="64" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
               </folding>
@@ -93,10 +87,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="24" column="33" lean-forward="true" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="33" />
+            <state relative-caret-position="940">
+              <caret line="123" selection-start-line="123" selection-end-line="124" selection-end-column="64" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
               </folding>
@@ -105,27 +99,24 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="877">
-              <caret line="1134" column="45" selection-start-line="1134" selection-start-column="45" selection-end-line="1134" selection-end-column="45" />
+            <state relative-caret-position="-541">
+              <caret line="163" column="19" lean-forward="true" selection-start-line="163" selection-start-column="19" selection-end-line="163" selection-end-column="19" />
               <folding>
-                <element signature="e#18#33#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/bangqiu.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2269">
-              <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="400">
+              <caret line="86" selection-start-line="86" selection-end-line="87" selection-end-column="64" />
               <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>
@@ -261,22 +252,22 @@
         <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/bangqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/wangqiu.py" />
         <option value="$PROJECT_DIR$/settings.py" />
         <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
         <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/zuqiu.py" />
-        <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/spiders/jieshu.py" />
         <option value="$PROJECT_DIR$/pipeline/jieshu.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
+        <option value="$PROJECT_DIR$/main.py" />
+        <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/zuqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/wangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_zuqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_bangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_wangqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_bangqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/bangqiu.py" />
       </list>
     </option>
   </component>
@@ -622,21 +613,7 @@
       <workItem from="1567765446416" duration="3616000" />
       <workItem from="1567826229018" duration="3226000" />
       <workItem from="1567836768286" duration="10382000" />
-      <workItem from="1567990502559" duration="6963000" />
-    </task>
-    <task id="LOCAL-00005" summary="修改棒球,联赛无法写入">
-      <created>1555728369459</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1555728369459</updated>
-    </task>
-    <task id="LOCAL-00006" summary="修改冠军,联赛url">
-      <created>1555747152483</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1555747152483</updated>
+      <workItem from="1567990502559" duration="12416000" />
     </task>
     <task id="LOCAL-00007" summary="不启用,scrapy_deltafetch">
       <created>1555902621561</created>
@@ -967,11 +944,25 @@
       <option name="project" value="LOCAL" />
       <updated>1567994111423</updated>
     </task>
-    <option name="localTasksCounter" value="54" />
+    <task id="LOCAL-00054" summary="更新篮球, 父级玩法错误">
+      <created>1567998177659</created>
+      <option name="number" value="00054" />
+      <option name="presentableId" value="LOCAL-00054" />
+      <option name="project" value="LOCAL" />
+      <updated>1567998177660</updated>
+    </task>
+    <task id="LOCAL-00055" summary="更新篮球, 父级玩法错误">
+      <created>1567998227722</created>
+      <option name="number" value="00055" />
+      <option name="presentableId" value="LOCAL-00055" />
+      <option name="project" value="LOCAL" />
+      <updated>1567998227722</updated>
+    </task>
+    <option name="localTasksCounter" value="56" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1890367000" />
+    <option name="totallyTimeSpent" value="1895820000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -991,7 +982,7 @@
       <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.29613733" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" weight="0.2274678" />
       <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" />
@@ -1000,8 +991,8 @@
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50692964" side_tool="true" weight="0.38519314" />
       <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49307036" weight="0.3530043" />
-      <window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" visible="true" weight="0.2693133" />
-      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.29935622" />
+      <window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" weight="0.2693133" />
+      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" visible="true" weight="0.26502147" />
       <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" />
@@ -1123,7 +1114,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/zuqiu.py</url>
-          <line>208</line>
+          <line>212</line>
           <option name="timeStamp" value="65" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1138,7 +1129,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_wangqiu.py</url>
-          <line>271</line>
+          <line>275</line>
           <option name="timeStamp" value="71" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1168,17 +1159,17 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
-          <line>197</line>
+          <line>233</line>
           <option name="timeStamp" value="136" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_bangqiu.py</url>
-          <line>203</line>
+          <line>207</line>
           <option name="timeStamp" value="164" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_bangqiu.py</url>
-          <line>222</line>
+          <line>226</line>
           <option name="timeStamp" value="165" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1248,7 +1239,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>232</line>
+          <line>236</line>
           <option name="timeStamp" value="218" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1263,7 +1254,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>186</line>
+          <line>190</line>
           <option name="timeStamp" value="225" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1271,6 +1262,11 @@
           <line>102</line>
           <option name="timeStamp" value="226" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
+          <line>81</line>
+          <option name="timeStamp" value="231" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -1298,34 +1294,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/aiohttp/client.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="166">
-          <caret line="574" selection-start-line="574" selection-end-line="574" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/pymongo/pool.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1215">
-          <caret line="614" selection-start-line="614" selection-end-line="614" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/twisted/python/util.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="413">
-          <caret line="630" selection-start-line="630" selection-end-line="630" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python37/Lib/asyncio/base_events.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="520" selection-start-line="520" selection-end-line="520" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python37/Lib/asyncio/tasks.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="145">
@@ -1516,16 +1484,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <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$/middlewares.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="261">
@@ -1570,16 +1528,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <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#24#35#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="20">
@@ -1608,80 +1556,123 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/../../zq_match_status.log">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="337">
+          <caret line="18554" column="211" lean-forward="true" selection-start-line="18554" selection-start-column="208" selection-end-line="18554" selection-end-column="215" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-769">
-          <caret line="243" column="50" selection-start-line="243" selection-start-column="50" selection-end-line="243" selection-end-column="50" />
+        <state relative-caret-position="251">
+          <caret line="36" column="44" lean-forward="true" selection-start-line="36" selection-start-column="44" selection-end-line="36" selection-end-column="44" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../zq_match_status.log">
+    <entry file="file://$PROJECT_DIR$/requirements.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="337">
-          <caret line="18554" column="211" lean-forward="true" selection-start-line="18554" selection-start-column="208" selection-end-line="18554" selection-end-column="215" />
+        <state relative-caret-position="-360" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-8686">
+          <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#24#35#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/venv/Lib/site-packages/pymongo/common.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1510">
+          <caret line="925" column="8" selection-start-line="925" selection-start-column="8" selection-end-line="925" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.PyCharm2018.3/system/python_stubs/454006823/_blake2.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-189">
+          <caret line="42" column="8" selection-start-line="42" selection-start-column="8" selection-end-line="42" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/venv/Lib/site-packages/pymongo/bulk.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="287">
+          <caret line="541" column="53" selection-start-line="541" selection-start-column="51" selection-end-line="541" selection-end-column="57" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="21" column="39" selection-start-line="21" selection-start-column="39" selection-end-line="21" selection-end-column="39" />
+        <state relative-caret-position="180">
+          <caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
           <folding>
             <element signature="e#0#10#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="122">
+          <caret line="74" selection-start-line="74" selection-end-line="74" />
+          <folding>
+            <element signature="e#24#35#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-18329">
-          <caret line="119" column="44" selection-start-line="119" selection-start-column="44" selection-end-line="119" selection-end-column="44" />
+        <state relative-caret-position="255">
+          <caret line="596" column="23" lean-forward="true" selection-start-line="596" selection-start-column="23" selection-end-line="596" 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/wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="251">
-          <caret line="36" column="44" lean-forward="true" selection-start-line="36" selection-start-column="44" selection-end-line="36" selection-end-column="44" />
+        <state relative-caret-position="400">
+          <caret line="157" selection-start-line="157" selection-end-line="158" selection-end-column="64" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-8769">
-          <caret line="102" column="37" selection-start-line="102" selection-start-column="34" selection-end-line="102" selection-end-column="37" />
+        <state relative-caret-position="311">
+          <caret line="110" selection-start-line="110" selection-end-line="111" selection-end-column="64" />
           <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/bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2269">
-          <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="-2865">
+          <caret line="136" column="40" lean-forward="true" selection-start-line="136" selection-end-line="137" selection-end-column="64" />
           <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$/pipeline/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="24" column="33" lean-forward="true" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="33" />
+        <state relative-caret-position="389">
+          <caret line="138" column="64" selection-start-line="138" selection-start-column="20" selection-end-line="138" selection-end-column="124" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
@@ -1690,27 +1681,30 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5531">
-          <caret line="292" selection-start-line="292" selection-end-line="309" selection-end-column="41" />
+        <state relative-caret-position="940">
+          <caret line="123" selection-start-line="123" selection-end-line="124" selection-end-column="64" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5389">
-          <caret line="6" column="110" selection-start-line="6" selection-start-column="110" selection-end-line="6" selection-end-column="110" />
+        <state relative-caret-position="400">
+          <caret line="86" selection-start-line="86" selection-end-line="87" selection-end-column="64" />
+          <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$/pipeline/bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="877">
-          <caret line="1134" column="45" selection-start-line="1134" selection-start-column="45" selection-end-line="1134" selection-end-column="45" />
+        <state relative-caret-position="-541">
+          <caret line="163" column="19" lean-forward="true" selection-start-line="163" selection-start-column="19" selection-end-line="163" selection-end-column="19" />
           <folding>
-            <element signature="e#18#33#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>

+ 2 - 2
hg3535/main.py

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

+ 6 - 2
hg3535/pipeline/bangqiu.py

@@ -117,7 +117,9 @@ class Bangqiupipeline(object):
             res = Helper.async_post(LEAGUE_URL, league_dict)
             if res:
                 if '成功' in res:
-                    self.db.bq_league35.insert(league_data)
+                    # self.db.bq_league35.insert(league_data)
+                    self.db.bq_league35.update({'lg_id': league_id}, {'$set': league_data},
+                                                    upsert=True)
                     logger.info('棒球联赛提交成功, {}'.format(res))
                 else:
                     logger.warning('棒球联赛提交失败, {}'.format(res))
@@ -161,7 +163,9 @@ class Bangqiupipeline(object):
             res = Helper.async_post(MATCH_URL, match_dict)
             if res:
                 if '成功' in res:
-                    self.db.bq_competition35.insert(match_data)
+                    # self.db.bq_competition35.insert(match_data)
+                    self.db.bq_competition35.update({"match_id": match_id, pt_status: 1}, {'$set': match_data},
+                                                    upsert=True)
                     logger.info('棒球赛事提交成功, {}'.format(res))
                 else:
                     logger.warning('棒球赛事提交失败, {}'.format(res))

+ 5 - 3
hg3535/pipeline/lanqiu.py

@@ -79,7 +79,7 @@ class Lanqiupipeline(object):
         # 让球 数据插入数据库
         """联赛"""
         last_time = '{}-12-31 23:59:59'.format(datetime.datetime.now().year)
-        if self.db.hg3535_lq_league.find({'lg_id': league_id}).count() < 1:
+        if self.db.lq_league35.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"]
@@ -91,7 +91,8 @@ class Lanqiupipeline(object):
             if res:
                 if '成功' in res:
                     logger.info('篮球联赛提交成功, {}'.format(res))
-                    self.db.hg3535_lq_league.insert(league_data)
+                    # self.db.hg3535_lq_league.insert(league_data)
+                    self.db.lq_league35.update({'lg_id': league_id}, {'$set': league_data}, upsert=True)
                     logger.info(league_dict)
                 else:
                     logger.warning('篮球联赛提交失败, {}'.format(res))
@@ -134,7 +135,8 @@ class Lanqiupipeline(object):
             if res:
                 if '成功' in res:
                     logger.info('篮球赛事提交成功, {}'.format(res))
-                    self.db.hg3535_lq_competition.insert(match_data)
+                    # self.db.hg3535_lq_competition.insert(match_data)
+                    self.db.lq_competition35.update({'match_id': match_id, pt_status: 1}, {'$set': match_data}, upsert=True)
                     logger.info(match_dict)
                 else:
                     logger.warning('篮球赛事提交失败, {}'.format(res))

+ 6 - 2
hg3535/pipeline/roll_bangqiu.py

@@ -83,7 +83,9 @@ class Roll_Banqiupipeline(object):
             res = Helper.async_post(LEAGUE_URL, league_dict)
             if res:
                 if '成功' in res:
-                    self.db.bq_league35.insert(league_data)
+                    # self.db.bq_league35.insert(league_data)
+                    self.db.bq_competition35.update({'lg_id': league_id}, {'$set': league_data},
+                                                    upsert=True)
                     logger.info('棒球滚球联赛提交成功, {}'.format(res))
                 else:
                     logger.warning('棒球滚球联赛提交失败, {}'.format(res))
@@ -108,7 +110,9 @@ class Roll_Banqiupipeline(object):
             res = Helper.async_post(MATCH_URL, match_dict)
             if res:
                 if '成功' in res:
-                    self.db.hg3535_bq_competition.insert(match_data)
+                    # self.db.hg3535_bq_competition.insert(match_data)
+                    self.db.bq_competition35.update({"match_id": match_id, 'is_rollball': 1}, {'$set': match_data},
+                                                    upsert=True)
                 else:
                     logger.warning('棒球滚球赛事提交失败, {}'.format(res))
                     logger.warning(match_data)

+ 7 - 3
hg3535/pipeline/roll_lanqiu.py

@@ -81,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_league35222.find({'lg_id': league_id}).count() < 1:
+        if self.db.lq_league35.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"]
@@ -93,7 +93,9 @@ class Roll_Lanqiupipeline(object):
             if res:
                 if '成功' in res:
                     logger.info('篮球滚球联赛提交成功, {}'.format(res))
-                    self.db.lq_league35222.insert(league_data)
+                    self.db.lq_league35.update({'lg_id': league_id}, {'$set': league_data},
+                                                    upsert=True)
+                    # self.db.lq_league35222.insert(league_data)
                     logger.info(league_dict)
                 else:
                     logger.warning('篮球滚球联赛提交失败, {}'.format(res))
@@ -118,7 +120,9 @@ class Roll_Lanqiupipeline(object):
             if res:
                 if '成功' in res:
                     logger.info('篮球滚球赛事提交成功, {}'.format(res))
-                    self.db.hg3535_lq_competition.insert(match_data)
+                    # self.db.hg3535_lq_competition.insert(match_data)
+                    self.db.lq_competition35.update({"match_id": match_id, 'is_rollball': 1}, {'$set': match_data},
+                                                    upsert=True)
                     logger.info(match_dict)
                 else:
                     logger.warning('篮球滚球赛事提交失败, {}'.format(res))

+ 7 - 3
hg3535/pipeline/roll_wangqiu.py

@@ -105,7 +105,9 @@ class Roll_Wangqiupipeline(object):
             res = Helper.async_post(LEAGUE_URL, league_dict)
             if res:
                 if '成功' in res:
-                    self.db.wq_league35.insert(league_data)
+                    # self.db.wq_league35.insert(league_data)
+                    self.db.wq_league35.update({'lg_id': league_id}, {'$set': league_data},
+                                                    upsert=True)
                     logger.info('网球联赛提交成功, {}'.format(res))
                 else:
                     logger.warning('网球联赛提交失败, {}'.format(res))
@@ -117,7 +119,7 @@ class Roll_Wangqiupipeline(object):
             logger.info('网球联赛已存在, 不提交')
 
         """赛事"""
-        if self.db.hg3535_wq_competition35.find({"match_id": match_id, 'is_rollball': 1}).count() < 1:
+        if self.db.wq_competition35.find({"match_id": match_id, 'is_rollball': 1}).count() < 1:
             match_list = []
             match_dict = {"game_code": "wq", "title": "match", "source": "hg3535"}
             match_key = ["home_team", "guest_team", "lg_id", "status", "match_id", "match_date", "match_time",
@@ -131,7 +133,9 @@ class Roll_Wangqiupipeline(object):
             res = Helper.async_post(MATCH_URL, match_dict)
             if res:
                 if '成功' in res:
-                    self.db.wq_competition35.insert(match_data)
+                    # self.db.wq_competition35.insert(match_data)
+                    self.db.wq_competition35.update({'match_id': match_id, 'is_rollball': 1}, {'$set': match_data},
+                                                    upsert=True)
                     logger.info('网球赛事提交成功, {}'.format(res))
                 else:
                     logger.warning('网球赛事提交失败, {}'.format(res))

+ 9 - 3
hg3535/pipeline/roll_zuqiu.py

@@ -79,7 +79,9 @@ class Roll_Zuqiupipeline(object):
             res = Helper.async_post(LEAGUE_URL, league_dict)
             if res:
                 if "成功" in res:
-                    self.db.zq_league35.insert(league_list)
+                    # self.db.zq_league35.insert(league_list)
+                    self.db.zq_league35.update({'lg_id': league_id}, {'$set': league_data},
+                                                    upsert=True)
                     logger.info('足球滚球联赛提交成功, {}'.format(res))
                     logger.info(league_dict)
                 else:
@@ -105,7 +107,9 @@ class Roll_Zuqiupipeline(object):
             res = Helper.async_post(MATCH_URL, match_dict)
             if res:
                 if "成功" in res:
-                    self.db.zq_competition35.insert(match_data)
+                    # self.db.zq_competition35.insert(match_data)
+                    self.db.zq_competition35.update({'match_id': match_id, 'is_rollball': 1}, {'$set': match_data},
+                                                    upsert=True)
                     logger.info('足球滚球赛事提交成功, {}'.format(res))
                     logger.info(match_data)
                 else:
@@ -632,7 +636,9 @@ class Roll_Zuqiupipeline(object):
                 res = Helper.async_post(MATCH_URL, match_dict)
                 if res:
                     if "成功" in res:
-                        self.db.zq_competition35.insert(match_data)
+                        # self.db.zq_competition35.insert(match_data)
+                        self.db.zq_competition35.update({'match_id': match_id, 'is_rollball': 1}, {'$set': match_data},
+                                                        upsert=True)
                         logger.info('足球滚球角球, 赛事提交成功, {}'.format(res))
                         logger.info(match_data)
                     else:

+ 13 - 9
hg3535/pipeline/wangqiu.py

@@ -109,7 +109,9 @@ class Wangqiupipeline(object):
             res = Helper.async_post(LEAGUE_URL, league_dict)
             if res:
                 if '成功' in res:
-                    self.db.wq_league35.insert(league_data)
+                    # self.db.wq_league35.insert(league_data)
+                    self.db.wq_league35.update({'lg_id': league_id}, {'$set': league_data},
+                                                    upsert=True)
                     logger.info('网球联赛提交成功, {}'.format(res))
                 else:
                     logger.warning('网球联赛提交失败, {}'.format(res))
@@ -152,7 +154,9 @@ class Wangqiupipeline(object):
             res = Helper.async_post(MATCH_URL, match_dict)
             if res:
                 if '成功' in res:
-                    self.db.wq_competition35.insert(match_data)
+                    # self.db.wq_competition35.insert(match_data)
+                    self.db.wq_competition35.update({'match_id': match_id, pt_status: 1}, {'$set': match_data},
+                                                    upsert=True)
                     logger.info('网球赛事提交成功, {}'.format(res))
                 else:
                     logger.warning('网球赛事提交失败, {}'.format(res))
@@ -164,13 +168,13 @@ class Wangqiupipeline(object):
             logging.info('网球赛事已存在, 不提交')
 
         """赔率"""
-        try:
-            result = self.db.hg3535_wq_odds.find_one({'match_id': match_id, 'pt': pt})
-            odds_only_list = result['odds_only']
-        except:
-            result = ''
-            odds_only_list = []
-        wangqiu = item['wangqiu']
+        # try:
+        #     result = self.db.hg3535_wq_odds.find_one({'match_id': match_id, 'pt': pt})
+        #     odds_only_list = result['odds_only']
+        # except:
+        #     result = ''
+        #     odds_only_list = []
+        # wangqiu = item['wangqiu']
         data_list = []
         odds_onlys = []
         # 让盘

+ 9 - 3
hg3535/pipeline/zuqiu.py

@@ -80,7 +80,9 @@ class Zuqiupipeline(object):
             res = Helper.async_post(LEAGUE_URL, league_dict)
             if res:
                 if "成功" in res:
-                    self.db.zq_league35.insert(league_list)
+                    # self.db.zq_league35.insert(league_list)
+                    self.db.zq_league35.update({'lg_id': league_id}, {'$set': league_data},
+                                                    upsert=True)
             else:
                 logging.warning('足球详细赔率接口异常, {}'.format(res))
         else:
@@ -117,7 +119,9 @@ class Zuqiupipeline(object):
             res = Helper.async_post(MATCH_URL, match_dict)
             if res:
                 if "成功" in res:
-                    self.db.zq_competition35.insert(match_data)
+                    # self.db.zq_competition35.insert(match_data)
+                    self.db.zq_competition35.update({'match_id': match_id, pt_status: 1}, {'$set': match_data},
+                                                    upsert=True)
                 else:
                     logger.warning('足球赛事表提交失败, {}'.format(res))
                     logger.warning(match_dict)
@@ -592,7 +596,9 @@ class Zuqiupipeline(object):
                 res = Helper.async_post(MATCH_URL, match_dict)
                 if res:
                     if "成功" in res:
-                        self.db.zq_competition35.insert(match_data)
+                        # self.db.zq_competition35.insert(match_data)
+                        self.db.zq_competition35.update({'match_id': match_id, pt_status: 1}, {'$set': match_data},
+                                                        upsert=True)
                         logger.info('足球角球, 赛事表提交失败, {}'.format(res))
                         logger.info(match_dict)
                     else: