updata

hg3535/.idea/workspace.xml

@@ -3,11 +3,14 @@
   <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$/items.py" beforeDir="false" afterPath="$PROJECT_DIR$/items.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.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/guanjun.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/guanjun.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_zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_zuqiu.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/settings.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/spiders/jieshu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/jieshu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/guanjun.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/guanjun.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/roll_bangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_bangqiu.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/spiders/roll_zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_zuqiu.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -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="1567507167903" 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="1567586454353" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/hg3535$hgjieshu.coverage" NAME="hgjieshu Coverage Results" MODIFIED="1558494720094" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
     <SUITE FILE_PATH="coverage/hg3535$halffull.coverage" NAME="halffull Coverage Results" MODIFIED="1554544334424" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
     <SUITE FILE_PATH="coverage/hg3535$pipelines.coverage" NAME="pipelines Coverage Results" MODIFIED="1554290866137" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
@@ -50,7 +53,7 @@
         <entry file="file://$PROJECT_DIR$/main.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="280">
-              <caret line="14" column="43" selection-start-line="14" selection-start-column="43" selection-end-line="14" selection-end-column="43" />
+              <caret line="14" column="48" lean-forward="true" selection-start-line="14" selection-start-column="48" selection-end-line="14" selection-end-column="48" />
               <folding>
                 <element signature="e#0#10#0" expanded="true" />
               </folding>
@@ -59,37 +62,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-4937">
-              <caret line="25" column="43" lean-forward="true" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
-              <folding>
-                <element signature="e#0#15#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="395">
-              <caret line="39" selection-start-line="39" selection-end-line="39" />
-              <folding>
-                <element signature="e#0#15#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+        <entry file="file://$PROJECT_DIR$/settings.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="223">
-              <caret line="63" selection-start-line="63" selection-end-line="63" />
-              <folding>
-                <element signature="e#24#39#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="125">
+              <caret line="153" column="43" selection-start-line="153" selection-start-column="43" selection-end-line="153" selection-end-column="43" />
             </state>
           </provider>
         </entry>
@@ -97,8 +73,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1020">
-              <caret line="51" column="34" lean-forward="true" selection-start-line="51" selection-start-column="34" selection-end-line="51" selection-end-column="34" />
+            <state relative-caret-position="109">
+              <caret line="446" selection-start-line="446" selection-end-line="446" />
               <folding>
                 <element signature="e#18#33#0" expanded="true" />
               </folding>
@@ -106,23 +82,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-5836">
-              <caret line="40" column="21" lean-forward="true" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="70" />
-              <folding>
-                <element signature="e#24#35#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="340">
-              <caret line="50" column="18" lean-forward="true" selection-start-line="50" selection-start-column="18" selection-end-line="50" selection-end-column="18" />
+            <state relative-caret-position="7409">
+              <caret line="406" column="29" lean-forward="true" selection-start-line="406" selection-start-column="29" selection-end-line="406" selection-end-column="29" />
               <folding>
                 <element signature="e#38#53#0" expanded="true" />
               </folding>
@@ -131,29 +95,25 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+        <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="342">
-              <caret line="75" column="46" lean-forward="true" selection-start-line="75" selection-start-column="46" selection-end-line="75" selection-end-column="46" />
+            <state relative-caret-position="20">
+              <caret line="52" column="46" selection-start-line="52" selection-start-column="46" selection-end-line="52" selection-end-column="46" />
               <folding>
-                <element signature="e#24#35#0" expanded="true" />
+                <element signature="e#38#53#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/guanjun.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-180" />
-          </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="487">
-              <caret line="33" column="35" selection-start-line="33" selection-start-column="35" selection-end-line="33" selection-end-column="35" />
+            <state relative-caret-position="2222">
+              <caret line="127" column="25" lean-forward="true" selection-start-line="127" selection-start-column="25" selection-end-line="127" selection-end-column="25" />
+              <folding>
+                <element signature="e#18#32#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -169,10 +129,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>wq_</find>
-      <find>Zuqiustatus</find>
-      <find>try</find>
-      <find>&gt;=</find>
       <find>psycopg2.extras</find>
       <find>pt</find>
       <find>Lanqiustatus</find>
@@ -199,6 +155,10 @@
       <find>fuhao</find>
       <find>足球滚球联赛提交失败</find>
       <find>data_list</find>
+      <find>team_source_dict</find>
+      <find>triangle</find>
+      <find>match_score_dict</find>
+      <find>南美自由杯2019</find>
     </findStrings>
     <replaceStrings>
       <replace>&quot;&quot;</replace>
