updata

hg3535/.idea/workspace.xml

@@ -2,15 +2,20 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7fa42e97-ddea-4404-91db-5a9ccc162649" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/pipeline/jieshu.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/spiders/jieshu.py" afterDir="false" />
       <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/roll_lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_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_wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_wangqiu.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipeline/roll_zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_zuqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pipeline/wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/wangqiu.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipeline/zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/zuqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/settings.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_lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_lanqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/roll_wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_wangqiu.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" />
     <option name="SHOW_DIALOG" value="false" />
@@ -20,7 +25,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="1567410979859" 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="1567496183489" 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$" />
@@ -51,8 +56,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="300">
-              <caret line="15" column="50" lean-forward="true" selection-start-line="15" selection-start-column="50" selection-end-line="15" selection-end-column="50" />
+            <state relative-caret-position="146">
+              <caret line="10" column="39" lean-forward="true" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />
               <folding>
                 <element signature="e#0#10#0" expanded="true" />
               </folding>
@@ -61,10 +66,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
+        <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="229" column="52" lean-forward="true" selection-start-line="229" selection-start-column="52" selection-end-line="229" selection-end-column="52" />
+            <state relative-caret-position="880">
+              <caret line="44" selection-start-line="44" selection-end-line="44" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
               </folding>
@@ -72,30 +77,98 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1689">
+              <caret line="176" column="117" selection-start-line="176" selection-start-column="117" selection-end-line="176" selection-end-column="117" />
+              <folding>
+                <element signature="e#46#61#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="560">
+              <caret line="50" selection-start-line="50" selection-end-line="50" />
+              <folding>
+                <element signature="e#18#32#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pipeline/guanjun.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" />
+              <folding>
+                <element signature="e#18#32#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="40">
+              <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>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
+        <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-774">
-              <caret line="209" column="59" lean-forward="true" selection-start-line="209" selection-start-column="59" selection-end-line="209" selection-end-column="59" />
+            <state relative-caret-position="545">
+              <caret line="495" column="28" selection-start-line="495" selection-start-column="28" selection-end-line="495" selection-end-column="28" />
               <folding>
-                <element signature="e#0#15#0" expanded="true" />
+                <element signature="e#24#39#0" expanded="true" />
+                <element signature="e#24038#29654#0" />
+                <element signature="e#29871#35538#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/saiguo.py">
+        <entry file="file://$PROJECT_DIR$/utils/helper.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="340">
-              <caret line="17" column="43" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
+            <state>
+              <caret line="12" column="20" lean-forward="true" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
               <folding>
-                <element signature="e#0#15#0" expanded="true" />
+                <element signature="e#0#14#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="6757">
+              <caret line="547" column="48" lean-forward="true" selection-start-line="544" selection-end-line="553" selection-end-column="47" />
+              <folding>
+                <element signature="e#18#33#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/settings.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-4">
+              <caret line="141" column="14" lean-forward="true" selection-start-line="141" selection-start-column="14" selection-end-line="141" selection-end-column="14" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -107,8 +180,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>st_zq_league</find>
-      <find>zqtwo_intodb</find>
       <find>odds_only</find>
       <find>wq_</find>
       <find>Zuqiustatus</find>
@@ -136,7 +207,9 @@
       <find>Roll_Wangqiu</find>
       <find>Roll_Lanqiu</find>
       <find>score_home</find>
+      <find>odds_onlys</find>
       <find>fuhao</find>
+      <find>足球滚球联赛提交失败</find>
     </findStrings>
     <replaceStrings>
       <replace>&quot;&quot;</replace>
@@ -191,8 +264,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/log/roll_zuqiu.log" />
-        <option value="$PROJECT_DIR$/log/wangqiu.log" />
         <option value="$PROJECT_DIR$/log/wqbodan.log" />
         <option value="$PROJECT_DIR$/log/zuqiu.log" />
         <option value="$PROJECT_DIR$/spiders/hg3535_wangqiu.py" />
@@ -219,29 +290,31 @@
         <option value="$PROJECT_DIR$/spiders/zq_jieshu.py" />
         <option value="$PROJECT_DIR$/pipelines.py" />
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/pipeline/guanjun.py" />
         <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
         <option value="$PROJECT_DIR$/spiders/guanjun.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
         <option value="$PROJECT_DIR$/utils/helper.py" />
         <option value="$PROJECT_DIR$/pipeline/ball_func.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/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$/pipeline/saiguo.py" />
         <option value="$PROJECT_DIR$/spiders/saiguo.py" />
-        <option value="$PROJECT_DIR$/main.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/zuqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_zuqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/lanqiu.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$/pipeline/roll_zuqiu.py" />
+        <option value="$PROJECT_DIR$/items.py" />
+        <option value="$PROJECT_DIR$/pipeline/jieshu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_wangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/jieshu.py" />
+        <option value="$PROJECT_DIR$/settings.py" />
+        <option value="$PROJECT_DIR$/main.py" />
+        <option value="$PROJECT_DIR$/pipeline/guanjun.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
       </list>
     </option>
   </component>
@@ -294,12 +367,12 @@
     <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\Users\admin\Desktop\sports_scrapy\hg3535" />
-      <recent name="C:\Users\admin\Desktop\sports_scrapy\hg3535\spiders" />
-    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\admin\Desktop\sports_scrapy\hg3535\pipeline" />
+      <recent name="C:\Users\admin\Desktop\sports_scrapy\hg3535\spiders" />
+      <recent name="C:\Users\admin\Desktop\sports_scrapy\hg3535" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\admin\Desktop\sports_scrapy\hg3535" />
       <recent name="C:\Users\admin\Desktop\sports_scrapy\hg3535\spiders" />
     </key>
@@ -552,7 +625,7 @@
       <workItem from="1566976369645" duration="4000" />
       <workItem from="1566976385269" duration="13184000" />
       <workItem from="1566990066292" duration="35762000" />
-      <workItem from="1567126891838" duration="80239000" />
+      <workItem from="1567126891838" duration="106816000" />
     </task>
     <task id="LOCAL-00001" summary="修改后,版本二">
       <created>1555727493584</created>
@@ -827,11 +900,18 @@
       <option name="project" value="LOCAL" />
       <updated>1567409111390</updated>
     </task>
-    <option name="localTasksCounter" value="40" />
+    <task id="LOCAL-00040" summary="updata">
+      <created>1567412233938</created>
+      <option name="number" value="00040" />
+      <option name="presentableId" value="LOCAL-00040" />
+      <option name="project" value="LOCAL" />
+      <updated>1567412233938</updated>
+    </task>
+    <option name="localTasksCounter" value="41" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1758913000" />
+    <option name="totallyTimeSpent" value="1785490000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -851,7 +931,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.2414163" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" weight="0.46244636" />
       <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" />
