updata

hg3535/.idea/workspace.xml

@@ -2,21 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7fa42e97-ddea-4404-91db-5a9ccc162649" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/hg3535.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/hg3535.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipeline/lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/lanqiu.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipeline/roll_lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_lanqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pipeline/roll_wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_wangqiu.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipeline/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/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" />
-      <change beforePath="$PROJECT_DIR$/utils/helper.py" beforeDir="false" afterPath="$PROJECT_DIR$/utils/helper.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/zuqiu.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -26,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="1567145027030" 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="1567150218305" 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$" />
@@ -57,8 +52,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="140">
-              <caret line="7" column="33" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="36" />
+            <state relative-caret-position="180">
+              <caret line="9" column="39" lean-forward="true" selection-start-line="9" selection-start-column="39" selection-end-line="9" selection-end-column="39" />
               <folding>
                 <element signature="e#0#10#0" expanded="true" />
               </folding>
@@ -69,8 +64,8 @@
       <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="681">
-              <caret line="238" column="21" selection-start-line="238" selection-start-column="21" selection-end-line="238" selection-end-column="21" />
+            <state relative-caret-position="2820">
+              <caret line="141" column="8" selection-start-line="140" selection-start-column="23" selection-end-line="140" selection-end-column="26" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
               </folding>
@@ -79,30 +74,96 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/settings.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="149" column="9" selection-start-line="149" selection-end-line="149" selection-end-column="12" />
+            <state relative-caret-position="5529">
+              <caret line="281" column="8" selection-start-line="280" selection-start-column="27" selection-end-line="280" selection-end-column="30" />
+              <folding>
+                <element signature="e#0#15#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="529">
+              <caret line="112" column="64" lean-forward="true" selection-start-line="112" selection-start-column="64" selection-end-line="112" selection-end-column="64" />
+              <folding>
+                <element signature="e#0#15#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1200">
+              <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
+              <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_wangqiu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="109">
+              <caret line="337" column="22" lean-forward="true" selection-start-line="337" selection-start-column="22" selection-end-line="337" selection-end-column="22" />
+              <folding>
+                <element signature="e#24#39#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="140">
-              <caret line="7" column="33" lean-forward="true" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
+            <state relative-caret-position="599">
+              <caret line="66" column="13" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" />
+              <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$/utils/helper.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="11" column="113" selection-start-line="11" selection-start-column="113" selection-end-line="11" selection-end-column="113" />
+            <state relative-caret-position="9409">
+              <caret line="535" column="7" selection-start-line="535" selection-start-column="7" selection-end-line="535" selection-end-column="7" />
               <folding>
-                <element signature="e#0#14#0" expanded="true" />
+                <element signature="e#18#33#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1109">
+              <caret line="442" column="18" lean-forward="true" selection-start-line="442" selection-start-column="18" selection-end-line="442" selection-end-column="18" />
+              <folding>
+                <element signature="e#24#35#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="669">
+              <caret line="511" column="26" lean-forward="true" selection-start-line="511" selection-start-column="26" selection-end-line="511" selection-end-column="26" />
+              <folding>
+                <element signature="e#24#35#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -119,11 +180,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>half_concede_home</find>
-      <find>conn</find>
-      <find>result</find>
-      <find>score_home</find>
-      <find>half_size_home</find>
       <find>last_number</find>
       <find>total_goals</find>
       <find>2or7</find>
@@ -149,10 +205,17 @@
       <find>last_numbers_dict</find>
       <find>capots_dict</find>
       <find>self.session</find>
+      <find>settings.</find>
+      <find>sq_dict</find>
+      <find>网球</find>
+      <find>datetime.datetime.now()</find>
+      <find>response_data</find>
     </findStrings>
     <replaceStrings>
       <replace>&quot;&quot;</replace>
       <replace>session</replace>
+      <replace>棒球</replace>
+      <replace>res</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -200,7 +263,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/log/ball_status.log" />
         <option value="$PROJECT_DIR$/log/bangqiu.log" />
         <option value="$PROJECT_DIR$/log/guanjun.log" />
         <option value="$PROJECT_DIR$/log/lanqiu.log" />
@@ -236,21 +298,22 @@
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/pipeline/ball_func.py" />
         <option value="$PROJECT_DIR$/pipeline/guanjun.py" />
-        <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_bangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/guanjun.py" />
         <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_wangqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
+        <option value="$PROJECT_DIR$/utils/helper.py" />
+        <option value="$PROJECT_DIR$/settings.py" />
+        <option value="$PROJECT_DIR$/main.py" />
+        <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/wangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_zuqiu.py" />
-        <option value="$PROJECT_DIR$/main.py" />
-        <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
-        <option value="$PROJECT_DIR$/settings.py" />
-        <option value="$PROJECT_DIR$/utils/helper.py" />
         <option value="$PROJECT_DIR$/pipeline/zuqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_bangqiu.py" />
       </list>
     </option>
   </component>
@@ -278,6 +341,11 @@
               <item name="hg3535" type="462c0819:PsiDirectoryNode" />
               <item name="pipeline" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="hg3535" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hg3535" type="462c0819:PsiDirectoryNode" />
+              <item name="spiders" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -552,7 +620,7 @@
       <workItem from="1566976369645" duration="4000" />
       <workItem from="1566976385269" duration="13184000" />
       <workItem from="1566990066292" duration="35762000" />
-      <workItem from="1567126891838" duration="15410000" />
+      <workItem from="1567126891838" duration="26691000" />
     </task>
     <task id="LOCAL-00001" summary="修改后,版本二">
       <created>1555727493584</created>
@@ -764,11 +832,18 @@
       <option name="project" value="LOCAL" />
       <updated>1566886504744</updated>
     </task>
-    <option name="localTasksCounter" value="31" />
+    <task id="LOCAL-00031" summary="updata">
+      <created>1567146357338</created>
+      <option name="number" value="00031" />
+      <option name="presentableId" value="LOCAL-00031" />
+      <option name="project" value="LOCAL" />
+      <updated>1567146357338</updated>
+    </task>
+    <option name="localTasksCounter" value="32" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1694084000" />
+    <option name="totallyTimeSpent" value="1705365000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -781,13 +856,14 @@
   </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.15831557" />
       <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" visible="true" weight="0.34656653" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" visible="true" weight="0.07832618" />
       <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" />