@@ -279,36 +239,37 @@
         <option value="$PROJECT_DIR$/spiders/zq_jieshu.py" />
         <option value="$PROJECT_DIR$/pipelines.py" />
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/spiders/guanjun.py" />
         <option value="$PROJECT_DIR$/utils/helper.py" />
         <option value="$PROJECT_DIR$/pipeline/ball_func.py" />
         <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/saiguo.py" />
         <option value="$PROJECT_DIR$/spiders/saiguo.py" />
         <option value="$PROJECT_DIR$/pipeline/wangqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_bangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/bangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/zuqiu.py" />
-        <option value="$PROJECT_DIR$/items.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_wangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/guanjun.py" />
         <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/jieshu.py" />
         <option value="$PROJECT_DIR$/spiders/jieshu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
         <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_bangqiu.py" />
+        <option value="$PROJECT_DIR$/items.py" />
         <option value="$PROJECT_DIR$/settings.py" />
-        <option value="$PROJECT_DIR$/main.py" />
+        <option value="$PROJECT_DIR$/spiders/guanjun.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_zuqiu.py" />
+        <option value="$PROJECT_DIR$/main.py" />
+        <option value="$PROJECT_DIR$/pipeline/guanjun.py" />
         <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-397" />
+    <option name="x" value="-404" />
+    <option name="y" value="79" />
     <option name="width" value="1458" />
     <option name="height" value="1017" />
   </component>
@@ -325,6 +286,11 @@
               <item name="hg3535" type="b2602c69:ProjectViewProjectNode" />
               <item name="hg3535" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="hg3535" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hg3535" type="462c0819:PsiDirectoryNode" />
+              <item name="log" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="hg3535" type="b2602c69:ProjectViewProjectNode" />
               <item name="hg3535" type="462c0819:PsiDirectoryNode" />
@@ -349,7 +315,7 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="add_unversioned_files" value="$PROJECT_DIR$/.gitignore" />
+    <property name="add_unversioned_files" value="$PROJECT_DIR$/.gitignore&#10;C:/Users/admin/Desktop/sports_scrapy/hg3535/log/guanjun_2019_9_4.log" />
     <property name="last_opened_file_path" value="C:/venv" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -614,7 +580,7 @@
       <workItem from="1566976369645" duration="4000" />
       <workItem from="1566976385269" duration="13184000" />
       <workItem from="1566990066292" duration="35762000" />
-      <workItem from="1567126891838" duration="117104000" />
+      <workItem from="1567126891838" duration="141987000" />
     </task>
     <task id="LOCAL-00001" summary="修改后,版本二">
       <created>1555727493584</created>
@@ -910,11 +876,25 @@
       <option name="project" value="LOCAL" />
       <updated>1567497332885</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="updata">
+      <created>1567507381447</created>
+      <option name="number" value="00043" />
+      <option name="presentableId" value="LOCAL-00043" />
+      <option name="project" value="LOCAL" />
+      <updated>1567507381447</updated>
+    </task>
+    <task id="LOCAL-00044" summary="updata">
+      <created>1567567386386</created>
+      <option name="number" value="00044" />
+      <option name="presentableId" value="LOCAL-00044" />
+      <option name="project" value="LOCAL" />
+      <updated>1567567386386</updated>
+    </task>
+    <option name="localTasksCounter" value="45" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1795778000" />
+    <option name="totallyTimeSpent" value="1820661000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -927,14 +907,13 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.1705757" />
       <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.31545064" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" visible="true" weight="0.2811159" />
       <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" />
@@ -944,7 +923,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.4356223" />
-      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" visible="true" weight="0.18884121" />
+      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.24892704" />
       <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" />
@@ -1063,11 +1042,6 @@
           <line>251</line>
           <option name="timeStamp" value="46" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/roll_zuqiu.py</url>
-          <line>446</line>
-          <option name="timeStamp" value="49" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/zuqiu.py</url>
           <line>355</line>
@@ -1080,7 +1054,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_bangqiu.py</url>
-          <line>93</line>
+          <line>91</line>
           <option name="timeStamp" value="58" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1153,11 +1127,6 @@
           <line>47</line>
           <option name="timeStamp" value="119" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/spiders/roll_bangqiu.py</url>
-          <line>191</line>
-          <option name="timeStamp" value="121" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/roll_lanqiu.py</url>
           <line>63</line>
@@ -1179,44 +1148,44 @@
           <option name="timeStamp" value="136" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/roll_zuqiu.py</url>