@@ -861,7 +941,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.27360514" />
+      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" visible="true" weight="0.27038628" />
       <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" />
@@ -975,11 +1055,6 @@
           <line>84</line>
           <option name="timeStamp" value="4" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/spiders/roll_zuqiu.py</url>
-          <line>34</line>
-          <option name="timeStamp" value="42" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/zuqiu.py</url>
           <line>251</line>
@@ -987,7 +1062,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_zuqiu.py</url>
-          <line>448</line>
+          <line>445</line>
           <option name="timeStamp" value="49" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1017,27 +1092,17 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/roll_wangqiu.py</url>
-          <line>280</line>
+          <line>268</line>
           <option name="timeStamp" value="67" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/roll_wangqiu.py</url>
-          <line>61</line>
-          <option name="timeStamp" value="68" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/spiders/roll_wangqiu.py</url>
-          <line>62</line>
-          <option name="timeStamp" value="69" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/spiders/roll_wangqiu.py</url>
-          <line>285</line>
+          <line>273</line>
           <option name="timeStamp" value="70" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_wangqiu.py</url>
-          <line>279</line>
+          <line>276</line>
           <option name="timeStamp" value="71" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1090,6 +1155,36 @@
           <line>43</line>
           <option name="timeStamp" value="108" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/saiguo.py</url>
+          <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_zuqiu.py</url>
+          <line>45</line>
+          <option name="timeStamp" value="122" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/jieshu.py</url>
+          <line>29</line>
+          <option name="timeStamp" value="125" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/roll_lanqiu.py</url>
+          <line>63</line>
+          <option name="timeStamp" value="132" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/jieshu.py</url>
+          <line>35</line>
+          <option name="timeStamp" value="133" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -1117,37 +1212,9 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/spiders/wq_jieshu.py" />
-    <entry file="file://$PROJECT_DIR$/spiders/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="11" column="1" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/requirements.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-530" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/roll.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#11#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/__init__.py">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/jianting.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/main_time.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-86">
@@ -1180,16 +1247,6 @@
     <entry file="file://$PROJECT_DIR$/pipeline/__init__.py">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/guanjun.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="18">
-          <caret line="32" column="57" selection-start-line="32" selection-start-column="57" selection-end-line="32" selection-end-column="57" />
-          <folding>
-            <element signature="e#18#32#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -1225,13 +1282,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-610">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://C:/venv/Lib/site-packages/twisted/internet/task.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
@@ -1253,16 +1303,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
-          <folding>
-            <element signature="e#46#61#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://C:/venv/Lib/site-packages/pymongo/helpers.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1880">
@@ -1292,206 +1332,271 @@
         <state relative-caret-position="-1665" />
       </provider>
     </entry>
-    <entry file="file://C:/venv/Lib/site-packages/redis/client.py">
+    <entry file="file://$PROJECT_DIR$/spiders/liansai.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-420" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="11652">
-          <caret line="1943" column="8" selection-start-line="1943" selection-start-column="8" selection-end-line="1943" selection-end-column="8" />
+        <state relative-caret-position="20">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="277">
-          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="-2914">
+          <caret line="8" column="25" selection-start-line="8" selection-start-column="25" selection-end-line="8" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3216">
+          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="7" column="30" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="30" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="141">
-          <caret line="22" column="41" lean-forward="true" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
+        <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$/spiders/roll_zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="8600">
-          <caret line="442" column="18" lean-forward="true" selection-start-line="442" selection-start-column="18" selection-end-line="442" selection-end-column="18" />
+        <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://$PROJECT_DIR$/spiders/zuqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1540">
+          <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>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
+    <entry file="file://C:/venv/Lib/site-packages/requests/utils.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="520">
-          <caret line="62" selection-start-line="62" selection-end-line="62" />
+        <state relative-caret-position="87">
+          <caret line="513" selection-start-line="513" selection-end-line="513" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="40">
+          <caret line="2" column="11" lean-forward="true" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/jianting.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/not_roll.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
           <folding>
-            <element signature="e#24#39#0" expanded="true" />
+            <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/items.py">
+    <entry file="file://$PROJECT_DIR$/roll.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="356">
-          <caret line="458" lean-forward="true" selection-start-line="458" selection-end-line="458" />
+        <state>
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/liansai.py">
+    <entry file="file://C:/venv/Lib/site-packages/redis/client.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-420" />
+        <state relative-caret-position="215">
+          <caret line="1979" column="57" lean-forward="true" selection-start-line="1979" selection-start-column="55" selection-end-line="1979" selection-end-column="60" />
+        </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/middlewares.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="799">
-          <caret line="152" selection-start-line="152" selection-end-line="152" />
+        <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="860">
-          <caret line="53" column="72" selection-start-line="53" selection-start-column="72" selection-end-line="53" selection-end-column="72" />
+        <state relative-caret-position="46">
+          <caret line="29" column="9" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="44" />
           <folding>
             <element signature="e#18#33#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/saiguo.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="20">
-          <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+        <state relative-caret-position="260">
+          <caret line="18" selection-start-line="18" selection-end-line="19" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/items.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2914">
-          <caret line="8" column="25" selection-start-line="8" selection-start-column="25" selection-end-line="8" selection-end-column="25" />
+        <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$/spiders/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-8993">
-          <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="500">
+          <caret line="25" selection-start-line="25" selection-end-line="25" selection-end-column="5" />
           <folding>
-            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="11580">
-          <caret line="645" column="59" lean-forward="true" selection-start-line="645" selection-start-column="59" selection-end-line="645" selection-end-column="59" />
+        <state relative-caret-position="1380">
+          <caret line="69" column="20" 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$/settings.py">
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="679">
-          <caret line="150" column="50" lean-forward="true" selection-start-line="150" selection-start-column="50" selection-end-line="150" selection-end-column="50" />
+        <state relative-caret-position="202">
+          <caret line="56" selection-start-line="56" selection-end-line="56" selection-end-column="108" />
+          <folding>
+            <element signature="e#24#35#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="56" column="39" lean-forward="true" selection-start-line="55" selection-end-line="59" selection-end-column="96" />
+        <state relative-caret-position="280">
+          <caret line="40" column="36" lean-forward="true" selection-start-line="40" selection-start-column="36" selection-end-line="40" selection-end-column="36" />
           <folding>
-            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#38#53#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5768">
-          <caret line="255" column="48" lean-forward="true" selection-start-line="255" selection-start-column="48" selection-end-line="255" selection-end-column="48" />
+        <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" />
           <folding>