@@ -797,7 +873,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" weight="0.34978542" />
+      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.14592275" />
       <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" />
@@ -917,24 +993,19 @@
           <option name="timeStamp" value="29" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
-          <line>254</line>
-          <option name="timeStamp" value="37" />
+          <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/lanqiu.py</url>
-          <line>253</line>
-          <option name="timeStamp" value="38" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
-          <line>236</line>
-          <option name="timeStamp" value="40" />
+          <url>file://$PROJECT_DIR$/pipeline/zuqiu.py</url>
+          <line>235</line>
+          <option name="timeStamp" value="46" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
-          <line>237</line>
-          <option name="timeStamp" value="41" />
+          <url>file://$PROJECT_DIR$/pipeline/roll_zuqiu.py</url>
+          <line>433</line>
+          <option name="timeStamp" value="49" />
         </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
@@ -963,13 +1034,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/scrapy/core/scraper.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="159">
-          <caret line="185" selection-start-line="185" selection-end-line="185" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/scrapy/utils/defer.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="151">
@@ -1102,16 +1166,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/ball_func.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="342">
-          <caret line="30" column="9" lean-forward="true" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-3024">
@@ -1147,16 +1201,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="1206">
-          <caret line="76" column="39" selection-start-line="76" selection-start-column="39" selection-end-line="76" selection-end-column="39" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python37/Lib/asyncio/base_events.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
@@ -1181,15 +1225,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-54">
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/middlewares.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="667">
@@ -1221,118 +1256,161 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
+    <entry file="file://C:/venv/Lib/site-packages/twisted/internet/task.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <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="195">
+          <caret line="630" selection-start-line="630" selection-end-line="630" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
+    <entry file="file://C:/venv/Lib/site-packages/pymongo/mongo_client.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="548">
-          <caret line="66" selection-start-line="66" selection-end-line="66" />
+        <state relative-caret-position="-16140">
+          <caret line="95" column="8" selection-start-line="95" selection-start-column="8" selection-end-line="95" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="8310">
+          <caret line="513" column="35" selection-start-line="513" selection-start-column="24" selection-end-line="513" selection-end-column="35" />
           <folding>
             <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/venv/Lib/site-packages/twisted/internet/task.py">
+    <entry file="file://$PROJECT_DIR$/utils/helper.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="630" selection-start-line="630" selection-end-line="630" />
+        <state relative-caret-position="235">
+          <caret line="27" selection-start-line="27" selection-end-line="27" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/venv/Lib/site-packages/pymongo/mongo_client.py">
+    <entry file="file://C:/venv/Lib/site-packages/twisted/internet/defer.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-16140">
-          <caret line="95" column="8" selection-start-line="95" selection-start-column="8" selection-end-line="95" selection-end-column="8" />
+        <state relative-caret-position="-730">
+          <caret line="1611" selection-start-line="1611" selection-end-line="1611" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="396">
+          <caret line="148" column="40" selection-start-line="148" selection-start-column="40" selection-end-line="148" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipeline/ball_func.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="298">
-          <caret line="32" column="17" lean-forward="true" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
+        <state relative-caret-position="-23">
+          <caret line="24" selection-start-line="24" selection-end-line="24" />
           <folding>
-            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1297">
-          <caret line="317" column="38" selection-start-line="317" selection-start-column="38" selection-end-line="317" selection-end-column="38" />
+        <state relative-caret-position="180">
+          <caret line="9" column="39" lean-forward="true" selection-start-line="9" selection-start-column="39" selection-end-line="9" 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$/pipeline/roll_zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="739">
-          <caret line="43" column="37" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
+        <state relative-caret-position="-1200">
+          <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
           <folding>
-            <element signature="e#18#33#0" expanded="true" />
+            <element signature="e#0#15#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="8310">
-          <caret line="513" column="35" selection-start-line="513" selection-start-column="24" selection-end-line="513" selection-end-column="35" />
+        <state relative-caret-position="1109">
+          <caret line="442" column="18" lean-forward="true" selection-start-line="442" selection-start-column="18" selection-end-line="442" selection-end-column="18" />
           <folding>
             <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="681">
-          <caret line="238" column="21" selection-start-line="238" selection-start-column="21" selection-end-line="238" selection-end-column="21" />
+        <state relative-caret-position="669">
+          <caret line="511" column="26" lean-forward="true" selection-start-line="511" selection-start-column="26" selection-end-line="511" selection-end-column="26" />
+          <folding>
+            <element signature="e#24#35#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="9409">
+          <caret line="535" column="7" selection-start-line="535" selection-start-column="7" selection-end-line="535" selection-end-column="7" />
+          <folding>
+            <element signature="e#18#33#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="599">
+          <caret line="66" column="13" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" />
           <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$/pipeline/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="11" column="113" selection-start-line="11" selection-start-column="113" selection-end-line="11" selection-end-column="113" />
+        <state relative-caret-position="2820">
+          <caret line="141" column="8" selection-start-line="140" selection-start-column="23" selection-end-line="140" selection-end-column="26" />
           <folding>
-            <element signature="e#0#14#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="7" column="33" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="36" />
+        <state relative-caret-position="5529">
+          <caret line="281" column="8" selection-start-line="280" selection-start-column="27" selection-end-line="280" selection-end-column="30" />
           <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$/settings.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="149" column="9" selection-start-line="149" selection-end-line="149" selection-end-column="12" />
+        <state relative-caret-position="109">
+          <caret line="337" column="22" lean-forward="true" selection-start-line="337" selection-start-column="22" selection-end-line="337" selection-end-column="22" />
+          <folding>
+            <element signature="e#24#39#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="7" column="33" lean-forward="true" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
+        <state relative-caret-position="529">
+          <caret line="112" column="64" lean-forward="true" selection-start-line="112" selection-start-column="64" selection-end-line="112" selection-end-column="64" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

hg3535/main.py

@@ -5,8 +5,8 @@ from scrapy.cmdline import execute
 # print(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 # execute(["scrapy", "crawl", "liansai"])
-# execute(["scrapy", "crawl", "zuqiu"])
-execute(["scrapy", "crawl", "lanqiu"])
+execute(["scrapy", "crawl", "zuqiu"])
+# execute(["scrapy", "crawl", "lanqiu"])
 # execute(["scrapy", "crawl", "guanjun"])
 # execute(["scrapy", "crawl", "wangqiu"])
 # execute(["scrapy", "crawl", "wqbodan"])