-          <line>434</line>
-          <option name="timeStamp" value="138" />
+          <url>file://$PROJECT_DIR$/pipeline/roll_bangqiu.py</url>
+          <line>220</line>
+          <option name="timeStamp" value="164" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/spiders/roll_zuqiu.py</url>
-          <line>55</line>
-          <option name="timeStamp" value="142" />
+          <url>file://$PROJECT_DIR$/pipeline/roll_bangqiu.py</url>
+          <line>240</line>
+          <option name="timeStamp" value="165" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/roll_zuqiu.py</url>
-          <line>433</line>
-          <option name="timeStamp" value="143" />
+          <url>file://$PROJECT_DIR$/spiders/roll_bangqiu.py</url>
+          <line>262</line>
+          <option name="timeStamp" value="167" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/spiders/roll_zuqiu.py</url>
-          <line>351</line>
-          <option name="timeStamp" value="144" />
+          <url>file://$PROJECT_DIR$/spiders/roll_bangqiu.py</url>
+          <line>60</line>
+          <option name="timeStamp" value="168" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/spiders/roll_zuqiu.py</url>
-          <line>356</line>
-          <option name="timeStamp" value="147" />
+          <url>file://$PROJECT_DIR$/spiders/roll_bangqiu.py</url>
+          <line>84</line>
+          <option name="timeStamp" value="169" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/roll_zuqiu.py</url>
-          <line>361</line>
-          <option name="timeStamp" value="148" />
+          <line>392</line>
+          <option name="timeStamp" value="179" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/roll_zuqiu.py</url>
-          <line>359</line>
-          <option name="timeStamp" value="150" />
+          <line>386</line>
+          <option name="timeStamp" value="180" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/roll_zuqiu.py</url>
-          <line>190</line>
-          <option name="timeStamp" value="153" />
+          <line>388</line>
+          <option name="timeStamp" value="181" />
         </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
@@ -1245,20 +1214,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/main_time.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-86">
-          <caret line="11" selection-start-line="11" selection-end-line="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/ball_func.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="511">
-          <caret line="145" selection-start-line="145" selection-end-line="145" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/scrapy/utils/trackref.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="486">
@@ -1381,20 +1336,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="8" column="30" selection-start-line="8" selection-start-column="25" selection-end-line="8" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-500">
-          <caret line="8" column="30" lean-forward="true" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://C:/venv/Lib/site-packages/requests/utils.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="87">
@@ -1430,13 +1371,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/middlewares.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="401">
-          <caret line="144" selection-start-line="144" selection-end-line="144" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/saiguo.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="46">
@@ -1457,13 +1391,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/items.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="492">
-          <caret line="470" column="25" lean-forward="true" selection-start-line="470" selection-start-column="25" selection-end-line="470" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="500">
@@ -1474,66 +1401,84 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1689">
-          <caret line="176" column="117" selection-start-line="176" selection-start-column="117" selection-end-line="176" selection-end-column="117" />
+        <state relative-caret-position="150">
+          <caret line="29" selection-start-line="29" selection-end-line="29" />
           <folding>
-            <element signature="e#46#61#0" expanded="true" />
+            <element signature="e#18#32#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-180" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1080">
-          <caret line="54" column="50" lean-forward="true" selection-start-line="54" selection-start-column="49" selection-end-line="54" selection-end-column="53" />
+        <state relative-caret-position="-4937">
+          <caret line="25" column="43" lean-forward="true" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
           <folding>
-            <element signature="e#24#39#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/guanjun.py">
+    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="395">
-          <caret line="127" column="45" selection-start-line="127" selection-start-column="45" selection-end-line="127" selection-end-column="45" />
+        <state relative-caret-position="-5836">
+          <caret line="40" column="21" lean-forward="true" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="70" />
           <folding>
-            <element signature="e#18#32#0" expanded="true" />
+            <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="29" selection-start-line="29" selection-end-line="29" />
+        <state relative-caret-position="342">
+          <caret line="75" column="46" lean-forward="true" selection-start-line="75" selection-start-column="46" selection-end-line="75" selection-end-column="46" />
           <folding>
-            <element signature="e#18#32#0" expanded="true" />
+            <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
+    <entry file="file://$PROJECT_DIR$/utils/helper.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="5" column="13" lean-forward="true" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        <state relative-caret-position="244">
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="448" column="19" selection-start-line="448" selection-start-column="18" selection-end-line="448" selection-end-column="19" />
+        <state relative-caret-position="395">
+          <caret line="39" selection-start-line="39" selection-end-line="39" />
           <folding>
             <element signature="e#0#15#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="420">