-            <element signature="e#18#33#0" expanded="true" />
+            <element signature="e#46#61#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4">
+          <caret line="141" column="14" lean-forward="true" selection-start-line="141" selection-start-column="14" selection-end-line="141" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3292">
-          <caret line="194" column="46" lean-forward="true" selection-start-line="194" selection-start-column="46" selection-end-line="194" selection-end-column="46" />
+        <state relative-caret-position="880">
+          <caret line="44" selection-start-line="44" selection-end-line="44" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/helper.py">
+    <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="87">
-          <caret line="13" selection-start-line="13" selection-end-line="13" />
+        <state relative-caret-position="146">
+          <caret line="10" column="39" lean-forward="true" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />
           <folding>
-            <element signature="e#0#14#0" expanded="true" />
+            <element signature="e#0#10#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/saiguo.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="17" column="43" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
+        <state relative-caret-position="560">
+          <caret line="50" selection-start-line="50" selection-end-line="50" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#18#32#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/utils/helper.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3216">
-          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
+        <state>
+          <caret line="12" column="20" lean-forward="true" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main.py">
+    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="15" column="50" lean-forward="true" selection-start-line="15" selection-start-column="50" selection-end-line="15" selection-end-column="50" />
+        <state relative-caret-position="40">
+          <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6757">
+          <caret line="547" column="48" lean-forward="true" selection-start-line="544" selection-end-line="553" selection-end-column="47" />
           <folding>
-            <element signature="e#0#10#0" expanded="true" />
+            <element signature="e#18#33#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/guanjun.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="229" column="52" lean-forward="true" selection-start-line="229" selection-start-column="52" selection-end-line="229" selection-end-column="52" />
+        <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" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#18#32#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-774">
-          <caret line="209" column="59" lean-forward="true" selection-start-line="209" selection-start-column="59" selection-end-line="209" selection-end-column="59" />
+        <state relative-caret-position="545">
+          <caret line="495" column="28" selection-start-line="495" selection-start-column="28" selection-end-line="495" selection-end-column="28" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#24#39#0" expanded="true" />
+            <element signature="e#24038#29654#0" />
+            <element signature="e#29871#35538#0" />
           </folding>
         </state>
       </provider>

hg3535/items.py

@@ -463,3 +463,11 @@ class Hgsaiguo(scrapy.Field):
     # 足球比赛结果元组
     id_score = scrapy.Field()
     pt = scrapy.Field()
+
+
+class Hgjieshu(scrapy.Field):
+    # 足球比赛结果元组
+    # status = scrapy.Field()
+    ball = scrapy.Field()
+    match_id = scrapy.Field()
+

hg3535/main.py

@@ -7,17 +7,17 @@ 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", "guanjun"])
+execute(["scrapy", "crawl", "guanjun"])
 # execute(["scrapy", "crawl", "wangqiu"])
 # execute(["scrapy", "crawl", "wqbodan"])
 # execute(["scrapy", "crawl", "bangqiu"])
 # execute(["scrapy", "crawl", "roll_zuqiu"]) # 滚球足球 回来要解开这个注释 其他全部解封
-execute(["scrapy", "crawl", "roll_lanqiu"]) #滚球篮球
+# execute(["scrapy", "crawl", "roll_lanqiu"]) #滚球篮球
 # execute(["scrapy", "crawl", "roll_wangqiu"]) #滚球网球
 # execute(["scrapy", "crawl", "roll_bangqiu"])  # 滚球棒球
 # execute(["scrapy", "crawl", "ball_status"]) #滚球id本地存
 # execute(["scrapy", "crawl", "ball_status_update"]) #滚球id结束时间更新状态
 # execute(["scrapy", "crawl", "saiguo"]) #滚球id结束时间更新状态
-# execute(["scrapy", "crawl", "lq_jieshu"]) #滚球id结束时间更新状态
+# execute(["scrapy", "crawl", "jieshu"]) #滚球id结束时间更新状态
 # execute(["scrapy", "crawl", "wq_jieshu"]) #滚球id结束时间更新状态
 # execute(["scrapy", "crawl", "bq_jieshu"]) #滚球id结束时间更新状态

hg3535/pipeline/guanjun.py

@@ -2,22 +2,33 @@
 import pymongo
 import time
 import logging
+
+from twisted.internet import defer, reactor
+
 from ..utils.helper import Helper
+from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, LEAGUE_URL, ODDSCH
 
 
 class Guanjunpipeline(object):
     def open_spider(self, spider):
-        self.mongo = pymongo.MongoClient(host="192.168.2.200", username="kaiyou", password="kaiyou", port=27017)
-        self.db = self.mongo['kaiyou']
+        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):
-        # gj_odds = []
-        url = 'http://admin.5gogo.com/'
+        out = defer.Deferred()
+        reactor.callInThread(self._do_calculation, item, out)
+        yield out
+        defer.returnValue(item)
+
+    # def process_item(self, item, spider):
+    def _do_calculation(self, item, out):
+    # def 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())
+        # uptime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
         league_name = item['league_name']
         tema_home = item['tema_home']
         league_id = item['league_id']
@@ -34,75 +45,92 @@ class Guanjunpipeline(object):
         ball = item['ball']
         if ball == '足球':
             game_code = 'zq'
-            league_table = 'hg3535_zq_league'
-            odds_table = "hg3535_zq_chain_odds"
+            league_table = 'zq_league35'
+            odds_table = "zq_chain35"
         elif ball == '篮球':
             game_code = 'lq'
-            league_table = 'hg3535_lq_league'
-            odds_table = "hg3535_lq_chain_odds"
+            league_table = 'lq_league35'
+            odds_table = "lq_chain35"
         elif ball == '网球':
             game_code = 'wq'
-            league_table = "hg3535_wq_league"
-            odds_table = "hg3535_wq_chain_odds"
+            league_table = "wq_league35"
+            odds_table = "wq_chain35"
         elif ball == '棒球':
             game_code = 'bq'
-            league_table = "hg3535_bq_league"
-            odds_table = "hg3535_bq_chain_odds"
+            league_table = "bq_league35"
+            odds_table = "bq_chain35"
         else:
             print(ball, "冠军数据球类错误")
             return
-        league_list = []
-        uuid = Helper.genearte_MD5(league_name + 'hg0088')
-        payload_key = ['game_code', 'title', 'match_id', 'lg_id', 'source']
-        payload_value = [game_code, 'league', match_id, league_id, 'hg3535']
-        l_payload = dict(zip(payload_key, payload_value))
-
-        league_key = ['name_chinese', 'kind', 'match_mode', 'if_stop', 'identity', 'belong', 'last_time',
-                      'lg_id', 'source', 'uuid']
-        league_value = [new_league_name, '0', '0', '0', uuid, '0', time3, league_id, 'hg3535', uuid]
-        league_dict = dict(zip(league_key, league_value))
+        uuid = Helper.genearte_uuid(league_name + 'hg3535')
         if self.db[league_table].find({'uuid': uuid}).count() < 1:
+            league_list = []
+            payload_key = ['game_code', 'title', 'match_id', 'lg_id', 'source']
+            payload_value = [game_code, 'league', match_id, league_id, 'hg3535']
+            l_payload = dict(zip(payload_key, payload_value))
+
+            league_key = ['name_chinese', 'kind', 'match_mode', 'if_stop', 'identity', 'belong', 'last_time',
+                          'lg_id', 'source', 'uuid']
+            league_value = [new_league_name, '0', '0', '0', uuid, '0', time3, league_id, 'hg3535', uuid]
+            league_dict = dict(zip(league_key, league_value))
             league_list.append(league_dict)
             l_payload['data'] = league_list
             try:
-                print("冠军联赛数据不为空，数据提交")
-                response_data = Helper.async_post(url + '/setLeague', l_payload)
-                print(response_data)
-                print('请求冠军联赛成功')
-                logger.info('请求足球冠军联赛成功')
+                res = Helper.async_post(LEAGUE_URL, league_list)
+                if res:
+                    if "成功" in res:
+                        logger.info('{}冠军联赛, 提交成功, {}'.format(game_code, res))
+                        logger.info(league_list)
+                        self.db[league_table].insert(league_list)
+                    else:
+                        logger.warning('{}, 冠军联赛, 提交失败, {}'.format(game_code, res))
+                        logger.warning(l_payload)
+                else:
+                    logger.warning('{}, 冠军联赛, 接口异常, 提交失败, {}'.format(game_code, res))
+                    logger.warning(l_payload)
             except Exception as e:
-                logger.warning('足球冠军联赛数据数据接口异常，提交失败')
+                logger.warning('冠军联赛接口异常, 提交失败, {}'.format(e))
                 logger.warning(e)
-            self.db[league_table].insert(league_list)
         else:
-            print('冠军联赛数据已存在')
+            logging.info('冠军联赛数据已存在')
 
-        payload_key1 = ['game_code', 'title', 'source']
-        payload_value1 = [game_code, 'odds_ch', 'hg3535']
-        only_list = []
-        chain_dict = dict(zip(payload_key1, payload_value1))
-        sole = Helper.genearte_MD5(new_champion + str(league_id) + league_name + new_league_name + tema_home)
-        odds_only = Helper.genearte_MD5(new_champion + str(league_id) + league_name + new_league_name + str(champion_team) + tema_home + str(match_id))
-        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 = []
+        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)
             chain_dict['data'] = data_list
             chain_dict['odds_only'] = only_list
             try:
-                response_data = Helper.async_post(url + '/setOddsCH', chain_dict)
-                # logger.warning(response_data.text)
-                print(odds_table, response_data)
-                print(odds_table, '请求冠军赔率成功')
+                res = Helper.async_post(ODDSCH, chain_dict)
+                if res:
+                    if "成功" in 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(chain_dict)
+                else:
+                    logger.warning('{}, 冠军联赛, 接口异常, 提交失败, {}'.format(game_code, res))
+                    logger.warning(chain_dict)
             except Exception as e:
                 logger.warning('冠军赔率接口异常，提交失败')
                 logger.warning(e)
-            self.db[odds_table].insert(chain_data)
+
         else:
-            print('足球冠军已经提交过了')
             logger.info('足球冠军已经提交过了')
+        reactor.callFromThread(out.callback, item)
 

hg3535/pipeline/jieshu.py

@@ -0,0 +1,58 @@
+# import datetime
+import pymongo
+# import time
+import logging
+
+# import redis
+# from twisted.internet import defer, reactor
+
+from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, MATCH_STATUS
+from ..utils.helper import Helper
+
+
+# 滚球足球 插入
+class Jieshuqiupipeline(object):
+
+    def open_spider(self, spider):
+        self.mongo = pymongo.MongoClient(host=M_HOST, username=M_USER, password=M_PASSWORD, port=M_POST)
+        self.db = self.mongo[M_DB]
+        # cls = redis.Redis(host='192.168.0.110', port=6379, db=0)
+    #
+    # @defer.inlineCallbacks
+    # def process_item(self, item, spider):
+    #     out = defer.Deferred()
+    #     reactor.callInThread(self._do_calculation, item, out)
+    #     yield out
+    #     defer.returnValue(item)
+    # def _do_calculation(self, item, out):
+
+    def process_item(self, item, spider):
+        logger = logging.getLogger(__name__)
+        ball = item['ball']
+        match_id = item['match_id']
+        if ball == '足球':
+            game_code = "zq"
+        elif ball == '篮球':
+            game_code = "lq"
+        elif ball == '网球':
+            game_code = "wq"
+        else:
+            game_code = "bq"
+        status_dict = {"game_code": game_code, "title": "match_status", "source": "hg3535"}
+        data_list = []
+        data = {'match_id': match_id, 'status': 2, "is_rollball": 0, "is_today": 0, "is_morningplate": 0, "is_stringscene": 0, "is_horn": 0}
+        data_list.append(data)
+        status_dict['data'] = data_list
+        res = Helper.async_post(MATCH_STATUS, status_dict)
+        if res:
+            if "成功" in res:
+                self.db.match_status35.insert(status_dict)
+                logger.info('{},赛事结果状态交成功, {}'.format(game_code, res))
+                logger.info(status_dict)
+            else:
+                logger.warning('{},赛事结果状态交失败, {}'.format(game_code, res))
+                logger.warning(status_dict)
+        else:
+            logger.warning('{},赛事结果状态接口异常提交失败, {}'.format(game_code, res))
+            logger.warning(status_dict)
+    #     reactor.callFromThread(out.callback, item)

hg3535/pipeline/roll_wangqiu.py

@@ -71,8 +71,8 @@ class Roll_Wangqiupipeline(object):
         score_guest = item['score_guest']
         # 第几节
         jijie = item['jijie']
-        # 球队得分
-        qiudui = item['qiudui']
+        # # 球队得分
+        # qiudui = item['qiudui']
         pt = 4
         # 取不到 暂时注掉
         # match_date, match_time = new_times(ctime)