hg3535/pipeline/lanqiu.py

@@ -19,13 +19,15 @@ class Lanqiupipeline(object):
 
     @defer.inlineCallbacks
     def process_item(self, item, spider):
-        # out = defer.Deferred()
-        # reactor.callInThread(self._do_calculation, item, out)
-        # yield out
-        # defer.returnValue(item)
-        self._do_calculation(item, 'out')
+        out = defer.Deferred()
+        reactor.callInThread(self._do_calculation, item, out)
+        yield out
+        defer.returnValue(item)
+        # self._do_calculation(item)
+        # return
 
     def _do_calculation(self, item, out):
+    # def _do_calculation(self, item):
         logger = logging.getLogger(__name__)
         # 联赛id
         league_id = item['league_id']
@@ -41,7 +43,7 @@ class Lanqiupipeline(object):
         # 数量(97>)
         tag_number = item['number']
         # 比赛状态
-        zhuangtai = item['zhuangtai']
+        # zhuangtai = item['zhuangtai']
         # 日期
         try:
             data_game = item['data_game'].split("/")
@@ -59,18 +61,18 @@ class Lanqiupipeline(object):
         time_game = str(item['time_game'])
         # 比赛时间，时间戳
         us_time = "2019" + "-" + month + "-" + day + " " + time_game + ":00"
-        r_ctime = "2019" + "-" + month + "-" + day
+        # r_ctime = "2019" + "-" + month + "-" + day
         # 现在时间，时间戳
         utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
-        expire_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time() + 60))
-        # 队1分数
-        score_home = item['score_home']
-        # 队2分数
-        score_guest = item['score_guest']
-        # 第几节
-        jijie = item['jijie']
-        # 球队得分
-        qiudui = item['qiudui']
+        # expire_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time() + 60))
+        # # 队1分数
+        # score_home = item['score_home']
+        # # 队2分数
+        # score_guest = item['score_guest']
+        # # 第几节
+        # jijie = item['jijie']
+        # # 球队得分
+        # qiudui = item['qiudui']
         pt = item['pt']
         # 让球
         concedes_dict = item['concede']
@@ -136,7 +138,7 @@ class Lanqiupipeline(object):
             match_list.append(match_data)
             match_dict['data'] = match_list
             response_data = Helper.async_post(settings.MATCH_URL, match_dict)
-            if "成功" in response_data:
+            if "成功" in res:
                 self.db.lq_competition35.insert(match_data)
 
         """赔率"""
@@ -238,38 +240,29 @@ class Lanqiupipeline(object):
         last_home = last_numbers_dict['last_home']
         if last_home:
             for key, value in last_home.items():
-            # for index, last_home_value in enumerate(value):
                 sole_str = 'LN' + last_home_dict[key] + str(match_id) + 'hg3535'
-                sole = Helper.genearte_MD5(sole_str)
-                odds_str = 'LN' + last_home_dict[key] + str(match_id) + 'hg3535' + '0' + str(last_home_value)
-                odds_only = Helper.genearte_MD5(odds_str)
+                sole = Helper.genearte_MD5(sole_str, pt)
+                odds_str = 'LN' + last_home_dict[key] + str(match_id) + 'hg3535' + '0' + str(value)
+                odds_only = Helper.genearte_MD5(odds_str, pt)
                 last_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                     "condition", "odds_only", "sole", "source", "type", "team"]
-                last_home_value = [match_id, league_id, last_home_dict[key], '0', index, 'LN', last_home_value, '',odds_only, sole, 'hg3535', '0', '']
+                last_home_value = [match_id, league_id, last_home_dict[key], '0', 0, 'LN', value, key, odds_only, sole, 'hg3535', '0', '']
                 last_home_data = dict(zip(last_home_key, last_home_value))
-                odds_onlys.append(odds_only)
-                if odds_only not in odds_only_list:
-                    data_list.append(last_home_data)
+                data_list.append(last_home_data)
 
         last_guest = last_numbers_dict['last_guest']
         last_guest_dict = {'0或5': 'lng0', '1或6': 'lng1', '2或7': 'lng2', '3或8': 'lng3', '4或9': 'lng4'}
         if last_guest:
-            pass
-            # for key, value in last_numbers_dict.items():
-            #     for index, last_guest_value in enumerate(value):
-            #         sole_str = 'LN' + last_guest_dict[key] + str(match_id) + 'hg3535'
-            #         sole = Helper.genearte_MD5(sole_str)
-            #         odds_str = 'LN' + last_guest_dict[key] + str(match_id) + 'hg3535' + '0' + str(
-            #             last_guest_value)
-            #         odds_only = Helper.genearte_MD5(odds_str)
-            #         last_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-            #                             "condition", "odds_only", "sole", "source", "type", "team"]
-            #         last_guest_value = [match_id, league_id, key, '0', index, 'LN', last_guest_value, '',
-            #                               odds_only, sole, 'hg3535', '0', '']
-            #         last_guest_data = dict(zip(last_guest_key, last_guest_value))
-            #         odds_onlys.append(odds_only)
-            #         if odds_only not in odds_only_list:
-            #             data_list.append(last_guest_data)
+            for key, value in last_guest.items():
+                sole_str = 'LN' + last_guest_dict[key] + str(match_id) + 'hg3535'
+                sole = Helper.genearte_MD5(sole_str, pt)
+                odds_str = 'LN' + last_guest_dict[key] + str(match_id) + 'hg3535' + '0' + str(value)
+                odds_only = Helper.genearte_MD5(odds_str, pt)
+                last_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
+                                    "condition", "odds_only", "sole", "source", "type", "team"]
+                last_guest_value = [match_id, league_id, key, '0', 0, 'LN', value, key, odds_only, sole, 'hg3535', '0', '']
+                last_guest_data = dict(zip(last_guest_key, last_guest_value))
+                data_list.append(last_guest_data)
 
         # 独赢
         if capots_dict:
@@ -294,13 +287,13 @@ class Lanqiupipeline(object):
                       ris_stringscene, utime, pt]
         odds_dict = dict(zip(odds_key, odds_value))
         if data_list:
-            response_data = Helper.async_post(settings.ODDS_URL, odds_dict)
-            if '成功' in response_data:
-                logger.info('篮球详细赔率提交成功, {}'.format(response_data))
+            res = Helper.async_post(settings.ODDS_URL, odds_dict)
+            if '成功' in res:
+                logger.info('篮球详细赔率提交成功, {}'.format(res))
                 logger.info(odds_dict)
             else:
-                logger.warning('篮球详细赔率提交成功, {}'.format(response_data))
+                logger.warning('篮球详细赔率提交成功, {}'.format(res))
                 logger.warning(odds_dict)
         else:
             logger.info('详细赔率')
-        # reactor.callFromThread(out.callback, item)
+        reactor.callFromThread(out.callback, item)

hg3535/pipeline/roll_lanqiu.py

@@ -1,3 +1,5 @@
+import datetime
+
 import pymongo
 import time
 import logging
@@ -6,22 +8,22 @@ from twisted.internet import defer, reactor
 
 from .ball_func import fuhao
 from ..utils.helper import Helper
-
-
-# from .ball_func import get_pcode, new_time
+from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, LEAGUE_URL, ODDS_URL, MATCH_URL, MATCH_RESULT
 
 
 class Roll_Lanqiupipeline(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):
         out = defer.Deferred()
         reactor.callInThread(self._do_calculation, item, out)
         yield out
         defer.returnValue(item)
+        # self._do_calculation(item)
+        # return
 
     def _do_calculation(self, item, out):
         url = 'http://admin.5gogo.com'
@@ -65,6 +67,7 @@ class Roll_Lanqiupipeline(object):
         expire_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time() + 60))  # 过期时间
         # 现在时间，时间戳
         utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+        match_date = datetime.datetime.now().strftime("%Y-%m-%d")
         # 队1分数
         score_home = item['score_home']
         # 队2分数
@@ -86,75 +89,48 @@ class Roll_Lanqiupipeline(object):
         team_scores_dict = item['team_score']
         team_scores_dict_rule = item['team_score_rule']
 
-        last_time = "2019-12-31 23:59:59"
-        league_dict = {"game_code": "lq", "title": "league", "source": "hg3535"}
-        league_list = []
-        uuid = Helper.genearte_MD5(league_name + 'hg3535')
+        last_time = "{}-12-31 23:59:59".format(datetime.datetime.now().year)
 
-        league_key = ["name_chinese", "kind", "match_mode", "if_stop", "last_time", "lg_id", "source", "uuid"]
-        league_value = [league_name, "1", "1", "0", last_time, league_id, "hg3535", uuid]
-        league_data = dict(zip(league_key, league_value))
-        league_list.append(league_data)
-        league_dict['data'] = league_list
-        if self.db.hg3535_lq_league.find({'lg_id': league_id}).count() < 1:
-            response_data = Helper.async_post(url + '/setLeague', league_dict)
-            print(response_data)
-            self.db.hg3535_lq_league.insert(league_list)
-        competition = self.db.hg3535_lq_competition.find_one({"match_id": match_id})
-        match_list = []
-        if competition:
-            print('篮球赛事已存在，修改篮球赛事四状态')
-            is_morningplate = competition['is_morningplate']
-            is_rollball = competition['is_rollball']
-            is_stringscene = competition['is_stringscene']
-            is_today = competition['is_today']
-            status = competition['status']
-            match_date = competition['match_date']
-            match_time = competition['match_time']
-            us_time = competition['us_time']
-            if is_rollball != 1 or status != 1:
-                match_dict = {"game_code": "lq", "title": "match", "source": "hg3535"}
-                match_kay = ["home_team", "guest_team", "lg_id", "status", "match_id", "match_date", "match_time",
-                             "tag", "source", "is_rollball", "is_morningplate", "is_stringscene", "us_time", "uuid",
-                             "half_match_id", "is_today"]
-                match_value = [team_home, team_guest, league_id, 1, match_id, match_date, match_time, number,
-                               "hg3535", 1, is_morningplate, is_stringscene, us_time, uuid, 0, is_today]
-                match_data = dict(zip(match_kay, match_value))
-                match_list.append(match_data)
-                match_dict['data'] = match_list
-                response_data = Helper.async_post(url + '/setMatch', match_dict)
-                self.db.hg3535_lq_competition.insert(match_list)
-                print(response_data)
-                self.db.hg3535_lq_competition.update({'match_id': str(match_id)},
-                                                     {"$set": {"is_rollball": 1, "status": 1}},
-                                                     upsert=True)
+        uuid = Helper.genearte_uuid(league_name + 'hg3535')
+        if self.db.lq_league35.find({'lg_id': league_id}).count() < 1:
+            league_dict = {"game_code": "lq", "title": "league", "source": "hg3535"}
+            league_list = []
+            league_key = ["name_chinese", "kind", "match_mode", "if_stop", "last_time", "lg_id", "source", "uuid"]
+            league_value = [league_name, "1", "1", "0", last_time, league_id, "hg3535", uuid]
+            league_data = dict(zip(league_key, league_value))
+            league_list.append(league_data)
+            league_dict['data'] = league_list
+            res = Helper.async_post(LEAGUE_URL, league_dict)
+            if '成功' in res:
+                logger.info('篮球滚球联赛提交成功, {}'.format(res))
+                self.db.hg3535_lq_league.insert(league_list)
             else:
-                print("篮球赛事已存在，篮球赛事状态时间未改变，不做修改")
+                logger.warning('篮球滚球联赛提交失败, {}'.format(res))
         else:
-            is_rollball = 1
-            is_today = 0
-            is_morningplate = 0
-            is_stringscene = 0
-            # 赛事接口写入
+            logger.info('篮球滚球联赛已存在')
+
+        if self.db.lq_competition35.find({"match_id": match_id, 'is_rollball': 1}).count() < 1:
+            match_list = []
             match_dict = {"game_code": "lq", "title": "match", "source": "hg3535"}