+          <caret line="69" column="18" lean-forward="true" selection-start-line="69" selection-start-column="16" selection-end-line="69" selection-end-column="54" />
+          <folding>
+            <element signature="e#24#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
+        <state relative-caret-position="-700">
           <caret line="75" column="10" selection-start-line="75" selection-start-column="10" selection-end-line="75" selection-end-column="10" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
@@ -1541,102 +1486,132 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/helper.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="320">
-          <caret line="27" selection-start-line="27" selection-end-line="27" />
+        <state relative-caret-position="108">
+          <caret line="69" column="28" selection-start-line="69" selection-start-column="28" selection-end-line="69" selection-end-column="72" />
           <folding>
-            <element signature="e#0#14#0" expanded="true" />
+            <element signature="e#24#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-180" />
+        <state relative-caret-position="226">
+          <caret line="73" column="31" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/settings.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="487">
-          <caret line="33" column="35" selection-start-line="33" selection-start-column="35" selection-end-line="33" selection-end-column="35" />
+        <state relative-caret-position="-3820">
+          <caret line="8" column="30" lean-forward="true" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="342">
-          <caret line="75" column="46" lean-forward="true" selection-start-line="75" selection-start-column="46" selection-end-line="75" selection-end-column="46" />
+        <state relative-caret-position="-1034">
+          <caret line="50" column="19" selection-start-line="50" selection-start-column="12" selection-end-line="50" selection-end-column="21" />
           <folding>
-            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#46#61#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="14" column="43" selection-start-line="14" selection-start-column="43" selection-end-line="14" selection-end-column="43" />
+        <state relative-caret-position="-340">
+          <caret line="28" column="41" lean-forward="true" selection-start-line="28" selection-start-column="41" selection-end-line="28" selection-end-column="41" />
           <folding>
-            <element signature="e#0#10#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/middlewares.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4937">
-          <caret line="25" column="43" lean-forward="true" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="261">
+          <caret line="137" selection-start-line="137" selection-end-line="137" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+    <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="223">
-          <caret line="63" selection-start-line="63" selection-end-line="63" />
-          <folding>
-            <element signature="e#24#39#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="108">
+          <caret line="1115" selection-start-line="1115" selection-end-line="1115" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/items.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5836">
-          <caret line="40" column="21" lean-forward="true" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="70" />
+        <state relative-caret-position="591">
+          <caret line="73" column="8" selection-start-line="73" selection-start-column="4" selection-end-line="73" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="153" column="43" selection-start-line="153" selection-start-column="43" selection-end-line="153" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/log/guanjun_2019_9_4.log">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="2217" column="53" lean-forward="true" selection-start-line="2217" selection-end-line="2218" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/main.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="280">
+          <caret line="14" column="48" lean-forward="true" selection-start-line="14" selection-start-column="48" selection-end-line="14" selection-end-column="48" />
           <folding>
-            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#0#10#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1020">
-          <caret line="51" column="34" lean-forward="true" selection-start-line="51" selection-start-column="34" selection-end-line="51" selection-end-column="34" />
+        <state relative-caret-position="109">
+          <caret line="446" selection-start-line="446" selection-end-line="446" />
           <folding>
             <element signature="e#18#33#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="395">
-          <caret line="39" selection-start-line="39" selection-end-line="39" />
+        <state relative-caret-position="20">
+          <caret line="52" column="46" selection-start-line="52" selection-start-column="46" selection-end-line="52" selection-end-column="46" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#38#53#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipeline/guanjun.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2222">
+          <caret line="127" column="25" lean-forward="true" selection-start-line="127" selection-start-column="25" selection-end-line="127" selection-end-column="25" />
+          <folding>
+            <element signature="e#18#32#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="50" column="18" lean-forward="true" selection-start-line="50" selection-start-column="18" selection-end-line="50" selection-end-column="18" />
+        <state relative-caret-position="7409">
+          <caret line="406" column="29" lean-forward="true" selection-start-line="406" selection-start-column="29" selection-end-line="406" selection-end-column="29" />
           <folding>
             <element signature="e#38#53#0" expanded="true" />
           </folding>

hg3535/items.py

@@ -70,8 +70,8 @@ class Guanjun(scrapy.Field):
     # time_game = scrapy.Field()
     new_league_name = scrapy.Field()
     # champion_team = scrapy.Field()
-    new_champion = scrapy.Field()
-    pt = scrapy.Field()
+    champion_data = scrapy.Field()
+    set_id = scrapy.Field()
     ball = scrapy.Field()
     # zhuangtai = scrapy.Field()
     # champion = scrapy.Field()

hg3535/main.py

@@ -11,10 +11,10 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 # execute(["scrapy", "crawl", "wangqiu"])
 # execute(["scrapy", "crawl", "wqbodan"])
 # execute(["scrapy", "crawl", "bangqiu"])