@@ -254,7 +254,6 @@ class Roll_Wangqiupipeline(object):
         da_list = []
         wq_rball = {"lg_id": league_id, "home_player_name": team_home, "guest_player_name": team_guest,
                     "home_player_let_plate": '', "guest_player_let_plate": '', "home_player_let_inning": "",
-                    # "guest_player_let_inning": "", "all_inning": score_dict['total_inning'],
                     "guest_player_let_inning": "", "all_inning": "",
                     "home_player_score": score_home,
                     "guest_player_score": score_guest,
@@ -264,8 +263,6 @@ class Roll_Wangqiupipeline(object):
                     "match_winer_player": "", "update_time": "",
                     "match_time": time_game, "match_process": jijie, "tag": tag_number, "match_id": match_id,
                     "source": "hg3535", "result_mark": score_dict, "warn_more": '', "uuid": uuid,
-                    # "match_score": score_dict['current_point_home_guest'], "ctime": ctime, "inning": "",
-                    # "strat_time": ""
                     }
 
         da_list.append(wq_rball)

hg3535/pipeline/roll_zuqiu.py

@@ -9,7 +9,7 @@ from twisted.internet import defer, reactor
 
 from .ball_func import fuhao
 from ..utils.helper import Helper
-from .ball_func import get_pcode
+# from .ball_func import get_pcode
 from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, LEAGUE_URL, ODDS_URL, MATCH_URL, MATCH_RESULT
 
 
@@ -27,6 +27,7 @@ class Roll_Zuqiupipeline(object):
         yield out
         defer.returnValue(item)
 
+    # def process_item(self, item, spider):
     def _do_calculation(self, item, out):
         logger = logging.getLogger(__name__)
         pt = 4
@@ -79,7 +80,7 @@ class Roll_Zuqiupipeline(object):
             if res:
                 if "成功" in res:
                     self.db.hg3535_zq_league.insert(league_list)
-                    logger.info('足球滚球联赛提交失败, {}'.format(res))
+                    logger.info('足球滚球联赛提交成功, {}'.format(res))
                     logger.info(league_dict)
                 else:
                     logger.warning('足球滚球联赛提交失败, {}'.format(res))
@@ -130,7 +131,6 @@ class Roll_Zuqiupipeline(object):
             sole_str = p_code + "gss_h" + str(index) + str(match_id) + "hg3535"
             odds_only = Helper.genearte_MD5(hash_str, pt)
             sole = Helper.genearte_MD5(sole_str, pt)
-            odds_onlys.append(odds_only)
             half_size_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                    "odds_only", "sole", "source", "type", "team"]
             condition = half_size_guest_rule[index]
@@ -201,7 +201,6 @@ class Roll_Zuqiupipeline(object):
             sole_str = p_code + "cog_h" + str(index) + str(match_id) + "hg3535"
             odds_only = Helper.genearte_MD5(hash_str, pt)
             sole = Helper.genearte_MD5(sole_str, pt)
-            odds_onlys.append(odds_only)
             half_concede_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                       "odds_only", "sole", "source", "type", "team"]
             condition = half_concede_guest_rule[index]
@@ -238,7 +237,7 @@ class Roll_Zuqiupipeline(object):
             sole = Helper.genearte_MD5(sole_str, pt)
             concede_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                  "odds_only", "sole", "source", "type", "team"]
-            condition = concede_guest[index]
+            condition = concede_guest_rule[index]
             concede_guest_value = [match_id, league_id, "cog", "0", index, p_code, value, condition,
                                    odds_only, sole, "hg3535", "0", ""]
             concede_guest_data = dict(zip(concede_guest_key, concede_guest_value))
@@ -273,7 +272,6 @@ class Roll_Zuqiupipeline(object):
         sole_str = p_code + "ch_h" + '0' + str(match_id) + "hg3535"
         odds_only = Helper.genearte_MD5(hash_str, pt)
         sole = Helper.genearte_MD5(sole_str, pt)
-        odds_onlys.append(odds_only)
         half_capot_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                "odds_only", "sole", "source", "type", "team"]
         half_capot_home_value = [match_id, league_id, "ch_h", "0", 0, p_code, half_capot_home, '1',
@@ -298,7 +296,6 @@ class Roll_Zuqiupipeline(object):
         sole_str = p_code + "cd_h" + '0' + str(match_id) + "hg3535"
         odds_only = Helper.genearte_MD5(hash_str, pt)
         sole = Helper.genearte_MD5(sole_str, pt)
-        odds_onlys.append(odds_only)
         half_capot_dogfall_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                   "odds_only", "sole", "source", "type", "team"]
         half_capot_dogfall_value = [match_id, league_id, "cd_h", "0", 0, p_code, half_capot_dogfall, 'X',
@@ -353,7 +350,6 @@ class Roll_Zuqiupipeline(object):
         sole_str = p_code + "tss" + '0' + str(match_id) + "hg3535"
         odds_only = Helper.genearte_MD5(hash_str, pt)
         sole = Helper.genearte_MD5(sole_str, pt)
-        odds_onlys.append(odds_only)
         single_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                       "odds_only", "sole", "source", "type", "team"]
         single_value = [match_id, league_id, "tss", "0", 0, p_code, odd_even_odd, '单',
@@ -363,12 +359,12 @@ class Roll_Zuqiupipeline(object):
 
         # odd_even_even
         hash_str = p_code + "tsd" + '0' + '双' + str(odd_even_even) + "hg3535" + str(match_id)
-        sole_str = p_code + "tss" + '0' + str(match_id) + "hg3535"
+        sole_str = p_code + "tsd" + '0' + str(match_id) + "hg3535"
         odds_only = Helper.genearte_MD5(hash_str, pt)
         sole = Helper.genearte_MD5(sole_str, pt)
         double_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                       "odds_only", "sole", "source", "type", "team"]