-            match_kay = ["home_team", "guest_team", "lg_id", "status", "match_id", "match_date", "match_time", "tag",
-                         "source", "is_rollball", "is_morningplate", "is_stringscene", "us_time", "uuid",
+            match_kay = ["home_team", "guest_team", "lg_id", "status", "match_id", "match_date", "match_time",
+                         "tag", "source", "is_rollball", "is_morningplate", "is_stringscene", "us_time", "uuid",
                          "half_match_id", "is_today"]
-            match_value = [team_home, team_guest, league_id, 1, match_id, r_ctime, "00:00", number, "hg3535",
-                           is_rollball, is_morningplate, is_stringscene, utime, uuid, 0, is_today]
+            match_value = [team_home, team_guest, league_id, 1, match_id, match_date, "00:00", number,
+                           "hg3535", 1, 0, 0, utime, uuid, 0, 0]
             match_data = dict(zip(match_kay, match_value))
             match_list.append(match_data)
             match_dict['data'] = match_list
-            response_data = Helper.async_post(url + '/setMatch', match_dict)
-            self.db.hg3535_lq_competition.insert(match_list)
-            print(response_data)
+            res = Helper.async_post(MATCH_URL, match_dict)
+            if '成功' in res:
+                logger.info('篮球滚球赛事提交成功, {}'.format(res))
+                self.db.hg3535_lq_competition.insert(match_list)
+            else:
+                logger.warning('篮球滚球赛事提交失败, {}'.format(res))
+                logger.warning(match_dict)
+        else:
+            logger.info('篮球滚球赛事已存在')
+
         # 赔率
-        try:
-            result = self.db.hg3535_lq_odds.find_one({'match_id': match_id, 'pt': pt})
-            uuid_list = result['odds_only']
-        except:
-            uuid_list = []
-            result = ''
         data_list = []
         odds_onlys = []
         if concedes_dict:
@@ -166,15 +142,13 @@ class Roll_Lanqiupipeline(object):
                         sole_str = "CO" + str(key) + 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)
                         concede_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                        "condition", "odds_only", "sole", "source", "type", "team"]
                         condition = fuhao(concedes_dict_rule[key][index])
                         concede_value = [match_id, league_id, key, "0", index, 'CO', concede_value, condition,
                                          odds_only, sole, "hg3535", "0", ""]
                         concede_data = dict(zip(concede_key, concede_value))
-                        if odds_only not in uuid_list:
-                            data_list.append(concede_data)
+                        data_list.append(concede_data)
         if total_sizes_dict:
             for key, value in total_sizes_dict.items():
                 if value:
@@ -185,15 +159,12 @@ class Roll_Lanqiupipeline(object):
                         sole_str = "total_size" + str(key) + 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)
                         total_sizes_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                            "condition", "odds_only", "sole", "source", "type", "team"]
                         total_sizes_value = [match_id, league_id, key, "0", index, 'total_size', total_sizes_value,
-                                             condition,
-                                             odds_only, sole, "hg3535", "0", ""]
+                                             condition, odds_only, sole, "hg3535", "0", ""]
                         total_sizes_data = dict(zip(total_sizes_key, total_sizes_value))
-                        if odds_only not in uuid_list:
-                            data_list.append(total_sizes_data)
+                        data_list.append(total_sizes_data)
         if odd_evens_dict:
             for key, value in odd_evens_dict.items():
                 if value:
@@ -203,21 +174,18 @@ class Roll_Lanqiupipeline(object):
                     sole_str = "TS" + str(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)
                     odd_evens_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                      "condition", "odds_only", "sole", "source", "type", "team"]
                     odd_evens_value = [match_id, league_id, key, "0", 0, 'TS', value,
                                        condition, odds_only, sole, "hg3535", "0", ""]
                     odd_evens_data = dict(zip(odd_evens_key, odd_evens_value))
-                    if odds_only not in uuid_list:
-                        data_list.append(odd_evens_data)
+                    data_list.append(odd_evens_data)
 
         lastnumber_dict = {'0或5': '_zero_five', '1或6': '_one_six', '2或7': '_two_seven', '3或8': '_three_eight',
                            '4或9': '_four_nine'}
         last_home = last_numbers_dict['last_home']
         if last_home:
             for key, value in last_home.items():
-                # pass
                 odds_code = 'last_home' + lastnumber_dict[key]
                 condition = lastnumber_dict[key]
                 hash_str = "LN" + odds_code + '0' + str(condition) + str(
@@ -225,14 +193,12 @@ class Roll_Lanqiupipeline(object):
                 sole_str = "LN" + str(key) + '0' + str(match_id) + "hg3535"
                 odds_only = Helper.genearte_MD5(hash_str, pt)
                 sole = Helper.genearte_MD5(sole_str, pt)
-                odds_onlys.append(odds_only)
                 last_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                  "condition", "odds_only", "sole", "source", "type", "team"]
                 last_home_value = [match_id, league_id, odds_code, "0", 0, 'LN', value,
                                    condition, odds_only, sole, "hg3535", "0", ""]
                 last_home_data = dict(zip(last_home_key, last_home_value))
-                if odds_only not in uuid_list:
-                    data_list.append(last_home_data)
+                data_list.append(last_home_data)
 
         last_guest = last_numbers_dict['last_guest']
         if last_guest:
@@ -243,14 +209,12 @@ class Roll_Lanqiupipeline(object):
                 sole_str = "LN" + str(key) + '0' + str(match_id) + "hg3535"
                 odds_only = Helper.genearte_MD5(hash_str, pt)
                 sole = Helper.genearte_MD5(sole_str, pt)
-                odds_onlys.append(odds_only)
                 last_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                   "condition", "odds_only", "sole", "source", "type", "team"]
                 last_guest_value = [match_id, league_id, odds_code, "0", 0, 'LN', value,
                                     condition, odds_only, sole, "hg3535", "0", ""]
                 last_guest_data = dict(zip(last_guest_key, last_guest_value))
-                if odds_only not in uuid_list:
-                    data_list.append(last_guest_data)
+                data_list.append(last_guest_data)
 
         if capots_dict:
             for key, value in capots_dict.items():
@@ -259,14 +223,12 @@ class Roll_Lanqiupipeline(object):
                     sole_str = "C" + str(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)
                     capots_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                   "condition", "odds_only", "sole", "source", "type", "team"]
                     capots_value = [match_id, league_id, key, "0", 0, 'C', value,
                                     "", odds_only, sole, "hg3535", "0", ""]
                     capots_data = dict(zip(capots_key, capots_value))