-# execute(["scrapy", "crawl", "roll_zuqiu"]) # 滚球足球 回来要解开这个注释 其他全部解封
+execute(["scrapy", "crawl", "roll_zuqiu"]) # 滚球足球 回来要解开这个注释 其他全部解封
 # execute(["scrapy", "crawl", "roll_lanqiu"]) #滚球篮球
 # execute(["scrapy", "crawl", "roll_wangqiu"]) #滚球网球
-execute(["scrapy", "crawl", "roll_bangqiu"])  # 滚球棒球
+# execute(["scrapy", "crawl", "roll_bangqiu"])  # 滚球棒球
 # execute(["scrapy", "crawl", "ball_status"]) #滚球id本地存
 # execute(["scrapy", "crawl", "ball_status_update"]) #滚球id结束时间更新状态
 # execute(["scrapy", "crawl", "saiguo"]) #滚球id结束时间更新状态

hg3535/pipeline/guanjun.py

@@ -23,50 +23,49 @@ class Guanjunpipeline(object):
 
     # def process_item(self, item, spider):
     def _do_calculation(self, item, out):
-    # def process_item(self, item, spider):
         logger = logging.getLogger(__name__)
         data_game = item['data_game'].replace('年', "-").replace('月', "-").replace('日', "")
         time_game = item['time_game']
         ctime = data_game + " " + time_game + ":00"
         # uptime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
         league_name = item['league_name']
-        tema_home = item['tema_home']
+        # tema_home = item['tema_home']
         league_id = item['league_id']
-        match_id = item['game_id']
+        # match_id = item['game_id']
         new_league_name = item['new_league_name']
         # 冠军赔率
-        champion_team = round(item['champion_team'], 2)
+        # champion_team = round(item['champion_team'], 2)
         # 冠军玩法
-        new_champion = item['new_champion']
+        champion_datas = item['champion_data']
         # 构建唯一哈希索引
         time1 = time.mktime(time.strptime(ctime, '%Y-%m-%d %H:%M:%S')) + 43200
         time2 = time.localtime(time1)
         time3 = time.strftime('%Y-%m-%d %H:%M:%S', time2)
         ball = item['ball']
-        if ball == '足球':
+        if ball == 1:
             game_code = 'zq'
-            league_table = 'zq_league35'
+            league_table = 'zq_cleague35'
             odds_table = "zq_chain35"
-        elif ball == '篮球':
+        elif ball == 2:
             game_code = 'lq'
-            league_table = 'lq_league35'
+            league_table = 'lq_cleague35'
             odds_table = "lq_chain35"
-        elif ball == '网球':
+        elif ball == 3:
             game_code = 'wq'
-            league_table = "wq_league35"
+            league_table = "wq_cleague35"
             odds_table = "wq_chain35"
-        elif ball == '棒球':
+        elif ball == 4:
             game_code = 'bq'
-            league_table = "bq_league35"
+            league_table = "bq_cleague35"
             odds_table = "bq_chain35"
         else:
             print(ball, "冠军数据球类错误")
             return
         uuid = Helper.genearte_uuid(league_name + 'hg3535')
-        if self.db[league_table].find({'uuid': uuid}).count() < 1:
+        if self.db[league_table].find({'lg_id': league_id}).count() < 1:
             league_list = []