-        double_value = [match_id, league_id, "tss", "0", 0, p_code, odd_even_even, '双',
+        double_value = [match_id, league_id, "tsd", "0", 0, p_code, odd_even_even, '双',
                         odds_only, sole, "hg3535", "0", ""]
         double_data = dict(zip(double_key, double_value))
         data_list.append(double_data)
@@ -397,6 +393,7 @@ class Roll_Zuqiupipeline(object):
         half_single_data = dict(zip(half_single_key, half_single_value))
         data_list.append(half_single_data)
 
+        p_code = 'TG'
         # 总入球数 ------------------------------------------------------------------------------------------------------
         total_goals = item['total_goal']
         total_dict = {'tg0': '0-1', 'tg1': '2-3', 'tg2': '4-6','tg3': '7或以上', 'tg0_h': '0', "tg1_h": '1',
@@ -435,7 +432,7 @@ class Roll_Zuqiupipeline(object):
 
         # 波胆------------------------------------------------------------------------------------------------------------------
         bodan_datas = item['bodan_data']
-        p_code, p_id = get_pcode(corner_ball, 'bodan')
+        # p_code, p_id = get_pcode(corner_ball, 'bodan')
         bodan_dict = {"b10": "1-0", "b20": "2-0", "b21": "2-1", "b30": "3-0", "b31": "3-1", "b32": "3-2",
                       "b40": "4-0", "b41": "4-1", "b42": "4-2", "b43": "4-3", "b01": "0-1", "b02": "0-2",
                       "b12": "1-2", "b03": "0-3", "b13": "1-3", "b23": "2-3", "b04": "0-4", "b14": "1-4",
@@ -467,7 +464,6 @@ class Roll_Zuqiupipeline(object):
                 sole_str = p_code + key + '0' + str(match_id) + "hg3535"
                 odds_only = Helper.genearte_MD5(hash_str, pt)
                 sole = Helper.genearte_MD5(sole_str, pt)
-                odds_onlys.append(odds_only)
                 first_last_balls_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                         "condition",
                                         "odds_only", "sole", "source", "type", "team"]
@@ -489,7 +485,6 @@ class Roll_Zuqiupipeline(object):
                 sole_str = p_code + key + '0' + str(match_id) + "hg3535"
                 odds_only = Helper.genearte_MD5(hash_str, pt)
                 sole = Helper.genearte_MD5(sole_str, pt)
-                odds_onlys.append(odds_only)
                 full_dict_rules_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                        "condition", "odds_only", "sole", "source", "type", "team"]
                 full_dict_rules_value = [match_id, league_id, key, "0", 0, p_code, value, full_dict_rules[key],
@@ -503,7 +498,6 @@ class Roll_Zuqiupipeline(object):
                 sole_str = p_code + key + '0' + str(match_id) + "hg3535"
                 odds_only = Helper.genearte_MD5(hash_str, pt)
                 sole = Helper.genearte_MD5(sole_str, pt)
-                odds_onlys.append(odds_only)
                 half_dicts_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                   "condition", "odds_only", "sole", "source", "type", "team"]
                 half_dicts_value = [match_id, league_id, key, "0", 0, p_code, value, half_dict_rules[key],
@@ -520,6 +514,7 @@ class Roll_Zuqiupipeline(object):
             if res:
                 if "成功" in res:
                     logger.info('足球滚球详细赔率提交成功, {}'.format(res))
+                    logger.info(odds_dict)
                 else:
                     logger.warning('足球滚球详细赔率提交失败, {}'.format(res))
                     logger.warning(odds_dict)

hg3535/pipeline/zuqiu.py

@@ -1,11 +1,11 @@
 import datetime
-import threading
+# import threading
 import time
 import logging
 
 import pymongo
 from twisted.internet import defer, reactor
-from .ball_func import fuhao
+# from .ball_func import fuhao
 from ..utils.helper import Helper
 from .ball_func import new_time
 

hg3535/settings.py

@@ -150,7 +150,8 @@ MATCH_URL = 'http://stadmin.bocai108.com:19093/setMatch'
 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"
+MATCH_STATUS = "http://stadmin.bocai108.com/upMatch"
+ODDSCH = "http://stadmin.bocai108.com/setOddsCH"
 #upMatch
 # POST_HOST = 'localhost'
 # POST_DATABASE = 'kaiyou'

hg3535/spiders/jieshu.py

@@ -0,0 +1,48 @@
+import datetime
+import json
+# import re
+import logging
+
+import redis
+import scrapy
+
+from ..items import Hgjieshu
+
+
+class HgjieshuSpider(scrapy.Spider):
+    name = 'jieshu'
+    to_day = datetime.datetime.now()
+    allowed_domains = ['hg3535z.com']
+    custom_settings = {
+        "ITEM_PIPELINES": {
+            'hg3535.pipeline.jieshu.Jieshuqiupipeline': 300,
+        },
+        # 'LOG_LEVEL': 'DEBUG',
+        # 'LOG_FILE': "../hg3535/log/saiguo{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day)
+    }
+    rls = redis.Redis(host='192.168.2.200', port=6379, db=1, password=123456)
+
+    def start_requests(self):
+        match_ids = self.rls.smembers("hg3535.gunqiu.ids")
+        if match_ids:
+            for match_id in match_ids:
+                match_id = match_id.decode()
+                url = 'https://odata.jiushan6688.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/true/ubt/am/isp/false'.format(match_id)
+                yield scrapy.Request(url=url, callback=self.parse, dont_filter=True)
+
+    def parse(self, response):
+        logger = logging.getLogger(__name__)
+        try:
+            data = json.loads(response.text)
+            status = data['i'][0]
+            if not status:
+                ball = data['i'][31]
+                match_id = data['i'][2]
+                # self.rls.srem('hg3535.zq.gunqiu', data)
+                item = Hgjieshu()
+                item['ball'] = ball
+                item['match_id'] = match_id
+                yield item
+        except Exception as e:
+            logger.warning(e)
+            return

hg3535/spiders/roll_lanqiu.py

@@ -2,6 +2,7 @@
 import datetime
 import json
 # import jsonpath
+import redis
 import scrapy
 from scrapy.http import Request
 
@@ -49,6 +50,8 @@ class LanqiuSpider(scrapy.Spider):
         # 'LOG_FILE': "../hg3535/log/roll_lanqiu_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day)
     }
 
+    rls = redis.Redis(host='192.168.2.200', port=6379, db=1, password=123456)
+
     def parse(self, response):
         responses = json.loads(response.text)
         try:
@@ -58,13 +61,18 @@ class LanqiuSpider(scrapy.Spider):
             return
         if datas:
             for data in datas:
-                egs = data['egs']
-                for es in egs:
-                    es = es['es']
-                    for e in es:
-                        match_id = str(e['i'][16])
-                        url = 'https://odata.jiushan6688.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/true/ubt/am/isp/false'.format(match_id)
-                        yield Request(url=url, callback=self.parse_other, dont_filter=True)
+                egs = data.get('egs')
+                if egs:
+                    for es in egs:
+                        es = es['es']
+                        for e in es:
+                            match_id = str(e['i'][16])
+                            self.rls.sadd('hg3535.gunqiu.ids', match_id)
+                            url = 'https://odata.jiushan6688.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/true/ubt/am/isp/false'.format(match_id)
+                            yield Request(url=url, callback=self.parse_other, dont_filter=True)
+                else:
+                    print('篮球滚球数据，为空，无比赛')
+                    return
 
     def parse_other(self, response):
         new_datas = json.loads(response.text).get('eg', "")
@@ -460,6 +468,32 @@ class LanqiuSpider(scrapy.Spider):
                     except:
                         capots_dict["ch_4"] = ""
                         capots_dict["cg_4"] = ""
+                    score_dict = {}
+                    try:
+                        # 当前节
+                        score_dict['schedule'] = result['sb']['cp']
+                        # 时间
+                        score_dict['r_time'] = result['sb']['ct']
+                        # 	"sc_1th_H": "15", //第一节 主队得分
+                        # 	"sc_1th_C": "16", //第一节 客队得分
+                        score_dict['sc_1th_H'] = result['sb']['ps'][2]['h']
+                        score_dict['sc_1th_C'] = result['sb']['ps'][2]['a']
+                        score_dict['sc_2th_H'] = result['sb']['ps'][3]['h']
+                        score_dict['sc_2th_C'] = result['sb']['ps'][3]['a']
+                        score_dict['sc_3th_H'] = result['sb']['ps'][4]['h']
+                        score_dict['sc_3th_C'] = result['sb']['ps'][4]['a']
+                        score_dict['sc_4th_H'] = result['sb']['ps'][5]['h']
+                        score_dict['sc_4th_C'] = result['sb']['ps'][5]['a']
+                        score_dict['overtime_H'] = result['sb']['ps'][7]['h']
+                        score_dict['overtime_C'] = result['sb']['ps'][7]['a']
+                        score_dict['half_H'] = result['sb']['ps'][0]['h']
+                        score_dict['half_C'] = result['sb']['ps'][0]['a']
+                        score_dict['full_H'] = result['sb']['ps'][6]['h']
+                        score_dict['full_C'] = result['sb']['ps'][6]['a']
+                        score_dict['whole_H'] = result['sb']['ps'][1]['h']
+                        score_dict['whole_C'] = result['sb']['ps'][1]['a']
+                    except:
+                        pass
 
                 # ---------------------------------------------------华丽分割线列表es[1]--------------------------------------------------
                 # 球队得分大/小 全场主队 home
@@ -645,32 +679,7 @@ class LanqiuSpider(scrapy.Spider):
                             team_scores_dict_rule["tbgs_4"] = ""
                             team_scores_dict["tbgs_4"] = ""
                 # 篮球详细比分
-                score_dict = {}
-                try:
-                    # 当前节
-                    score_dict['schedule'] = result['sb']['cp']
-                    # 时间
-                    score_dict['r_time'] = result['sb']['ct']
-                    # 	"sc_1th_H": "15", //第一节 主队得分
-                    # 	"sc_1th_C": "16", //第一节 客队得分
-                    score_dict['sc_1th_H'] = result['sb']['ps'][2]['h']
-                    score_dict['sc_1th_C'] = result['sb']['ps'][2]['a']
-                    score_dict['sc_2th_H'] = result['sb']['ps'][3]['h']
-                    score_dict['sc_2th_C'] = result['sb']['ps'][3]['a']
-                    score_dict['sc_3th_H'] = result['sb']['ps'][4]['h']
-                    score_dict['sc_3th_C'] = result['sb']['ps'][4]['a']
-                    score_dict['sc_4th_H'] = result['sb']['ps'][5]['h']
-                    score_dict['sc_4th_C'] = result['sb']['ps'][5]['a']
-                    score_dict['overtime_H'] = result['sb']['ps'][7]['h']
-                    score_dict['overtime_C'] = result['sb']['ps'][7]['a']
-                    score_dict['half_H'] = result['sb']['ps'][0]['h']
-                    score_dict['half_C'] = result['sb']['ps'][0]['a']
-                    score_dict['full_H'] = result['sb']['ps'][6]['h']
-                    score_dict['full_C'] = result['sb']['ps'][6]['a']
-                    score_dict['whole_H'] = result['sb']['ps'][1]['h']
-                    score_dict['whole_C'] = result['sb']['ps'][1]['a']
-                except:
-                    pass
+
 
                 # 联赛id
                 item['league_id'] = league_id

hg3535/spiders/roll_wangqiu.py

@@ -3,6 +3,7 @@ import datetime
 import json
 
 import jsonpath
+import redis
 import scrapy
 from scrapy.http import Request
 
@@ -40,7 +41,6 @@ class WangqiuSpider(scrapy.Spider):
     name = "roll_wangqiu"
     to_day = datetime.datetime.now()
     allowed_domains = ['hg3535z.com']
-    # start_urls = ['https://hg3535z.com/odds2/d/getodds?sid=3&pt=4&ubt=am&pn=0&sb=2&dc=null&pid=0']  # 滚球菜单 网球滚球列url
     start_urls = [
         'https://odata.jiushan6688.com/odds6i/d/getodds/zh-cn/sid/3/pt/4/ubt/am/pn/0/sb/2/dc/null/pid/0']  # 滚球菜单 网球滚球列url
     custom_settings = {
@@ -52,16 +52,12 @@ class WangqiuSpider(scrapy.Spider):
         # 'LOG_FILE': "../hg3535/log/roll_wangqiu_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day)
     }
 
-    # start_urls = ['http://hg3535z.com/odds2/d/getodds?sid=2&pt=3&ubt=am&pn=0&sb=2&dc=null&pid=0']
-    # http: // hg3535z.com / odds2 / d / getamodds?eid = 3098030 & iip = false & ubt = am & isp = false
-    # http://hg3535z.com/odds2/d/getodds?sid=2&pt=2&ubt=am&pn=0&sb=2&dc=null&pid=0
+    rls = redis.Redis(host='192.168.2.200', port=6379, db=1, password=123456)
 
     def parse(self, response):
         datas = json.loads(response.text)
-        # item = Today_all()
         ids = jsonpath.jsonpath(datas, '$..i-ot[0]..egs..es..i[16]')  # ids新列表
         rules = jsonpath.jsonpath(datas, '$..i-ot[0]..egs..es..i[19]')
-        # print(ids)
         if ids:
             # ids = set(ids)
             for index, id in enumerate(ids):
@@ -71,6 +67,7 @@ class WangqiuSpider(scrapy.Spider):
                 # 玩法规则
                 rle = rules[index]
                 # print(urls)
+                self.rls.sadd('hg3535.gunqiu.ids', id)
                 yield Request(url=urls, callback=self.parse_other, meta={'rule': rle}, dont_filter=True)
 
     def parse_other(self, response):
@@ -103,16 +100,7 @@ class WangqiuSpider(scrapy.Spider):
                     time_game = result['sb']['ct']
                 except:
                     time_game = '01:00'
-                # time_game = '00:00:00'
-                # time_game = result.get('sb',"").get('ct',"")
-                # 队1分数
-                # score_home1 = result['i'][10]
-                # 队2分数
-                # score_guest1 = result['i'][11]
-                # 第几节
-                # jijie = result['i'][12]
-                # 球队得分
-                qiudui = result['pci'].get('ctn', "")
+                # qiudui = result['pci'].get('ctn', "")
                 # ----------------------------------------让盘分割线---------------------------------------------------------------------------
                 concedes_dict = {}
                 concedes_dict_rule = {}
@@ -307,60 +295,10 @@ class WangqiuSpider(scrapy.Spider):
                     score_dict['game_num_C'] = cps[5]['a']
                     score_dict["showdelay"] = ''
                     score_dict['best'] = rule
-
-                    # a = {
-                    #     "schedule": "第三节",
-                    #     "sc_1th_H": "7",
-                    #     "sc_1th_C": "5",
-                    #     "sc_2th_H": "4",
-                    #     "sc_2th_C": "6",
-                    #     "sc_3th_H": "6",
-                    #     "sc_3th_C": "6",
-                    #     "sc_4th_H": "",
-                    #     "sc_4th_C": "",
-                    #     "sc_5th_H": "",
-                    #     "sc_5th_C": "",
-                    #     "disc_H": "1",
-                    #     "disc_C": "1",
-                    #     "spot_H": "4",
-                    #     "spot_C": "1",
-                    #     "game_num_H": "17",
-                    #     "game_num_C": "17",
-                    #     "best": "Best of 3",
-                    #     "showdelay": "N"
-                    # }
-
-                    # for cp in cps:
-                    #     # 当前比分
-                    #     if cp['p'] == 'p':
-                    #         score_dict['current_point_home_guest'] = str(cp['h']) + ':' + str(cp['a'])
-                    #     # 每局比分
-                    #     if cp['p'] == 's1':
-                    #         score_dict['one_score'] = str(cp['h']) + '-' + str(cp['a'])
-                    #     elif cp['p'] == 's2':
-                    #         score_dict['second_score'] = str(cp['h']) + '-' + str(cp['a'])
-                    #     elif cp['p'] == 's3':
-                    #         score_dict['third_score'] = str(cp['h']) + '-' + str(cp['a'])
-                    #     elif cp['p'] == 's4':
-                    #         score_dict['four_score'] = str(cp['h']) + '-' + str(cp['a'])
-                    #     elif cp['p'] == 's5':
-                    #         score_dict['five_score'] = str(cp['h']) + '-' + str(cp['a'])
-                    #     elif cp['p'] == 'ftg':
-                    #         score_dict['total_inning'] = int(cp['h']) + int(cp['a'])
-                    #     cp.pop('e')
-                    #     cp.pop('adv')
-                    #     cp['cp'] = s
-                    #     saiqing.append(cp)
-                    # sq_dict['ps'] = saiqing
-                    # print(sq_dict)
                 except:
-                    pass
-                    # sq_dict['ps'] = None
-                    # # 队伍1
-                    # h = 0
-                    # # 队伍2
-                    # a = 0
-                    # s = 0
+                    h = ""
+                    a = ""
+                    s = ""
                 # 联赛id
                 item['league_id'] = league_id
                 # 联赛名
@@ -388,7 +326,7 @@ class WangqiuSpider(scrapy.Spider):
                 # 每局比分
                 item['score_dict'] = score_dict
                 # 球队得分
-                item['qiudui'] = qiudui
+                # item['qiudui'] = qiudui
                 # 让盘
                 item['concedes_dict'] = concedes_dict
                 item['concedes_dict_rule'] = concedes_dict_rule

hg3535/spiders/roll_zuqiu.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-import copy
+# import copy
 import datetime
 import json
 
 # import jsonpath
+import redis
 import scrapy
 from scrapy.http import Request
 
@@ -22,6 +23,7 @@ class ZuqiuSpider(scrapy.Spider):
         # 'LOG_FILE': "../hg3535/log/roll_zuqiu_{}_{}_{}.log".format(to_day.year, to_day.month,to_day.day)
     }
     start_urls = ['https://odata.jiushan6688.com/odds6i/d/getodds/zh-cn/sid/1/pt/4/ubt/am/pn/0/sb/2/dc/null/pid/0']