-                    if odds_only not in uuid_list:
-                        data_list.append(capots_data)
+                    data_list.append(capots_data)
 
         if team_scores_dict:
             for key, team_scores_value in team_scores_dict.items():
@@ -277,15 +239,13 @@ class Roll_Lanqiupipeline(object):
                         sole_str = "TB" + str(key) + 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)
                         team_scores_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                            "condition", "odds_only", "sole", "source", "type", "team"]
                         condition = team_scores_dict_rule[key][index]
                         team_scores_value = [match_id, league_id, key, "0", index, 'TB', value, condition,
                                              odds_only, sole, "hg3535", "0", ""]
                         team_scores_data = dict(zip(team_scores_key, team_scores_value))
-                        if odds_only not in uuid_list:
-                            data_list.append(team_scores_data)
+                        data_list.append(team_scores_data)
 
         odds_key = ["game_code", "title", "match_id", "lg_id", "data", "source", "odds_only", "tag", "uuid",
                     "is_stringscene", "utime", "pt"]
@@ -293,16 +253,12 @@ class Roll_Lanqiupipeline(object):
                       0, utime, pt]
         odds_dict = dict(zip(odds_key, odds_value))
         if data_list:
-            # print(odds_dict)
-            response_data = Helper.async_post(url + '/setOdds', odds_dict)
-            # print(response_data)
-            print('篮球球赔率请求成功', response_data)
-            if "成功" in response_data:
-                if result:
-                    self.db.hg3535_lq_odds.update({'match_id': match_id, 'pt': pt}, {
-                        '$set': {"data": data_list, "odds_only": odds_onlys, "utime": utime}}, upsert=True)
-                else:
-                    self.db.hg3535_lq_odds.insert(odds_dict)
+            res = Helper.async_post(ODDS_URL, odds_dict)
+            if "成功" in res:
+                    logger.info('篮球滚球详细赔率提交成功, {}'.format(res))
+            else:
+                logger.warning('篮球滚球详细赔率提交失败, {}'.format(res))
+                logger.warning(odds_dict)
         data_list = []
         lq_rball = {"home_team": team_home, "guest_team": team_guest,
                     "lg_id": league_id, "home_rate": 0,
@@ -321,10 +277,12 @@ class Roll_Lanqiupipeline(object):
         }
         if data_list:
             try:
-                response_data = Helper.async_post(url + '/setMatchResult', r_data_dict)
-                # print(r_data_dict)
-                print("滚球篮球赛事结果post提交", response_data)
+                res = Helper.async_post(MATCH_RESULT, r_data_dict)
+                if "成功" in res:
+                    logger.info('篮球滚球赛事结果记录提交成功, {}'.format(res))
+                else:
+                    logger.warning('篮球滚球赛事结果记录提交失败, {}'.format(res))
+                    logger.warning(r_data_dict)
             except Exception as e:
-                logger.warning('滚球数据接口异常，提交失败')
-                logger.warning(e)
+                logger.warning('滚球数据接口异常，提交失败, {}'.format(e))
         reactor.callFromThread(out.callback, item)

hg3535/pipeline/roll_zuqiu.py

@@ -10,15 +10,15 @@ from twisted.internet import defer, reactor
 from .ball_func import fuhao
 from ..utils.helper import Helper
 from .ball_func import get_pcode
-import settings
+from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, LEAGUE_URL, ODDS_URL, MATCH_URL, MATCH_RESULT
 
 
 # 滚球足球 插入
 class Roll_Zuqiupipeline(object):
 
     def open_spider(self, spider):
-        self.mongo = pymongo.MongoClient(host=settings.M_HOST, username=settings.M_USER, password=settings.M_PASSWORD, port=settings.M_POST)
-        self.db = self.mongo[settings.M_DB]
+        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):
@@ -75,11 +75,11 @@ class Roll_Zuqiupipeline(object):
             league_data = dict(zip(league_key, league_value))
             league_list.append(league_data)
             league_dict['data'] = league_list
-            response_data = Helper.async_post(settings.LEAGUE_URL, league_dict)
-            if "成功" in response_data:
+            res = Helper.async_post(LEAGUE_URL, league_dict)
+            if "成功" in res:
                 self.db.hg3535_zq_league.insert(league_list)
             else:
-                logger.warning('足球滚球联赛提交失败, {}'.format(response_data))
+                logger.warning('足球滚球联赛提交失败, {}'.format(res))
                 logger.warning(league_dict)
         else:
             logger.info('足球滚球联赛已存在, 不存在')
@@ -94,8 +94,8 @@ class Roll_Zuqiupipeline(object):
             match_data = dict(zip(match_kay, match_value))
             match_list.append(match_data)
             match_dict['data'] = match_list
-            response_data = Helper.async_post(settings.MATCH_URL, match_dict)
-            if "成功" in response_data:
+            res = Helper.async_post(MATCH_URL, match_dict)
+            if "成功" in res:
                 self.db.zq_competition35.insert(match_data)
         else:
             logger.info('足球滚球赛事已存在, 不提交')
@@ -113,8 +113,8 @@ class Roll_Zuqiupipeline(object):
             hash_str = p_code + "gss_h" + str(index) + str(half_size_guest_rule[index]) + str(
                 value) + "hg3535" + str(match_id)
             sole_str = p_code + "gss_h" + str(index) + str(match_id) + "hg3535"
-            odds_only = Helper.genearte_MD5(hash_str)
-            sole = Helper.genearte_MD5(sole_str)
+            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"]
@@ -501,11 +501,11 @@ class Roll_Zuqiupipeline(object):
                       0, utime, pt]
         odds_dict = dict(zip(odds_key, odds_value))
         if data_list:
-            response_data = Helper.async_post(settings.ODDS_URL, odds_dict)
-            if "成功" in response_data:
-                logger.info('足球滚球详细赔率提交成功, {}'.format(response_data))
+            res = Helper.async_post(ODDS_URL, odds_dict)
+            if "成功" in res:
+                logger.info('足球滚球详细赔率提交成功, {}'.format(res))
             else:
-                logger.warning('足球滚球详细赔率提交失败, {}'.format(response_data))
+                logger.warning('足球滚球详细赔率提交失败, {}'.format(res))
                 logger.warning(odds_dict)
         else:
             logger.info('足球滚球详细赔率列表为空')