-            payload_key = ['game_code', 'title', 'match_id', 'lg_id', 'source']
-            payload_value = [game_code, 'league', match_id, league_id, 'hg3535']
+            payload_key = ['game_code', 'title', 'lg_id', 'source']
+            payload_value = [game_code, 'league', league_id, 'hg3535']
             l_payload = dict(zip(payload_key, payload_value))
 
             league_key = ['name_chinese', 'kind', 'match_mode', 'if_stop', 'identity', 'belong', 'last_time',
@@ -76,7 +75,7 @@ class Guanjunpipeline(object):
             league_list.append(league_dict)
             l_payload['data'] = league_list
             try:
-                res = Helper.async_post(LEAGUE_URL, league_list)
+                res = Helper.async_post(LEAGUE_URL, l_payload)
                 if res:
                     if "成功" in res:
                         logger.info('{}冠军联赛, 提交成功, {}'.format(game_code, res))
@@ -92,45 +91,51 @@ class Guanjunpipeline(object):
                 logger.warning('冠军联赛接口异常, 提交失败, {}'.format(e))
                 logger.warning(e)
         else:
-            logging.info('冠军联赛数据已存在')
-
-        sole = Helper.genearte_MD5(new_champion + str(league_id) + league_name + new_league_name + tema_home, 0)
-        odds_only = Helper.genearte_MD5(
-            new_champion + str(league_id) + league_name + new_league_name + str(champion_team) + tema_home + str(
-                match_id), 0)
-        if self.db[odds_table].find({'odds_only': odds_only}).count() < 1:
-            data_list = []
-            payload_key1 = ['game_code', 'title', 'source']
-            payload_value1 = [game_code, 'odds_ch', 'hg3535']
-            only_list = []
-            chain_dict = dict(zip(payload_key1, payload_value1))
-            only_list.append(odds_only)
-            data_key = ['match_id', 'lg_id', 'odds_code', 'status', 'sort', 'p_code', 'odds',
-                        'condition', 'odds_only', 'sole', 'source', 'type', 'team', 'uuid']
-            data_value = [match_id, league_id, new_champion, '0', '0', new_league_name, champion_team, '0', odds_only,
-                          sole, 'hg3535', '1', tema_home, uuid]
-            chain_data = dict(zip(data_key, data_value))
-            data_list.append(chain_data)
+            logging.info('{},冠军联赛数据已存在'.format(league_name))
+        payload_key1 = ['game_code', 'title', 'source', 'lg_id']
+        payload_value1 = [game_code, 'odds_ch', 'hg3535', league_id]
+        chain_dict = dict(zip(payload_key1, payload_value1))
+        data_list = []
+        only_list = []
+        set_id = item['set_id']
+        # self.db[odds_table].find({'league_id': league_id, 'match_id': set_id})
+        for champion_data in champion_datas:
+            mn = champion_data['mn']
+            odd_datas = champion_data['o']
+            for odd_data in odd_datas:
+                tema = odd_data[0]
+                odd = round(float(odd_data[2]) - 1, 2)
+                sole = Helper.genearte_MD5(mn + str(league_id) + league_name + new_league_name + tema, 0)
+                odds_only = Helper.genearte_MD5(
+                    mn + str(league_id) + league_name + new_league_name + str(odd) + tema, 0)
+                if self.db[odds_table].find({'odds_only': odds_only}).count() < 1:
+                    data_key = ['match_id', 'lg_id', 'odds_code', 'status', 'sort', 'p_code', 'odds',
+                                'condition', 'odds_only', 'sole', 'source', 'type', 'team', 'uuid']
+                    data_value = [set_id, league_id, mn, '0', '0', new_league_name, odd, '0', odds_only,
+                                  sole, 'hg3535', '1', tema, uuid]
+                    chain_data = dict(zip(data_key, data_value))
+                    data_list.append(chain_data)
+        if data_list:
             chain_dict['data'] = data_list
             chain_dict['odds_only'] = only_list
             try:
                 res = Helper.async_post(ODDSCH, chain_dict)
                 if res:
                     if "成功" in res:
-                        logger.info('{}冠军联赛, 提交成功, {}'.format(game_code, res))
+                        logger.info('{}冠军赔率，提交成功, {}'.format(game_code, res))
                         logger.info(chain_dict)
                         self.db[odds_table].insert(chain_data)
                     else:
-                        logger.warning('{}, 冠军联赛, 提交失败, {}'.format(game_code, res))
+                        logger.warning('{}, 冠军赔率接口, 提交失败, {}'.format(game_code, res))
                         logger.warning(chain_dict)
                 else:
-                    logger.warning('{}, 冠军联赛, 接口异常, 提交失败, {}'.format(game_code, res))
+                    logger.warning('{}, 冠军赔率接口, 接口异常, 提交失败, {}'.format(game_code, res))
                     logger.warning(chain_dict)
             except Exception as e:
                 logger.warning('冠军赔率接口异常，提交失败')
                 logger.warning(e)
 
         else:
-            logger.info('足球冠军已经提交过了')
+            logger.info('足球冠军赔率, 列表为空, 不提交过')
         reactor.callFromThread(out.callback, item)
 

hg3535/pipeline/roll_bangqiu.py

@@ -18,15 +18,15 @@ class Roll_Banqiupipeline(object):
         self.mongo = pymongo.MongoClient(host=M_HOST, username=M_USER, password=M_PASSWORD, port=M_POST, authSource='kaiyou')
         self.db = self.mongo[M_DB]
 
-    # @defer.inlineCallbacks
-    # def process_item(self, item, spider):
-    #     out = defer.Deferred()
-    #     reactor.callInThread(self._do_calculation, item, out)
-    #     yield out
-    #     defer.returnValue(item)
-
+    @defer.inlineCallbacks
     def process_item(self, item, spider):
-    # def _do_calculation(self, item, out):
+        out = defer.Deferred()
+        reactor.callInThread(self._do_calculation, item, out)
+        yield out
+        defer.returnValue(item)
+
+    # def process_item(self, item, spider):
+    def _do_calculation(self, item, out):
         # 使用twisted将mysql插入变成异步执行
         logger = logging.getLogger(__name__)
         # 联赛id
@@ -251,5 +251,5 @@ class Roll_Banqiupipeline(object):
                 logging.warning(r_data_dict)
         else:
             logger.info('棒球滚球结果记录为空, 不提交')
-        # reactor.callFromThread(out.callback, item)
+        reactor.callFromThread(out.callback, item)
 

hg3535/pipeline/roll_zuqiu.py

@@ -20,15 +20,15 @@ class Roll_Zuqiupipeline(object):
         self.mongo = pymongo.MongoClient(host=M_HOST, username=M_USER, password=M_PASSWORD, port=M_POST)
         self.db = self.mongo[M_DB]
 
-    @defer.inlineCallbacks
-    def process_item(self, item, spider):
-        out = defer.Deferred()
-        reactor.callInThread(self._do_calculation, item, out)
-        yield out
-        defer.returnValue(item)
-
+    # @defer.inlineCallbacks
     # def process_item(self, item, spider):
-    def _do_calculation(self, item, out):
+    #     out = defer.Deferred()
+    #     reactor.callInThread(self._do_calculation, item, out)
+    #     yield out
+    #     defer.returnValue(item)
+
+    def process_item(self, item, spider):
+    # def _do_calculation(self, item, out):
         logger = logging.getLogger(__name__)
         pt = 4
         # 比赛日期
@@ -555,7 +555,7 @@ class Roll_Zuqiupipeline(object):
                     logger.warning(r_data_dict)
             except Exception as e:
                 logger.warning('滚球数据接口异常，提交失败, {}'.format(e))
-        reactor.callFromThread(out.callback, item)
+        # reactor.callFromThread(out.callback, item)
 
 
 

hg3535/settings.py

@@ -151,7 +151,7 @@ ODDS_URL = 'http://stadmin.bocai108.com:19093/setOdds'
 TOKEN_URL = "http://stadmin.bocai108.com/getToken"
 MATCH_RESULT = "http://stadmin.bocai108.com:19093/setMatchResult"
 MATCH_STATUS = "http://stadmin.bocai108.com:19093/upMatch"
-ODDSCH = "http://stadmin.bocai108.com/setOddsCH"
+ODDSCH = "http://stadmin.bocai108.com:19093/setOddsCH"
 
 
 R_HOST = '192.168.2.200'

hg3535/spiders/guanjun.py

@@ -19,17 +19,18 @@ class LqguanjunSpider(scrapy.Spider):
         "ITEM_PIPELINES": {
             'hg3535.pipeline.guanjun.Guanjunpipeline': 300,
         },
-        # 'LOG_LEVEL': 'DEBUG',
-        # 'LOG_FILE': "../hg3535/log/guanjun_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day)
+        'LOG_LEVEL': 'DEBUG',
+        'LOG_FILE': "./log/guanjun_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day)
     }
 
     def start_requests(self):
         for z in range(1, 5):
             for x in range(0, 4):