+    rls = redis.Redis(host='192.168.2.200', port=6379, db=1, password=123456)
 
     def parse(self, response):
         responses = json.loads(response.text)
@@ -38,8 +40,10 @@ class ZuqiuSpider(scrapy.Spider):
                         es = es['es']
                         for e in es:
                             match_id = str(e['i'][16])
+                            self.rls.sadd('hg3535.gunqiu.ids', match_id)
                             url = 'https://odata.jiushan6688.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/true/ubt/am/isp/false'.format(match_id)
                             yield Request(url=url, callback=self.parse_each, dont_filter=True)
+                    self.rls.close()
                 else:
                     print('足球滚球数据为空')
         else:
@@ -361,18 +365,6 @@ class ZuqiuSpider(scrapy.Spider):
                 if new_data == 13:
                     try:
                         guest_data = data['o']['ou']['v']
-                        #
-                        # guest_size_big_rule = guest_data[1]
-                        # full_dict_rule['guest_tema_ball_big'] = guest_size_big_rule
-                        #
-                        # guest_size_big = guest_data[5]
-                        # full_dict['guest_tema_ball_big'] = guest_size_big
-                        #
-                        # guest_size_small_rule = guest_data[3]
-                        # full_dict_rule['guest_tema_ball_small'] = guest_size_small_rule
-                        #
-                        # guest_size_small = guest_data[7]
-                        # full_dict['guest_tema_ball_small'] = guest_size_small
                         full_dict_rule['tbgb'] = guest_data[1]
                         full_dict_rule['tbgs'] = guest_data[3]
                         full_dict['tbgb'] = guest_data[5]
@@ -384,18 +376,6 @@ class ZuqiuSpider(scrapy.Spider):
                         full_dict['tbgs'] = ''
                     try:
                         half_guest_data = data['o']['ou1st']['v']
-
-                        # half_guest_size_big_rule = half_guest_data[1]
-                        # half_dict_rule['half_guest_tema_ball_big'] = half_guest_size_big_rule
-                        #
-                        # half_guest_size_big = half_guest_data[5]
-                        # half_dict['half_guest_tema_ball_big'] = half_guest_size_big
-                        #
-                        # half_guest_size_small_rule = half_guest_data[3]
-                        # half_dict_rule['half_guest_tema_ball_small'] = half_guest_size_small_rule
-                        #
-                        # half_guest_size_small = half_guest_data[7]
-                        # half_dict['half_guest_tema_ball_small'] = half_guest_size_small
                         half_dict_rule['tbgb_h'] = half_guest_data[1]
                         half_dict_rule['tbgs_h'] = half_guest_data[3]
                         half_dict['tbgb_h'] = half_guest_data[5]