@@ -527,12 +527,12 @@ class Roll_Zuqiupipeline(object):
         }
         if data_list:
             try:
-                response_data = Helper.async_post(settings.MATCH_RESULT, r_data_dict)
-                if "成功" in response_data:
-                    logger.info('足球滚球结果记录提交成功, {}'.format(response_data))
+                res = Helper.async_post(MATCH_RESULT, r_data_dict)
+                if "成功" in res:
+                    logger.info('足球滚球结果记录提交成功, {}'.format(res))
                     logger.info(r_data_dict)
                 else:
-                    logger.warning('足球滚球结果记录提交失败, {}'.format(response_data))
+                    logger.warning('足球滚球结果记录提交失败, {}'.format(res))
                     logger.warning(r_data_dict)
             except Exception as e:
                 logger.warning('滚球数据接口异常，提交失败, {}'.format(e))

hg3535/pipeline/wangqiu.py

@@ -2,20 +2,30 @@ import datetime
 import pymongo
 import time
 import logging
+
+from twisted.internet import defer, reactor
+
 from .ball_func import fuhao
 from ..utils.helper import Helper
 from .ball_func import get_pcode, new_time, out_time
-from concurrent.futures import ThreadPoolExecutor
-from requests_futures.sessions import FuturesSession
+from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, LEAGUE_URL, ODDS_URL, MATCH_URL, MATCH_RESULT
 
 
 class Wangqiupipeline(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.session = FuturesSession(executor=ThreadPoolExecutor(max_workers=10))
+        # self.connection = AsyncIOMotorClient("mongodb://{}:{}@{}:{}/database?authSource={}".format('kaiyou', 'kaiyou', '192.168.2.200', 27017, 'kaiyou'))
+        # session = aiohttp.ClientSession()
+        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)
+
+    def _do_calculation(self, item, out):
         wq_odds = []
         logger = logging.getLogger(__name__)
         url = 'http://admin.5gogo.com'

hg3535/pipeline/zuqiu.py

@@ -44,7 +44,7 @@ class Zuqiupipeline(object):
         # 比赛时间
         time_game = str(item['time_game'])
         # 比赛时间，时间戳
-        us_time = str(datetime.datetime.now().year) + "-" + month + "-" + day + " " + time_game + ":00"
+        us_time = str(res.year) + "-" + month + "-" + day + " " + time_game + ":00"
         # 现在时间，时间戳
         utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
         # 比赛id
@@ -63,7 +63,7 @@ class Zuqiupipeline(object):
         corner_ball = item['corner_ball']
         match_date, match_time, time3 = new_time(us_time)
         # 联赛接口写入
-        last_time = '{}-12-31 23:59:59'.format(datetime.datetime.now().year)
+        last_time = '{}-12-31 23:59:59'.format(res.year)
         league_list = []
         uuid = Helper.genearte_uuid(league_name + 'hg3535')
         if self.db.zq_league35.find({'lg_id': league_id}).count() < 1:
@@ -129,7 +129,6 @@ class 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 = fuhao(half_size_guest_rule[index])
@@ -144,7 +143,6 @@ class Zuqiupipeline(object):
             sole_str = p_code + "gsb_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_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                   "odds_only", "sole", "source", "type", "team"]
             condition = fuhao(half_size_home_rule[index])
@@ -165,7 +163,6 @@ class Zuqiupipeline(object):
             sole_str = p_code + "gsb" + 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)
             size_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                              "odds_only", "sole", "source", "type", "team"]
             condition = fuhao(size_home_rule[index])
@@ -180,7 +177,6 @@ class Zuqiupipeline(object):
             sole_str = p_code + "gss" + 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)
             size_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                               "odds_only", "sole", "source", "type", "team"]
             condition = fuhao(size_guest_rule[index])
@@ -201,7 +197,6 @@ class 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 = fuhao(half_concede_guest_rule[index])
@@ -217,7 +212,6 @@ class Zuqiupipeline(object):
             sole_str = p_code + "coh_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_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                      "odds_only", "sole", "source", "type", "team"]
             condition = fuhao(half_concede_home_rule[index])
@@ -237,10 +231,9 @@ class Zuqiupipeline(object):
             sole_str = p_code + "cog" + 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)
             concede_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                  "odds_only", "sole", "source", "type", "team"]
-            condition = fuhao(concede_guest[index])
+            condition = fuhao(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))
@@ -252,7 +245,6 @@ class Zuqiupipeline(object):
             sole_str = p_code + "coh" + 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)
             concede_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                 "odds_only", "sole", "source", "type", "team"]
             condition = fuhao(concede_home_rule[index])
@@ -275,7 +267,6 @@ class 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',
@@ -288,7 +279,6 @@ class Zuqiupipeline(object):
         sole_str = p_code + "cg_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_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                 "odds_only", "sole", "source", "type", "team"]
         half_capot_guest_value = [match_id, league_id, "cg_h", "0", 0, p_code, half_capot_guest, '2',
@@ -301,7 +291,6 @@ class 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',
@@ -314,7 +303,6 @@ class Zuqiupipeline(object):
         sole_str = p_code + "cd" + '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)
         capot_dogfall_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                              "odds_only", "sole", "source", "type", "team"]
         capot_dogfall_value = [match_id, league_id, "cd", "0", 0, p_code, capot_dogfall, 'X', odds_only,
@@ -327,7 +315,6 @@ class Zuqiupipeline(object):
         sole_str = p_code + "ch" + '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)
         capot_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                           "odds_only", "sole", "source", "type", "team"]
         capot_home_value = [match_id, league_id, "ch", "0", 0, p_code, capot_home, '1',
@@ -340,7 +327,6 @@ class Zuqiupipeline(object):
         sole_str = p_code + "cg" + '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)
         capot_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                            "odds_only", "sole", "source", "type", "team"]
         capot_guest_value = [match_id, league_id, "cg", "0", 0, p_code, capot_home, '2',
@@ -361,7 +347,6 @@ class 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, '单',
@@ -374,7 +359,6 @@ class Zuqiupipeline(object):
         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)
-        odds_onlys.append(odds_only)
         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, "tsd", "0", 0, p_code, odd_even_even, '双',