-                url = 'https://odata.jiushan6688.com/odds6i/d/getodds/zh-cn/sid/' + str(z) + '/pt/1/ubt/or/pn/' + str(
-                    x) + '/sb/2/dc/null/pid/0'
+                # for y in range()
+                url = 'https://odata.jiushan6688.com/odds6i/d/getodds/zh-cn/sid/{}/pt/1/ubt/or/pn/{}/sb/2/dc/null/pid/0'.format(x, z)
+                # url = 'https://odata.jiushan6688.com/odds6i/d/getodds/zh-cn/sid/1/pt/1/ubt/or/pn/1/sb/2/dc/null/pid/0'
                 # redis_key = "guanjun: start_urls"
-                yield Request(url=url, callback=self.parse, meta={'pt': 1, 'sid': z}, dont_filter=True)
+                yield Request(url=url, callback=self.parse, dont_filter=True)
 
     def parse(self, response):
         try:
@@ -41,7 +42,7 @@ class LqguanjunSpider(scrapy.Spider):
         except:
             results = ""
         try:
-            ball = datas['n-ot']['s']['n']
+            ball = datas['n-ot']['s']['k']
         except:
             ball = ""
         if results:
@@ -52,25 +53,36 @@ class LqguanjunSpider(scrapy.Spider):
                 league_name = result['c']['n']
                 new_results = result['es']
                 for new_result in new_results:
-                    data_game = new_result['i'][4]
+                    date_game = new_result['i'][4]
                     time_game = new_result['i'][5]
                     new_league_name = new_result['egn'].replace('\t', '')
-                    for i in new_result['n-o']:
-                        new_champion = i['mn']
-                        for y in i['o']:
-                            item = Guanjun()
-                            game_id = str(new_result['i'][16])
-                            tema_home = y[0]
-                            champion_team = float(y[2]) - 1
-                            item['league_name'] = league_name
-                            item['tema_home'] = tema_home
-                            item['league_id'] = league_id
-                            item['game_id'] = game_id
-                            item['data_game'] = data_game
-                            item['time_game'] = time_game
-                            item['new_league_name'] = new_league_name
-                            item['champion_team'] = champion_team
-                            item['new_champion'] = new_champion
-                            # item['pt'] = pt
-                            item['ball'] = ball
-                            yield item
+                    data = new_result['n-o']
+                    item = Guanjun()
+                    item['league_name'] = league_name
+                    item['new_league_name'] = new_league_name
+                    item['time_game'] = time_game
+                    item['data_game'] = date_game
+                    item['ball'] = ball
+                    item['champion_data'] = data
+                    item['league_id'] = league_id
+                    item['set_id'] = new_result['k']
+                    yield item
+                    # for i in new_result['n-o']:
+                    #     new_champion = i['mn']
+                        # for y in i['o']:
+                        #     item = Guanjun()
+                        #     game_id = str(new_result['i'][16])
+                        #     tema_home = y[0]
+                        #     champion_team = float(y[2]) - 1
+                        #
+                        #     item['tema_home'] = tema_home
+                        #     item['league_id'] = league_id
+                        #     item['game_id'] = game_id
+                        #     item['data_game'] = data_game
+                        #     item['time_game'] = time_game
+                        #     item['new_league_name'] = new_league_name
+                        #     item['champion_team'] = champion_team
+                        #     item['new_champion'] = new_champion
+                        #     # item['pt'] = pt
+                        #     item['ball'] = ball
+                        #     yield item

hg3535/spiders/roll_bangqiu.py

@@ -1,16 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import datetime
-
 import jsonpath
 import redis
-
-__author__ = 'ethereal'
-__mtime__ = '2019/4/16'
-
-# -*- coding: utf-8 -*-
 import json
-
 import scrapy
 from scrapy.http import Request
 from ..items import Roll_Bangqiu
@@ -40,13 +33,11 @@ class BqrangqiuSpider(scrapy.Spider):
             for i in ids:
                 urls = 'https://odata.jiushan6688.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/true/ubt/am/isp/false'.format(
                     i)
+                self.rls.sadd('hg3535.gunqiu.ids', i)
                 yield Request(url=urls, callback=self.parse_each, dont_filter=True)
 
     def parse_each(self, response):
         datas = json.loads(response.text)
-        # 倒三角形  sa向下，sh向上
-        triangle = datas['i'][5]
-        rule = {'sa': 'Bottom', 'sh': 'Top'}
         try:
             new_datas = datas['eg']
         except:
@@ -90,6 +81,12 @@ class BqrangqiuSpider(scrapy.Spider):
                     ot = result['sb'].get("ot", "")
 
                     ps_list = result['sb']['ps']
+                    # 倒三角形
+                    triangle = result['sb']['s']
+                    if triangle:
+                        rule = 'Bottom'
+                    else:
+                        rule = 'Top'
                     # 右菱形bool值
                     fb = result['sb']['fb']
                     if not fb:
@@ -218,7 +215,7 @@ class BqrangqiuSpider(scrapy.Spider):
                     source_dict['OT_C'] = ps_list[1]['a']
                     source_dict['game_num_H'] = ps_list[0]['h']
                     source_dict['game_num_C'] = ps_list[0]['a']
-                    source_dict['schedule'] = rule[triangle] + cp
+                    source_dict['schedule'] = rule + cp
                     source_dict['out_game_num'] = ot
                     source_dict['baseman_1'] = baseman_1
                     source_dict['baseman_2'] = baseman_2

hg3535/spiders/roll_zuqiu.py

@@ -405,7 +405,7 @@ class ZuqiuSpider(scrapy.Spider):
                             except:
                                 bodan_data[z] = 0
                         # 和/平
-                        half_bodan_dogfall = new_half_bodans[-6:-2]
+                        half_bodan_dogfall = halfbodan[-5:-1]
                         for a, b in enumerate(new_three):
                             try:
                                 bodan_data[b] = round(float(half_bodan_dogfall[a]) - 1, 2)