@@ -387,7 +371,6 @@ class Zuqiupipeline(object):
         sole_str = p_code + "tsd_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_double_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                            "odds_only", "sole", "source", "type", "team"]
         half_double_value = [match_id, league_id, "tsd_h", "0", 0, p_code, half_odd_even_even, '双',
@@ -400,7 +383,6 @@ class Zuqiupipeline(object):
         sole_str = p_code + "tss_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_single_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                            "odds_only", "sole", "source", "type", "team"]
         half_single_value = [match_id, league_id, "tss_h", "0", 0, p_code, half_odd_even_odd, '单', odds_only,
@@ -420,7 +402,6 @@ class 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)
             total_goals_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                "odds_only", "sole", "source", "type", "team"]
             total_goals_value = [match_id, league_id, key, "0", 0, p_code, value, total_dict[key], odds_only,
@@ -439,7 +420,6 @@ class 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_fulls_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                    "odds_only", "sole", "source", "type", "team"]
                 half_fulls_value = [match_id, league_id, key, "0", 0, p_code, value, full_dict[key], odds_only,
@@ -464,7 +444,6 @@ class 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)
                 bodan_dict_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
                                   "odds_only", "sole", "source", "type", "team"]
                 bodan_dict_value = [match_id, league_id, key, "0", 0, p_code, value, bodan_dict[key], odds_only,
@@ -483,7 +462,6 @@ class 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"]
                 first_last_balls_value = [match_id, league_id, key, "0", 0, p_code, value, first_last_dict[key], odds_only,
@@ -505,7 +483,6 @@ class 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],
@@ -519,7 +496,6 @@ class 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],

hg3535/settings.py

@@ -143,11 +143,11 @@ M_USER = 'kaiyou'
 M_DB = 'kaiyou'
 M_PASSWORD = 'kaiyou'
 
-LEAGUE_URL = 'http://stadmin.bocai108.com/setLeague'
-MATCH_URL = 'http://stadmin.bocai108.com/setMatch'
-ODDS_URL = 'http://stadmin.bocai108.com/setOdds'
+LEAGUE_URL = 'http://stadmin.bocai108.com:19093/setLeague'
+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/setMatchResult"
+MATCH_RESULT = "http://stadmin.bocai108.com:19093/setMatchResult"
 # POST_HOST = 'localhost'
 # POST_DATABASE = 'kaiyou'
 # POST_USER = 'kaiyou'

hg3535/spiders/roll_zuqiu.py

@@ -32,13 +32,16 @@ class ZuqiuSpider(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_each, 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])
+                            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)
+                else:
+                    print('足球滚球数据为空')
         else:
             print("暂无滚球足球数据")
             return
@@ -299,7 +302,7 @@ class ZuqiuSpider(scrapy.Spider):
                         for a, b in enumerate(three_list):
                             bodan_data[b] = round(float(bodan_dogfall[a]) - 1, 2)
                         # 其他bodan_other
-                        bodan_data['bodanother'] = round(float(new_bodans[-1]) - 1, 2)
+                        bodan_data['bo'] = round(float(new_bodans[-1]) - 1, 2)
                     except:
                         pass
 
@@ -323,25 +326,12 @@ class ZuqiuSpider(scrapy.Spider):
                         for a, b in enumerate(new_three):
                             bodan_data[b] = round(float(half_bodan_dogfall[a]) - 1, 2)
                         # 其他
-                        bodan_data['halfbodanother'] = round(float(new_half_bodans[-1]) - 1, 2)
+                        bodan_data['bo_h'] = round(float(new_half_bodans[-1]) - 1, 2)
                     except:
                         pass
                 if new_data == 12:
                     try:
                         home_data = data['o']['ou']['v']
-
-                        # # 球队进球 大条件
-                        # home_size_big_rule = home_data[1]
-                        # full_dict_rule['home_tema_ball_big'] = home_size_big_rule
-                        # # 球队进球大赔率
-                        # home_size_big = home_data[5]
-                        # full_dict['home_tema_ball_big'] = home_size_big
-                        # # 球队进球小条件
-                        # home_size_small_rule = home_data[3]
-                        # full_dict_rule['home_tema_ball_small'] = home_size_small_rule
-                        # # 球队进球小赔率
-                        # home_size_small = home_data[7]
-                        # full_dict['home_tema_ball_small'] = home_size_small
                         # 球队进球 大条件
                         full_dict_rule['tbhb'] = home_data[1]
                         # 球队进球小条件
@@ -357,14 +347,6 @@ class ZuqiuSpider(scrapy.Spider):
                         full_dict_rule['tbhb'] = ""
                     try:
                         half_home_data = data['o']['ou1st']['v']
-                        # half_home_size_big_rule = half_home_data[1]
-                        # half_dict_rule['half_home_tema_ball_big'] = half_home_size_big_rule
-                        # half_home_size_big = half_home_data[5]
-                        # half_dict['half_home_tema_ball_big'] = half_home_size_big
-                        # half_home_size_small_rule = half_home_data[3]
-                        # half_dict_rule['half_home_tema_ball_small'] = half_home_size_small_rule
-                        # half_home_size_small = half_home_data[7]
-                        # half_dict['half_home_tema_ball_small'] = half_home_size_small
                         half_dict_rule['tbhb_h'] = half_home_data[1]
                         half_dict_rule['tbhs_h'] = half_home_data[3]
                         half_dict['tbhb_h'] = half_home_data[5]

hg3535/spiders/zuqiu.py

@@ -69,13 +69,13 @@ class ZuqiuSpider(scrapy.Spider):
                 league_id = json.loads(response.text)['eg']['c']['k']
                 # 联赛名
                 league_name = json.loads(response.text)['eg']['c']['n']
-                zuqiu = json.loads(response.text)['i'][31]
+                # zuqiu = json.loads(response.text)['i'][31]
             except:
                 datas = ""
                 league_id = ""
                 # 联赛名
                 league_name = ""
-                zuqiu = ""
+                # zuqiu = ""
             try:
                 pt = response.meta['pt']
             except:
@@ -508,5 +508,5 @@ class ZuqiuSpider(scrapy.Spider):
                 item['half_data'] = half_dict
                 item['full_data_rule'] = full_dict_rule
                 item['half_data_rule'] = half_dict_rule
-                item['zuqiu'] = zuqiu
+                # item['zuqiu'] = zuqiu
                 yield item