添加危险球类型

hg3535/.idea/workspace.xml

@@ -1,9 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7fa42e97-ddea-4404-91db-5a9ccc162649" name="Default Changelist" comment="">
+    <list default="true" id="7fa42e97-ddea-4404-91db-5a9ccc162649" name="Default Changelist" comment="添加危险球类型">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pipeline/bangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/bangqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pipeline/jieshu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/jieshu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pipeline/lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/lanqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pipeline/roll_bangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_bangqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pipeline/roll_lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_lanqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pipeline/roll_wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_wangqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pipeline/roll_zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/roll_zuqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/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/bangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/bangqiu.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/jieshu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/jieshu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/lanqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/liansai.py" beforeDir="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" />
+      <change beforePath="$PROJECT_DIR$/spiders/saiguo.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/saiguo.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/wangqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/wqbodan.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/zhibo.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/zhibo.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" />
@@ -14,7 +37,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="1572071530941" 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="1572676605765" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/hg3535$change.coverage" NAME="change Coverage Results" MODIFIED="1567749757856" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/hg3535$hgjieshu.coverage" NAME="hgjieshu Coverage Results" MODIFIED="1558494720094" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
     <SUITE FILE_PATH="coverage/hg3535$halffull.coverage" NAME="halffull Coverage Results" MODIFIED="1554544334424" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
@@ -44,19 +67,34 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pipeline/zhibo.py">
+        <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="30" column="27" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="27" />
+            <state relative-caret-position="570">
+              <caret line="44" column="58" selection-start-line="44" selection-start-column="58" selection-end-line="44" selection-end-column="58" />
+              <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$/pipeline/jieshu.py">
+        <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="584">
-              <caret line="72" column="46" selection-start-line="72" selection-start-column="46" selection-end-line="72" selection-end-column="46" />
+            <state relative-caret-position="460">
+              <caret line="29" column="134" selection-start-line="29" selection-start-column="134" selection-end-line="29" selection-end-column="134" />
+              <folding>
+                <element signature="e#38#53#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="268">
+              <caret line="25" column="29" lean-forward="true" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
               </folding>
@@ -64,11 +102,35 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="260">
+              <caret line="75" column="53" selection-start-line="75" selection-start-column="53" selection-end-line="75" selection-end-column="53" />
+              <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/roll_bangqiu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="408">
+              <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
+              <folding>
+                <element signature="e#46#61#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="48" column="36" lean-forward="true" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="41" />
+            <state relative-caret-position="450">
+              <caret line="556" column="45" selection-start-line="556" selection-start-column="45" selection-end-line="556" selection-end-column="45" />
               <folding>
                 <element signature="e#24#35#0" expanded="true" />
               </folding>
@@ -76,11 +138,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="97">
-              <caret line="105" column="103" selection-start-line="105" selection-start-column="98" selection-end-line="105" selection-end-column="108" />
+            <state relative-caret-position="320">
+              <caret line="101" column="91" selection-start-line="101" selection-start-column="91" selection-end-line="101" selection-end-column="91" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
               </folding>
@@ -89,12 +151,36 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/main.py">
+        <entry file="file://$PROJECT_DIR$/pipeline/guanjun.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="20">
+              <caret line="64" column="57" selection-start-line="64" selection-start-column="57" selection-end-line="64" selection-end-column="57" />
+              <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/bangqiu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="240">
+              <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
+              <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/jieshu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="9" column="41" lean-forward="true" selection-start-line="9" selection-start-column="41" selection-end-line="9" selection-end-column="41" />
+            <state relative-caret-position="1200">
+              <caret line="60" column="51" selection-start-line="60" selection-start-column="51" selection-end-line="60" selection-end-column="51" />
               <folding>
-                <element signature="e#0#10#0" expanded="true" />
+                <element signature="e#0#15#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -111,11 +197,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>Hgjieshu</find>
       <find>total_size</find>
       <find>p_code</find>
       <find>3438017</find>
-      <find>utime</find>
       <find>team_scores_dict</find>
       <find>total_sizes_dict</find>
       <find>last_home_dict</find>
@@ -141,6 +225,8 @@
       <find>ctime</find>
       <find>datetime</find>
       <find>篮球滚球详细赔率列表, 不提交</find>
+      <find>full_dict_rules_data</find>
+      <find>utime</find>
     </findStrings>
     <replaceStrings>
       <replace>&quot;&quot;</replace>
@@ -206,46 +292,46 @@
         <option value="$PROJECT_DIR$/spiders/zq_jieshu.py" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/change.py" />
-        <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/guanjun.py" />
         <option value="$PROJECT_DIR$/spiders/liansai.py" />
-        <option value="$PROJECT_DIR$/spiders/wangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/other_saiguo.py" />
-        <option value="$PROJECT_DIR$/spiders/saiguo.py" />
         <option value="$PROJECT_DIR$/middlewares.py" />
         <option value="$PROJECT_DIR$/pipeline/ball_func.py" />
         <option value="$PROJECT_DIR$/pipelines.py" />
         <option value="$PROJECT_DIR$/items.py" />
         <option value="$PROJECT_DIR$/utils/helper.py" />
         <option value="$PROJECT_DIR$/pipeline/saiguo.py" />
-        <option value="$PROJECT_DIR$/pipeline/wangqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_zuqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_wangqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_bangqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/guanjun.py" />
-        <option value="$PROJECT_DIR$/pipeline/bangqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/jieshu.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
-        <option value="$PROJECT_DIR$/settings.py" />
-        <option value="$PROJECT_DIR$/pipeline/jieshu.py" />
-        <option value="$PROJECT_DIR$/pipeline/zuqiu.py" />
-        <option value="$PROJECT_DIR$/utils/LocalToken.py" />
         <option value="$PROJECT_DIR$/proj/celerys.py" />
-        <option value="$PROJECT_DIR$/spiders/zhibo.py" />
         <option value="$PROJECT_DIR$/pipeline/zhibo.py" />
         <option value="$PROJECT_DIR$/proj/config.py" />
         <option value="$PROJECT_DIR$/proj/celeryconfig" />
         <option value="$PROJECT_DIR$/proj/tasks.py" />
         <option value="$PROJECT_DIR$/proj/celeryconfig.py" />
         <option value="$PROJECT_DIR$/proj/celery.py" />
-        <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
+        <option value="$PROJECT_DIR$/utils/LocalToken.py" />
+        <option value="$PROJECT_DIR$/settings.py" />
         <option value="$PROJECT_DIR$/main.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_zuqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_wangqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_bangqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/jieshu.py" />
+        <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/jieshu.py" />
+        <option value="$PROJECT_DIR$/spiders/guanjun.py" />
+        <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/saiguo.py" />
+        <option value="$PROJECT_DIR$/spiders/wangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/zhibo.py" />
+        <option value="$PROJECT_DIR$/pipeline/wangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/zuqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/bangqiu.py" />
       </list>
     </option>
   </component>
@@ -261,6 +347,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -278,11 +365,15 @@
               <item name="hg3535" type="462c0819:PsiDirectoryNode" />
               <item name="spiders" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="hg3535" type="b2602c69:ProjectViewProjectNode" />
+              <item name="hg3535" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -612,13 +703,14 @@
       <workItem from="1571967657305" duration="24271000" />
       <workItem from="1572054552404" duration="91000" />
       <workItem from="1572071466803" duration="820000" />
-    </task>
-    <task id="LOCAL-00069" summary="更新">
-      <created>1568110761947</created>
-      <option name="number" value="00069" />
-      <option name="presentableId" value="LOCAL-00069" />
-      <option name="project" value="LOCAL" />
-      <updated>1568110761947</updated>
+      <workItem from="1572074972320" duration="610000" />
+      <workItem from="1572075652124" duration="11000" />
+      <workItem from="1572405874406" duration="1841000" />
+      <workItem from="1572426136037" duration="1509000" />
+      <workItem from="1572431428343" duration="376000" />
+      <workItem from="1572434825450" duration="4167000" />
+      <workItem from="1572676469541" duration="2133000" />
+      <workItem from="1573009752102" duration="1908000" />
     </task>
     <task id="LOCAL-00070" summary="更新">
       <created>1568112864503</created>
@@ -956,11 +1048,18 @@
       <option name="project" value="LOCAL" />
       <updated>1572054605275</updated>
     </task>
-    <option name="localTasksCounter" value="118" />
+    <task id="LOCAL-00118" summary="添加危险球类型">
+      <created>1572074983723</created>
+      <option name="number" value="00118" />
+      <option name="presentableId" value="LOCAL-00118" />
+      <option name="project" value="LOCAL" />
+      <updated>1572074983723</updated>
+    </task>
+    <option name="localTasksCounter" value="119" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2153015000" />
+    <option name="totallyTimeSpent" value="2165570000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -975,12 +1074,12 @@
     <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.17004265" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.19722815" />
       <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.3264516" />
-      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49573562" weight="0.40128756" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49573562" weight="0.24678111" />
       <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" />
@@ -988,9 +1087,9 @@
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.1555794" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5042644" side_tool="true" weight="0.2725322" />
-      <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49307036" weight="0.27759916" />
-      <window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" weight="0.47424892" />
-      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.41845495" />
+      <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49307036" visible="true" weight="0.27682403" />
+      <window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" weight="0.3143777" />
+      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.34002677" />
       <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" />
@@ -1110,7 +1209,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_wangqiu.py</url>
-          <line>278</line>
+          <line>263</line>
           <option name="timeStamp" value="71" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1120,17 +1219,17 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/roll_bangqiu.py</url>
-          <line>265</line>
+          <line>262</line>
           <option name="timeStamp" value="167" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_bangqiu.py</url>
-          <line>122</line>
+          <line>106</line>
           <option name="timeStamp" value="265" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_bangqiu.py</url>
-          <line>125</line>
+          <line>109</line>
           <option name="timeStamp" value="266" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1140,12 +1239,12 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/roll_lanqiu.py</url>
-          <line>82</line>
+          <line>79</line>
           <option name="timeStamp" value="270" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/roll_lanqiu.py</url>
-          <line>88</line>
+          <line>85</line>
           <option name="timeStamp" value="271" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1155,7 +1254,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>117</line>
+          <line>103</line>
           <option name="timeStamp" value="279" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1165,42 +1264,32 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/jieshu.py</url>
-          <line>69</line>
+          <line>60</line>
           <option name="timeStamp" value="298" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/roll_zuqiu.py</url>
-          <line>48</line>
-          <option name="timeStamp" value="301" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/roll_zuqiu.py</url>
-          <line>49</line>
-          <option name="timeStamp" value="302" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/zuqiu.py</url>
-          <line>557</line>
+          <line>555</line>
           <option name="timeStamp" value="314" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/zuqiu.py</url>
-          <line>560</line>
+          <line>558</line>
           <option name="timeStamp" value="315" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
-          <line>90</line>
+          <line>88</line>
           <option name="timeStamp" value="317" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
-          <line>135</line>
+          <line>133</line>
           <option name="timeStamp" value="318" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
-          <line>269</line>
+          <line>267</line>
           <option name="timeStamp" value="319" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1210,44 +1299,79 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>256</line>
+          <line>242</line>
           <option name="timeStamp" value="322" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>70</line>
+          <line>56</line>
           <option name="timeStamp" value="323" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>71</line>
+          <line>57</line>
           <option name="timeStamp" value="324" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>72</line>
+          <line>58</line>
           <option name="timeStamp" value="325" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
-          <line>136</line>
+          <line>122</line>
           <option name="timeStamp" value="326" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/jieshu.py</url>
-          <line>72</line>
+          <line>62</line>
           <option name="timeStamp" value="327" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/zuqiu.py</url>
-          <line>111</line>
+          <line>110</line>
           <option name="timeStamp" value="328" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/zuqiu.py</url>
-          <line>113</line>
+          <line>112</line>
           <option name="timeStamp" value="329" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/jieshu.py</url>
+          <line>26</line>
+          <option name="timeStamp" value="330" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/jieshu.py</url>
+          <line>34</line>
+          <option name="timeStamp" value="331" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipeline/roll_zuqiu.py</url>
+          <line>91</line>
+          <option name="timeStamp" value="332" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipeline/roll_zuqiu.py</url>
+          <line>533</line>
+          <option name="timeStamp" value="333" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipeline/roll_zuqiu.py</url>
+          <line>564</line>
+          <option name="timeStamp" value="334" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipeline/roll_lanqiu.py</url>
+          <line>52</line>
+          <option name="timeStamp" value="335" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipeline/roll_zuqiu.py</url>
+          <line>86</line>
+          <option name="timeStamp" value="336" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -1275,7 +1399,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/spiders/other_saiguo.py" />
     <entry file="file://$PROJECT_DIR$/log/FTzhibo_2019_10_16.log" />
     <entry file="file://$PROJECT_DIR$/jianting.py">
       <provider selected="true" editor-type-id="text-editor" />
@@ -1290,16 +1413,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="9" selection-end-line="1" selection-end-column="23" />
-          <folding>
-            <element signature="e#48#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/guanjun.sh" />
     <entry file="file://$PROJECT_DIR$/pipelines.py">
       <provider selected="true" editor-type-id="text-editor">
@@ -1309,349 +1422,358 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/requirements.txt" />
-    <entry file="file://$PROJECT_DIR$/spiders/wqbodan.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/items.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1506">
-          <caret line="54" column="65" selection-start-line="54" selection-start-column="65" selection-end-line="54" selection-end-column="65" />
-          <folding>
-            <element signature="e#24#35#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="782">
+          <caret line="506" column="25" selection-start-line="506" selection-start-column="25" selection-end-line="506" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
+    <entry file="file://$PROJECT_DIR$/middlewares.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
+        <state relative-caret-position="127">
+          <caret line="134" selection-start-line="134" selection-end-line="134" />
           <folding>
-            <element signature="e#38#53#0" expanded="true" />
+            <element signature="e#168#181#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/liansai.py">
+    <entry file="file://$PROJECT_DIR$/utils/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/utils/langconv.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="460">
-          <caret line="31" selection-start-line="31" selection-end-line="31" />
+        <state relative-caret-position="3620">
+          <caret line="182" selection-start-line="182" selection-end-line="182" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/items.py">
+    <entry file="file://C:/venv/Lib/site-packages/redis/client.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="782">
-          <caret line="506" column="25" selection-start-line="506" selection-start-column="25" selection-end-line="506" selection-end-column="25" />
+        <state relative-caret-position="201">
+          <caret line="2704" column="48" selection-start-line="2704" selection-start-column="44" selection-end-line="2704" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/saiguo.py">
+    <entry file="file://$PROJECT_DIR$/not_roll.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="24" selection-start-line="24" selection-end-line="24" />
+        <state>
+          <caret selection-end-line="3" selection-end-column="65" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/roll.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-178">
-          <caret line="72" column="36" lean-forward="true" selection-start-line="72" selection-start-column="36" selection-end-line="72" selection-end-column="36" />
+        <state relative-caret-position="180">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
-            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/middlewares.py">
+    <entry file="file://$PROJECT_DIR$/change.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="127">
-          <caret line="134" selection-start-line="134" selection-end-line="134" />
+        <state relative-caret-position="-102">
+          <caret line="15" column="36" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="36" />
           <folding>
-            <element signature="e#168#181#0" expanded="true" />
+            <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/utils/langconv.py">
+    <entry file="file://$PROJECT_DIR$/proj/__init__.py" />
+    <entry file="file://$PROJECT_DIR$/proj/tasks.py" />
+    <entry file="file://$PROJECT_DIR$/proj/celeryconfig.py" />
+    <entry file="file://$PROJECT_DIR$/proj/celery.py" />
+    <entry file="file://$PROJECT_DIR$/utils/LocalToken.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3620">
-          <caret line="182" selection-start-line="182" selection-end-line="182" />
+        <state>
+          <caret column="93" selection-start-column="93" selection-end-column="93" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/saiguo.py">
+    <entry file="file://$PROJECT_DIR$/hgg070">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="980">
-          <caret line="49" column="21" selection-start-line="49" selection-start-column="21" selection-end-line="49" selection-end-column="21" />
+        <state relative-caret-position="230">
+          <caret line="33" column="19" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="87" />
           <folding>
-            <element signature="e#0#14#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/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2388">
-          <caret line="140" column="27" lean-forward="true" selection-start-line="140" selection-start-column="27" selection-end-line="140" selection-end-column="27" />
+        <state relative-caret-position="230">
+          <caret line="220" column="44" selection-start-line="220" selection-start-column="39" selection-end-line="220" selection-end-column="44" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="806">
-          <caret line="43" column="45" lean-forward="true" selection-start-line="43" selection-start-column="45" selection-end-line="43" selection-end-column="45" />
+        <state relative-caret-position="230">
+          <caret line="41" column="13" selection-start-line="41" selection-start-column="8" selection-end-line="41" selection-end-column="13" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/guanjun.py">
+    <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-438">
-          <caret line="64" column="57" selection-start-line="64" selection-start-column="57" selection-end-line="64" selection-end-column="57" />
+        <state relative-caret-position="280">
+          <caret line="14" column="42" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" />
           <folding>
-            <element signature="e#18#32#0" expanded="true" />
+            <element signature="e#0#10#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1879">
-          <caret line="111" column="62" selection-start-line="111" selection-start-column="62" selection-end-line="111" selection-end-column="62" />
+        <state relative-caret-position="-4316">
+          <caret line="43" column="13" selection-start-line="43" selection-start-column="8" selection-end-line="43" selection-end-column="13" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/ball_func.py">
+    <entry file="file://$PROJECT_DIR$/utils/helper.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="18" column="67" lean-forward="true" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="67" />
+        <state relative-caret-position="-216">
+          <caret line="12" selection-start-line="12" selection-end-line="12" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/settings.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="538">
-          <caret line="33" column="15" selection-start-line="33" selection-start-column="8" selection-end-line="33" selection-end-column="68" />
-          <folding>
-            <element signature="e#18#33#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="2564">
+          <caret line="137" column="48" selection-start-line="137" selection-start-column="48" selection-end-line="137" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/ball_func.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="960">
-          <caret line="48" column="32" lean-forward="true" selection-start-line="48" selection-start-column="32" selection-end-line="48" selection-end-column="32" />
+        <state relative-caret-position="204">
+          <caret line="18" column="67" lean-forward="true" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="67" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/zhibo.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="320">
-          <caret line="38" column="41" selection-start-line="38" selection-start-column="40" selection-end-line="38" selection-end-column="46" />
-          <folding>
-            <element signature="e#46#61#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="480">
+          <caret line="30" column="27" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/saiguo.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="69" selection-start-line="69" selection-end-line="70" selection-end-column="66" />
+        <state relative-caret-position="-236">
+          <caret line="80" column="83" selection-start-line="80" selection-start-column="73" selection-end-line="80" selection-end-column="83" />
           <folding>
-            <element signature="e#24#39#0" expanded="true" />
+            <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="461">
-          <caret line="55" column="31" lean-forward="true" selection-start-line="55" selection-start-column="31" selection-end-line="55" selection-end-column="31" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="80">
+          <caret line="4" column="43" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/wqbodan.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="241">
-          <caret line="45" column="81" lean-forward="true" selection-start-line="45" selection-start-column="81" selection-end-line="45" selection-end-column="81" />
-          <folding>
-            <element signature="e#38#53#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="-1260" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/liansai.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="24">
+          <caret line="31" selection-start-line="31" selection-end-line="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="537">
-          <caret line="107" column="55" selection-start-line="107" selection-start-column="55" selection-end-line="107" selection-end-column="55" />
+        <state relative-caret-position="388">
+          <caret line="68" column="49" selection-start-line="68" selection-start-column="49" selection-end-line="68" selection-end-column="49" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#24#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="255" column="21" lean-forward="true" selection-start-line="255" selection-start-column="21" selection-end-line="255" selection-end-column="21" />
+        <state relative-caret-position="-5116">
+          <caret line="66" column="70" lean-forward="true" selection-start-line="66" selection-start-column="70" selection-end-line="66" selection-end-column="70" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#24#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="88" selection-start-line="88" selection-end-line="88" />
+        <state relative-caret-position="368">
+          <caret line="42" column="82" selection-start-line="42" selection-start-column="82" selection-end-line="42" selection-end-column="82" />
           <folding>
-            <element signature="e#24#39#0" expanded="true" />
+            <element signature="e#38#53#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/settings.py">
+    <entry file="file://$PROJECT_DIR$/spiders/saiguo.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="137" column="50" lean-forward="true" selection-start-line="137" selection-start-column="50" selection-end-line="137" selection-end-column="50" />
+        <state relative-caret-position="-5030">
+          <caret line="55" column="93" selection-start-line="55" selection-start-column="93" selection-end-line="55" selection-end-column="93" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/venv/Lib/site-packages/redis/client.py">
+    <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="201">
-          <caret line="2704" column="48" selection-start-line="2704" selection-start-column="44" selection-end-line="2704" selection-end-column="48" />
+        <state relative-caret-position="-3630">
+          <caret line="47" column="53" selection-start-line="47" selection-start-column="53" selection-end-line="47" selection-end-column="53" />
+          <folding>
+            <element signature="e#48#59#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/helper.py">
+    <entry file="file://$PROJECT_DIR$/spiders/zhibo.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="59">
-          <caret line="12" selection-start-line="12" selection-end-line="12" />
+        <state relative-caret-position="144">
+          <caret line="113" selection-start-line="113" selection-end-line="113" selection-end-column="58" />
           <folding>
-            <element signature="e#0#14#0" expanded="true" />
+            <element signature="e#38#53#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/LocalToken.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="48" selection-start-column="48" selection-end-column="48" />
+        <state relative-caret-position="-4376">
+          <caret line="7" column="31" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/not_roll.py">
+    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-line="3" selection-end-column="65" />
+        <state relative-caret-position="570">
+          <caret line="44" column="58" selection-start-line="44" selection-start-column="58" selection-end-line="44" selection-end-column="58" />
           <folding>
-            <element signature="e#0#11#0" expanded="true" />
+            <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/roll.py">
+    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        <state relative-caret-position="460">
+          <caret line="29" column="134" selection-start-line="29" selection-start-column="134" selection-end-line="29" selection-end-column="134" />
           <folding>
-            <element signature="e#0#11#0" expanded="true" />
+            <element signature="e#38#53#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/change.py">
+    <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-102">
-          <caret line="15" column="36" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="36" />
+        <state relative-caret-position="268">
+          <caret line="25" column="29" lean-forward="true" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
           <folding>
-            <element signature="e#0#11#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/proj/__init__.py" />
-    <entry file="file://$PROJECT_DIR$/proj/tasks.py" />
-    <entry file="file://$PROJECT_DIR$/proj/celeryconfig.py" />
-    <entry file="file://$PROJECT_DIR$/proj/celery.py" />
-    <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="584">
-          <caret line="72" column="46" selection-start-line="72" selection-start-column="46" selection-end-line="72" selection-end-column="46" />
+        <state relative-caret-position="260">
+          <caret line="75" column="53" selection-start-line="75" selection-start-column="53" selection-end-line="75" selection-end-column="53" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="9" column="41" lean-forward="true" selection-start-line="9" selection-start-column="41" selection-end-line="9" selection-end-column="41" />
+        <state relative-caret-position="408">
+          <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
           <folding>
-            <element signature="e#0#10#0" expanded="true" />
+            <element signature="e#46#61#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="48" column="36" lean-forward="true" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="41" />
+        <state relative-caret-position="450">
+          <caret line="556" column="45" selection-start-line="556" selection-start-column="45" selection-end-line="556" selection-end-column="45" />
           <folding>
             <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/zhibo.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="511">
-          <caret line="95" column="28" selection-start-line="95" selection-start-column="24" selection-end-line="95" selection-end-column="37" />
+        <state relative-caret-position="320">
+          <caret line="101" column="91" selection-start-line="101" selection-start-column="91" selection-end-line="101" selection-end-column="91" />
           <folding>
-            <element signature="e#38#53#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/zhibo.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/guanjun.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="20">
+          <caret line="64" column="57" selection-start-line="64" selection-start-column="57" selection-end-line="64" selection-end-column="57" />
+          <folding>
+            <element signature="e#18#32#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipeline/bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
-          <caret line="30" column="27" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="27" />
+          <caret line="118" column="59" selection-start-line="118" selection-start-column="59" selection-end-line="118" selection-end-column="59" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="97">
-          <caret line="105" column="103" selection-start-line="105" selection-start-column="98" selection-end-line="105" selection-end-column="108" />
+        <state relative-caret-position="1200">
+          <caret line="60" column="51" selection-start-line="60" selection-start-column="51" selection-end-line="60" selection-end-column="51" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>

hg3535/main.py

@@ -4,14 +4,14 @@ 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", "zuqiu"])
+# execute(["scrapy", "crawl", "zuqiu"])
 # execute(["scrapy", "crawl", "lanqiu"])
 # 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", "saiguo"]) #滚球id结束时间更新状态

hg3535/pipeline/bangqiu.py

@@ -117,8 +117,6 @@ class Bangqiupipeline(object):
             if res:
                 if res.get('status') == 1:
                     self.db.bq_league35.insert(league_data)
-                    # self.db.bq_league35.update({'lg_id': league_id}, {'$set': league_data},
-                    #                                 upsert=True)
                     logger.info('棒球联赛提交成功, {}'.format(res))
                 else:
                     logger.warning('棒球联赛提交失败, {}'.format(res))

hg3535/pipeline/jieshu.py

@@ -43,17 +43,8 @@ class Jieshuqiupipeline(object):
             game_code = "bq"
         if status:
             ostatus = 1
-            # dates = date.split("/")
-            # month = dates[1].strip()
-            # day = str(dates[0].strip())
         else:
             ostatus = 2
-            # month_dict = {'Jan': '01', 'Feb': '02', 'Mar': '03', 'Apr': '04', 'May': '05', 'Jun': '06', 'Jul': '07',
-            #               'Aug': '08', 'Sep': '09', 'Oct': '10', 'Nov': '11', 'Dec': '12'}
-            # dates = date.split(" ")
-            # month = month_dict[dates[1].strip()]
-            # day = str(dates[0].strip())
-
         status_dict = {"game_code": game_code, "title": "match_status", "source": "hg3535"}
         update = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         data_list = []
@@ -68,7 +59,6 @@ class Jieshuqiupipeline(object):
         if res:
             if res.get('status') == 1:
                 self.db.match_status35.insert(data)
-                # self.db.match_status35.update({'match_id': match_id}, {'$set': data}, upsert=True)
                 if ostatus == 2:
                     self.rls.hdel('hg3535.GunQiu.ids', match_id)
                 logger.info('{},赛事结果状态交成功, {}'.format(game_code, res))

hg3535/pipeline/lanqiu.py

@@ -3,8 +3,6 @@ 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 new_time
 from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, LEAGUE_URL, ODDS_URL, MATCH_URL

hg3535/pipeline/roll_bangqiu.py

@@ -36,26 +36,10 @@ class Roll_Banqiupipeline(object):
         team_guest = item['team_guest']
         # 数量(97>)
         tag_number = item['number']
-        # 日期
-        # try:
-        #     data_game = item['data_game'].split("/")
-        #     month = str(data_game[1].strip())
-        #     day = str(data_game[0]).strip()
-        # except Exception as e:
-        #     logger.warning(e)
-        #     data_game = item['data_game'].split(" ")
-        #     months = str(data_game[1].strip())
-        #     month_dict = {'Jan': '01', 'Feb': '02', 'Mar': '03', 'Apr': '04', 'May': '05', 'Jun': '06', 'Jul': '07',
-        #                   'Aug': '08', 'Sep': '09', 'Oct': '10', 'Nov': '11', 'Dec': '12'}
-        #     month = month_dict[months]
-        #     day = str(data_game[0]).strip()
-        # us_date = "{}-{}-{}".format(datetime.datetime.now().year, month, day)
         # 比赛时间
         time_game = str(item['time_game'])
-        # 比赛时间，时间戳
-        # ctime = "2019" + "-" + month + "-" + day + "" + time_game + ":00".strip()
         # 现在时间，时间戳
-        utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+        utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time() - 43200))
         cdate = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         match_date = cdate.split(' ')[0]
         match_time = cdate.split(' ')[1]
@@ -201,7 +185,7 @@ class Roll_Banqiupipeline(object):
         odds_key = ["game_code", "title", "match_id", "lg_id", "data", "source", "odds_only", "tag", "uuid",
                     "is_stringscene", "utime", "pt", 'match_identity']
         odds_value = ["bq", "odds", match_id, league_id, data_list, "hg3535", odds_onlys, tag_number, uuid,
-                      0, utime, pt, match_identity]
+                      0, cdate, pt, match_identity]
         odds_dict = dict(zip(odds_key, odds_value))
         if data_list:
             res = Helper.async_post(ODDS_URL, odds_dict)

hg3535/pipeline/roll_lanqiu.py

@@ -39,23 +39,9 @@ class Roll_Lanqiupipeline(object):
         number = item['number']
         # 比赛状态
         result_mark = item['score_dict']
-        # try:
-        #     data_game = item['data_game'].split("/")
-        #     month = str(data_game[1].strip())
-        #     day = str(data_game[0]).strip()
-        # except Exception as e:
-        #     logger.warning(e)
-        #     data_game = item['data_game'].split(" ")
-        #     months = str(data_game[1].strip())
-        #     month_dict = {'Jan': '01', 'Feb': '02', 'Mar': '03', 'Apr': '04', 'May': '05', 'Jun': '06', 'Jul': '07',
-        #                   'Aug': '08', 'Sep': '09', 'Oct': '10', 'Nov': '11', 'Dec': '12'}
-        #     month = month_dict[months]
-        #     day = str(data_game[0]).strip()
-        # # 比赛时间
-        # us_date = "{}-{}-{}".format(datetime.datetime.now().year, month, day)
         time_game = str(item['time_game'])
         # 现在时间，时间戳
-        utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+        utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time() - 43200))
         cdate = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         match_date = cdate.split(' ')[0]
         match_time = cdate.split(' ')[1]
@@ -251,7 +237,7 @@ class Roll_Lanqiupipeline(object):
         odds_key = ["game_code", "title", "match_id", "lg_id", "data", "source", "odds_only", "tag", "uuid",
                     "is_stringscene", "utime", "pt", 'match_identity']
         odds_value = ["lq", "odds", match_id, league_id, data_list, "hg3535", odds_onlys, number, uuid,
-                      0, utime, pt, match_identity]
+                      0, cdate, pt, match_identity]
         odds_dict = dict(zip(odds_key, odds_value))
         if data_list:
             res = Helper.async_post(ODDS_URL, odds_dict)

hg3535/pipeline/roll_wangqiu.py

@@ -42,25 +42,10 @@ class Roll_Wangqiupipeline(object):
         # 日期
         # data_game = item['data_game']
         rule = item['rule']
-        # try:
-        #     data_game = item['data_game'].split("/")
-        #     month = str(data_game[1].strip())
-        #     day = str(data_game[0]).strip()
-        # except Exception as e:
-        #     logger.warning(e)
-        #     data_game = item['data_game'].split(" ")
-        #     months = str(data_game[1].strip())
-        #     month_dict = {'Jan': '01', 'Feb': '02', 'Mar': '03', 'Apr': '04', 'May': '05', 'Jun': '06', 'Jul': '07',
-        #                   'Aug': '08', 'Sep': '09', 'Oct': '10', 'Nov': '11', 'Dec': '12'}
-        #     month = month_dict[months]
-        #     day = str(data_game[0]).strip()
         # 比赛时间
         time_game = str(item['time_game'])
-        # 比赛时间，时间戳
-        # ctime = "2019" + "-" + month + "-" + day + "" + time_game + ":00"
-        # us_date = "{}-{}-{}".format(datetime.datetime.now().year, month, day)
         # 现在时间，时间戳
-        utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+        utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time() - 43200))
         cdate = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         match_date = cdate.split(' ')[0]
         match_time = cdate.split(' ')[1]
@@ -235,7 +220,7 @@ class Roll_Wangqiupipeline(object):
         odds_key = ["game_code", "title", "match_id", "lg_id", "data", "source", "odds_only", "tag", "uuid",
                     "is_stringscene", "utime", "pt", 'match_identity']
         odds_value = ["wq", "odds", match_id, league_id, data_list, "hg3535", odds_onlys, tag_number, uuid,
-                      0, utime, pt, match_identity]
+                      0, cdate, pt, match_identity]
         odds_dict = dict(zip(odds_key, odds_value))
         if data_list:
             res = Helper.async_post(ODDS_URL, odds_dict)

hg3535/pipeline/roll_zuqiu.py

@@ -31,21 +31,8 @@ class Roll_Zuqiupipeline(object):
         # 比赛时间
         time_game = str(item['time_game'])
         # 现在时间，时间戳
-        utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+        utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time() - 43200))
         cdate = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        # try:
-        #     data_game = item['data_game'].split("/")
-        #     month = str(data_game[1].strip())
-        #     day = str(data_game[0]).strip()
-        # except Exception as e:
-        #     logger.warning(e)
-        #     data_game = item['data_game'].split(" ")
-        #     months = str(data_game[1].strip())
-        #     month_dict = {'Jan': '01', 'Feb': '02', 'Mar': '03', 'Apr': '04', 'May': '05', 'Jun': '06', 'Jul': '07',
-        #                   'Aug': '08', 'Sep': '09', 'Oct': '10', 'Nov': '11', 'Dec': '12'}
-        #     month = month_dict[months]
-        #     day = str(data_game[0]).strip()
-        # us_date = '{}-{}-{}'.format(datetime.datetime.now().year, month, day)
         match_date = cdate.split(' ')[0]
         match_time = cdate.split(' ')[1]
         # 比赛id
@@ -541,7 +528,7 @@ class Roll_Zuqiupipeline(object):
         odds_key = ["game_code", "title", "match_id", "lg_id", "data", "source", "odds_only", "tag", "uuid",
                     "is_stringscene", "utime", "pt", 'match_identity']
         odds_value = ["zq", "odds", match_id, league_id, data_list, "hg3535", odds_onlys, number, uuid,
-                      0, utime, pt, match_identity]
+                      0, cdate, pt, match_identity]
         odds_dict = dict(zip(odds_key, odds_value))
         if data_list:
             res = Helper.async_post(ODDS_URL, odds_dict)
@@ -589,126 +576,6 @@ class Roll_Zuqiupipeline(object):
                     # logger.warning(r_data_dict)
             except Exception as e:
                 logger.warning('滚球数据接口异常，提交失败, {}'.format(e))
-        # #   角球分割处理--------------------------------------------------------------------------------------------------
-        # if horn_team:
-        #     team_home = horn_team['horn_home']
-        #     team_guest = horn_team['horn_guest']
-        #     horn_scoreh = horn_team['horn_scoreh']
-        #     horn_scoreg = horn_team['horn_scoreg']
-        #     all_goal = int(horn_scoreh) + int(horn_scoreg)
-        #     match_id = horn_team['horn_id']
-        #     # half_way = item['half_way']
-        #     match_score = "{}:{}".format(horn_scoreh, horn_scoreg)
-        #     match_identity = Helper.genearte_uuid(team_home + team_guest + us_date)
-        #     if self.db.zq_competition35.find({"match_identity": match_identity, 'is_rollball': 1}).count() < 1:
-        #         match_list = []
-        #         match_dict = {"game_code": "zq", "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", "is_horn", 'match_identity']
-        #         match_value = [team_home, team_guest, league_id, 1, match_id, match_date, match_time, number,
-        #                        "hg3535", 1, 0, 0, utime, uuid, 0, 0, 1, match_identity]
-        #         match_data = dict(zip(match_kay, match_value))
-        #         match_list.append(match_data)
-        #         match_dict['data'] = match_list
-        #         res = Helper.async_post(MATCH_URL, match_dict)
-        #         if res:
-        #             if res.get('status') == 1:
-        #                 self.db.zq_competition35.insert(match_data)
-        #                 logger.info('足球滚球角球, 赛事提交成功, {}'.format(res))
-        #                 # logger.info(match_data)
-        #             else:
-        #                 logger.warning('足球滚球赛事, 角球提交失败, {}'.format(res))
-        #                 # logger.warning(match_data)
-        #         else:
-        #             logger.warning('足球滚球赛事接口异常, 角球赛事提交失败, {}'.format(res))
-        #             # logger.warning(match_data)
-        #     else:
-        #         logger.info('足球滚球赛事已存在, 不提交')
-        #     data_list = []
-        #     odds_onlys = []
-        #     p_code = 'CB'
-        #     horn_ou_dict = item['horn_ou_dict']
-        #     horn_ou_dict_rule = item['horn_ou_dict_rule']
-        #     horn_oe_dict = item['horn_oe_dict']
-        #     horn_oe_dict_rule = item['horn_oe_dict_rule']
-        #     if horn_ou_dict:
-        #         for key, value in horn_ou_dict.items():
-        #             hash_str = p_code + key + '0' + horn_ou_dict_rule[key] + str(value) + "hg3535" + str(match_id)
-        #             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)
-        #             horn_ou_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-        #                            "condition", "odds_only", "sole", "source", "type", "team"]
-        #             horn_ou_value = [match_id, league_id, key, "0", 0, p_code, value, horn_ou_dict_rule[key],
-        #                              odds_only, sole, "hg3535", "0", ""]
-        #             horn_ou_data = dict(zip(horn_ou_key, horn_ou_value))
-        #             data_list.append(horn_ou_data)
-        #
-        #     if horn_oe_dict:
-        #         for key, value in horn_oe_dict.items():
-        #             hash_str = p_code + key + '0' + horn_oe_dict_rule[key] + str(value) + "hg3535" + str(match_id)
-        #             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)
-        #             horn_oe_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-        #                            "condition", "odds_only", "sole", "source", "type", "team"]
-        #             horn_oe_value = [match_id, league_id, key, "0", 0, p_code, value, horn_oe_dict_rule[key],
-        #                              odds_only, sole, "hg3535", "0", ""]
-        #             horn_oe_data = dict(zip(horn_oe_key, horn_oe_value))
-        #             data_list.append(horn_oe_data)
-        #
-        #     odds_key = ["game_code", "title", "match_id", "lg_id", "data", "source", "odds_only", "tag", "uuid",
-        #                 "is_stringscene", "utime", "pt", 'match_identity']
-        #     odds_value = ["zq", "odds", match_id, league_id, data_list, "hg3535", odds_onlys, number, uuid,
-        #                   0, utime, pt, match_identity]
-        #     odds_dict = dict(zip(odds_key, odds_value))
-        #     if data_list:
-        #         res = Helper.async_post(ODDS_URL, odds_dict)
-        #         if res:
-        #             if res.get('status') == 1:
-        #                 logger.info('足球滚球, 角球详细赔率提交成功, {}'.format(res))
-        #                 # logger.info(odds_dict)
-        #             else:
-        #                 logger.warning('足球滚球, 角球详细赔率提交失败, {}'.format(res))
-        #                 # logger.warning(odds_dict)
-        #         else:
-        #             logger.warning('足球滚球, 角球详细赔率接口异常，提交失败, {}'.format(res))
-        #             # logger.warning(odds_dict)
-        #     else:
-        #         logger.info('足球滚球, 角球详细赔率列表为空')
-        #     data_list = []
-        #     zq_rball = {"home_team": team_home, "guest_team": team_guest,
-        #                 "lg_id": league_id, "home_rate": 0,
-        #                 "guest_rate": 0, "home_score": horn_scoreh,
-        #                 "guest_score": horn_scoreg, "all_goal": all_goal, "status": 1,
-        #                 "first_score": "", "last_score": "", "match_score": match_score, "uuid": uuid,
-        #                 "match_winer": "", "match_time": time_game,
-        #                 "match_process": half_way, "tag": number,
-        #                 "match_id": match_id, "p_code": "", 'match_identity': match_identity}
-        #     data_list.append(zq_rball)
-        #     r_data_dict = {
-        #         "game_code": "zq",
-        #         "title": "match_result_r",
-        #         "source": "hg3535",
-        #         "data": data_list
-        #     }
-        #     if data_list:
-        #         try:
-        #             res = Helper.async_post(MATCH_RESULT, r_data_dict)
-        #             if res:
-        #                 if res.get('status') == 1:
-        #                     logger.info('足球滚球, 角球结果记录提交成功, {}'.format(res))
-        #                     self.db.zq_match_result35.insert(zq_rball)
-        #                     # logger.info(r_data_dict)
-        #                 else:
-        #                     logger.warning('足球滚球, 角球结果记录提交失败, {}'.format(res))
-        #                     # logger.warning(r_data_dict)
-        #             else:
-        #                 logger.warning('足球滚球, 角球结果记录接口异常，提交失败, {}'.format(res))
-        #                 # logger.warning(r_data_dict)
-        #         except Exception as e:
-        #             logger.warning('滚球数据接口异常, 角球结果提交失败, {}'.format(e))
         reactor.callFromThread(out.callback, item)
 
 

hg3535/pipeline/wangqiu.py

@@ -4,17 +4,13 @@ import time
 import logging
 
 from twisted.internet import defer, reactor
-
-# from .ball_func import fuhao
 from ..utils.helper import Helper
-from .ball_func import new_time, out_time
+from .ball_func import new_time
 from ..settings import M_HOST, M_USER, M_PASSWORD, M_POST, M_DB, LEAGUE_URL, ODDS_URL, MATCH_URL
 
 
 class Wangqiupipeline(object):
     def open_spider(self, spider):
-        # 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, authSource='kaiyou')
         self.db = self.mongo[M_DB]
 
@@ -42,10 +38,6 @@ class Wangqiupipeline(object):
         team_guest = item['team_guest']
         # 数量(97>)
         tag_number = item['number']
-        # 比赛状态
-        # zhuangtai = item['zhuangtai']
-        # 日期
-        # data_game = item['data_game']
         try:
             data_game = item['data_game'].split("/")
             month = str(data_game[1].strip())
@@ -63,18 +55,8 @@ class Wangqiupipeline(object):
         time_game = str(item['time_game'])
         # 比赛时间，时间戳
         ctime = str(year) + "-" + month + "-" + day + " " + time_game + ":00"
-        # r_ctime = str(year) + "-" + 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']
         pt = str(item['pt'])
         # 让盘
         concedes_dict = item['concedes_dict']
@@ -97,9 +79,7 @@ class Wangqiupipeline(object):
         uuid = Helper.genearte_uuid(league_name)
         """联赛"""
         last_time = '{}-12-31 23:59:59'.format(year)
-
         if self.db.wq_league35.find({'lg_id': league_id}).count() < 1:
-        # if self.db.wq_league35.find({'uuid': uuid}).count() < 1:
             league_dict = {"game_code": "wq", "title": "league", "source": "hg3535"}
             league_list = []
             league_key = ["name_chinese", "kind", "match_mode", "if_stop", "last_time", "lg_id", "source", "uuid"]
@@ -143,7 +123,6 @@ class Wangqiupipeline(object):
             is_stringscene = 0
         match_identity = Helper.genearte_uuid(team_home + team_guest + match_date)
         if self.db.wq_competition35.find({'match_id': match_id, pt_status: 1}).count() < 1:
-        # if self.db.wq_competition35.find({'match_identity': match_identity, pt_status: 1}).count() < 1:
             match_list = []
             match_dict = {"game_code": "wq", "title": "match", "source": "hg3535"}
             match_key = ["home_team", "guest_team", "lg_id", "status", "match_id", "match_date", "match_time",
@@ -158,8 +137,6 @@ class Wangqiupipeline(object):
             if res:
                 if res.get('status') == 1:
                     self.db.wq_competition35.insert(match_data)
-                    # self.db.wq_competition35.update({'match_id': match_id, pt_status: 1}, {'$set': match_data},
-                    #                                 upsert=True)
                     logger.info('网球赛事提交成功, {}'.format(res))
                 else:
                     logger.warning('网球赛事提交失败, {}'.format(res))

hg3535/pipeline/zuqiu.py

@@ -65,7 +65,6 @@ class Zuqiupipeline(object):
         # uuid = Helper.genearte_uuid(league_name + 'hg3535')
         uuid = Helper.genearte_uuid(league_name)
         if self.db.zq_league35.find({'lg_id': league_id}).count() < 1:
-        # if self.db.zq_league35.find({'uuid': uuid}).count() < 1:
             league_dict = {"game_code": "zq", "title": "league", "source": "hg3535"}
             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]
@@ -101,7 +100,6 @@ class Zuqiupipeline(object):
         match_list = []
         match_identity = Helper.genearte_uuid(team_home + team_guest + match_date)
         if self.db.zq_competition35.find({'match_id': match_id, pt_status: 1}).count() < 1:
-        # if self.db.zq_competition35.find({'match_identity': match_identity, pt_status: 1}).count() < 1:
             match_dict = {"game_code": "zq", "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",
@@ -567,92 +565,4 @@ class Zuqiupipeline(object):
                 logging.warning('足球详细赔率接口异常, {}'.format(res))
         else:
             logger.info('足球详细赔率列表为空')
-        # # 角球处理分割线---------------------------------------------------------------------------------------------------
-        # horn_team = item['horn_team']
-        # if horn_team:
-        #     team_home = horn_team['horn_home']
-        #     team_guest = horn_team['horn_guest']
-        #     match_id = horn_team['horn_id']
-        #     match_list = []
-        #     match_identity = Helper.genearte_uuid(team_home + team_guest + new_us_time)
-        #     # if self.db.zq_competition35.find({'match_id': match_id, pt_status: 1}).count() < 1:
-        #     if self.db.zq_competition35.find({'match_identity': match_identity, pt_status: 1}).count() < 1:
-        #         match_dict = {"game_code": "zq", "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", 'is_horn', 'match_identity']
-        #         match_value = [team_home, team_guest, league_id, 0, match_id, match_date, match_time, tag_number,
-        #                        "hg3535", is_rollball, is_morningplate, is_stringscene, us_time, uuid, 0, is_today, 1, match_identity]
-        #         match_data = dict(zip(match_kay, match_value))
-        #         match_list.append(match_data)
-        #         match_dict['data'] = match_list
-        #         res = Helper.async_post(MATCH_URL, match_dict)
-        #         if res:
-        #             if res.get('status') == 1:
-        #                 self.db.zq_competition35.insert(match_data)
-        #                 logger.info('足球角球, 赛事表提交失败, {}'.format(res))
-        #                 # logger.info(match_dict)
-        #             else:
-        #                 logger.warning('足球角球, 赛事表提交失败, {}'.format(res))
-        #                 # logger.warning(match_dict)
-        #         else:
-        #             logger.warning('足球角球, 赛事接口异常提交失败, {}'.format(res))
-        #             # logger.warning(match_dict)
-        #     else:
-        #         logger.info('足球角球, 赛事已存在，不提交')
-        #     data_list = []
-        #     odds_onlys = []
-        #     p_code = 'CB'
-        #     horn_ou_dict = item['horn_ou_dict']
-        #     horn_ou_dict_rule = item['horn_ou_dict_rule']
-        #     horn_oe_dict = item['horn_oe_dict']
-        #     horn_oe_dict_rule = item['horn_oe_dict_rule']
-        #     if horn_ou_dict:
-        #         for key, value in horn_ou_dict.items():
-        #             hash_str = p_code + key + '0' + horn_ou_dict_rule[key] + str(value) + "hg3535" + str(match_id)
-        #             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)
-        #             horn_ou_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-        #                            "condition", "odds_only", "sole", "source", "type", "team"]
-        #             horn_ou_value = [match_id, league_id, key, "0", 0, p_code, value, horn_ou_dict_rule[key],
-        #                              odds_only, sole, "hg3535", "0", ""]
-        #             horn_ou_data = dict(zip(horn_ou_key, horn_ou_value))
-        #             data_list.append(horn_ou_data)
-        #
-        #     if horn_oe_dict:
-        #         for key, value in horn_oe_dict.items():
-        #             hash_str = p_code + key + '0' + horn_oe_dict_rule[key] + str(value) + "hg3535" + str(match_id)
-        #             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)
-        #             horn_oe_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-        #                            "condition", "odds_only", "sole", "source", "type", "team"]
-        #             horn_oe_value = [match_id, league_id, key, "0", 0, p_code, value, horn_oe_dict_rule[key],
-        #                              odds_only, sole, "hg3535", "0", ""]
-        #             horn_oe_data = dict(zip(horn_oe_key, horn_oe_value))
-        #             data_list.append(horn_oe_data)
-        #
-        #     if pt == '3':
-        #         ris_stringscene = 1
-        #     else:
-        #         ris_stringscene = 0
-        #     odds_key = ["game_code", "title", "match_id", "lg_id", "data", "source", "odds_only", "tag", "uuid",
-        #                 "is_stringscene", "utime", "pt", 'match_identity']
-        #     odds_value = ["zq", "odds", match_id, league_id, data_list, "hg3535", odds_onlys, tag_number, uuid,
-        #                   ris_stringscene, utime, pt, match_identity]
-        #     odds_dict = dict(zip(odds_key, odds_value))
-        #     if data_list:
-        #         res = Helper.async_post(ODDS_URL, odds_dict)
-        #         if res:
-        #             if res.get('status') == 1:
-        #                 logger.info('足球角球, 详细赔率提交成功, {}'.format(res))
-        #                 # logger.info(odds_dict)
-        #             else:
-        #                 logger.warning('足球角球, 详细赔率提交失败, {}'.format(res))
-        #                 # logger.warning(odds_dict)
-        #         else:
-        #             logging.warning('足球角球, 详细赔率接口异常, {}'.format(res))
-        #     else:
-        #         logger.info('足球详细赔率列表为空')
         reactor.callFromThread(out.callback, item)

hg3535/settings.py

@@ -129,15 +129,16 @@ M_DB = 'kaiyou'
 M_PASSWORD = 'kaiyou'
 # M_PASSWORD = '123456'
 
-LEAGUE_URL = 'http://stadmin.bocai108.com:19093/setLeague'
-# LEAGUE_URL = 'http://stadmin.bocai108.com/setLeague'
-MATCH_URL = 'http://stadmin.bocai108.com:19093/setMatch'
-# MATCH_URL = 'http://stadmin.bocai108.com/setMatch'
-ODDS_URL = 'http://stadmin.bocai108.com:19093/setOdds'
-# ODDS_URL = 'http://stadmin.bocai108.com/setOdds'
+# LEAGUE_URL = 'http://stadmin.bocai108.com:19093/setLeague'
+LEAGUE_URL = 'http://stadmin.bocai108.com/setLeague'
+# MATCH_URL = 'http://stadmin.bocai108.com:19093/setMatch'
+MATCH_URL = 'http://stadmin.bocai108.com/setMatch'
+# ODDS_URL = 'http://stadmin.bocai108.com:19093/setOdds'
+ODDS_URL = 'http://stadmin.bocai108.com/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:19093/setOddsCH"
 SAIGUO_RESULT = "http://stadmin.bocai108.com:19093/setResultExpress"
 # SAIGUO_RESULT = "http://stadmin.bocai108.com/setResultExpress"

hg3535/spiders/bangqiu.py

@@ -43,8 +43,6 @@ class BqrangqiuSpider(scrapy.Spider):
                     new_results = result['es']
                     for new_result in new_results:
                         game_id = str(new_result['i'][16])
-                        up_time = str(time.time()) + '&' + 'bq'
-                        self.rls.hset('hg3535.ball.ids', game_id, up_time)
                         if pt == 1:
                             url = "https://odata.yonghuai5515.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/false/ubt/am/isp/false".format(game_id)
                             yield Request(url=url, callback=self.parse_each, meta={'pt': pt}, dont_filter=True)
@@ -73,7 +71,6 @@ class BqrangqiuSpider(scrapy.Spider):
             item = Bangqiu()
             for result in new_data:
                 if result['pci']["ctid"] == 0:
-
                     # 比赛id
                     game_id = str(result['k'])
                     # 球队1
@@ -236,51 +233,3 @@ class BqrangqiuSpider(scrapy.Spider):
                     item['odd_evens_dict_rule'] = odd_evens_dict_rule
                     item['bangqiu'] = bangqiu
                     yield item
-
-            #     if result['pci']['ctid'] is 208:
-            #         """球队得分大/小  主队"""
-            #         team_score_home_dict = {}
-            #         team_score_home_rule_dict = {}
-            #         try:
-            #             team_score_home = result['o']['ou']['v']
-            #             team_score_home_rule_dict['team_score_big'] = team_score_home[1]
-            #             team_score_home_rule_dict['team_score_small'] = team_score_home[3]
-            #             if pt is 3:
-            #                 team_score_home_dict['team_score_big'] = float(team_score_home[5]) - 1
-            #                 team_score_home_dict['team_score_small'] = float(team_score_home[7]) - 1
-            #             else:
-            #                 team_score_home_dict['team_score_big'] = team_score_home[5]
-            #                 team_score_home_dict['team_score_small'] = team_score_home[7]
-            #         except:
-            #             team_score_home_dict['team_score_big'] = ''
-            #             team_score_home_rule_dict['team_score_big'] = ''
-            #             team_score_home_dict['team_score_small'] = ''
-            #             team_score_home_rule_dict['team_score_small'] = ''
-            #         # 球队得分大/小  主队
-            #         item['team_score_home_dict'] = team_score_home_dict
-            #         item['team_score_home_rule_dict'] = team_score_home_rule_dict
-            #
-            #     if result['pci']['ctid'] is 209:
-            #         """球队得分大/小  客队"""
-            #         team_score_guest_dict = {}
-            #         team_score_guest_rule_dict = {}
-            #         try:
-            #             team_score_guest = result['o']['ou']['v']
-            #             team_score_guest_rule_dict['team_score_big'] = team_score_guest[1]
-            #             team_score_guest_rule_dict['team_score_small'] = team_score_guest[3]
-            #             if pt is 3:
-            #                 team_score_guest_dict['team_score_big'] = float(team_score_guest[5]) - 1
-            #                 team_score_guest_dict['team_score_small'] = float(team_score_guest[7]) - 1
-            #             else:
-            #                 team_score_guest_dict['team_score_big'] = team_score_guest[5]
-            #                 team_score_guest_dict['team_score_small'] = team_score_guest[7]
-            #         except:
-            #             team_score_guest_dict['team_score_big'] = ''
-            #             team_score_guest_rule_dict['team_score_big'] = ''
-            #             team_score_guest_dict['team_score_small'] = ''
-            #             team_score_guest_rule_dict['team_score_small'] = ''
-            #         # 球队得分大/小  客队
-            #         item['team_score_guest_dict'] = team_score_guest_dict
-            #         item['team_score_guest_rule_dict'] = team_score_guest_rule_dict
-            #
-            # yield item

hg3535/spiders/guanjun.py

@@ -28,7 +28,6 @@ class LqguanjunSpider(scrapy.Spider):
             for x in range(0, 4):
                 # for y in range()
                 url = 'https://odata.yonghuai5515.com/odds6i/d/getodds/zh-cn/sid/{}/pt/1/ubt/or/pn/{}/sb/2/dc/null/pid/0'.format(z, x)
-                # redis_key = "guanjun: start_urls"
                 yield Request(url=url, callback=self.parse, dont_filter=True)
 
     def parse(self, response):

hg3535/spiders/jieshu.py

@@ -30,8 +30,6 @@ class HgjieshuSpider(scrapy.Spider):
                 match_id, ctime = match_id.decode(), ctime.decode()
                 url = 'https://odata.yonghuai5515.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, meta={'ctime': ctime})
-        # url = 'https://odata.yonghuai5515.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/true/ubt/am/isp/false'.format(3560310)
-        # yield scrapy.Request(url=url, callback=self.parse, dont_filter=True)
 
     def parse(self, response):
         logger = logging.getLogger(__name__)
@@ -44,8 +42,6 @@ class HgjieshuSpider(scrapy.Spider):
             match_id = data['i'][2]
             home = data['eg']['es'][0]['i'][0]
             away = data['eg']['es'][0]['i'][1]
-            # date = data['eg']['es'][0]['i'][4]
-            # match_time = data['eg']['es'][0]['i'][5]
             date = ctime
             item = Hgjieshu()
             item['ball'] = ball

hg3535/spiders/lanqiu.py

@@ -74,8 +74,6 @@ class LanqiuSpider(scrapy.Spider):
                     new_results = result['es']
                     for new_result in new_results:
                         game_id = new_result['i'][16]
-                        up_time = str(time.time()) + '&' + 'lq'
-                        self.rls.hset('hg3535.ball.ids', game_id, up_time)
                         if pt == 1:
                             url = "https://odata.yonghuai5515.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/false/ubt/am/isp/false".format(game_id)
                             yield Request(url=url, callback=self.parse_each, meta={'pt': pt}, dont_filter=True)

hg3535/spiders/liansai.py

@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-import json
-
-import requests
-import scrapy
-
-# from scrapy.http import Request
-
-from .. items import Liansai
-
-
-class LanqiulsSpider(scrapy.Spider):
-    name = 'liansai'
-    to_day = datetime.datetime.now()
-    allowed_domains = ['hg3535z.com']
-    custom_settings = {
-        "ITEM_PIPELINES": {
-            'hg3535.pipeline.Liansaipipeline': 300,
-        },
-        # 'LOG_LEVEL': 'DEBUG',
-        # 'LOG_FILE': "../hg3535/log/liansai_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day)
-    }
-
-    def start_requests(self):
-        gj_list = ['am', 'or']
-        for y in range(1, 5):
-            for i in range(1, 5):
-                for z in gj_list:
-                    url = 'https://hg3535z.com/odds2/d/getcomps?sid='+str(y)+'&pt=' + str(i) + '&ubt=' + z +'&dc=null&pn=0&pid=0'
-                    yield scrapy.Request(url=url, callback=self.parse, dont_filter=True)
-
-    def parse(self, response):
-        try:
-            datas = json.loads(response.text)['gs']
-        except:
-            datas = ""
-        if datas:
-            for data in datas:
-                # 区域id，欧洲
-                area_id = data['gid']
-                # 区域名，欧洲
-                area_name = data['gn']
-                new_data = data['fc']
-                if new_data:
-                    for i in new_data:
-                        item = Liansai()
-                        ball = json.loads(response.text)['s']
-                        st_league = i["id"]
-                        name_chinese = i['nm']
-                        item['area_id'] = area_id
-                        item['area_name'] = area_name
-                        item['st_league'] = st_league
-                        item['name_chinese'] = name_chinese
-                        item['ball'] = ball
-                        yield item
-
-
-
-
-
-
-
-
-
-
-

hg3535/spiders/roll_bangqiu.py

@@ -32,9 +32,6 @@ class BqrangqiuSpider(scrapy.Spider):
             for i in ids:
                 urls = 'https://odata.yonghuai5515.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/true/ubt/am/isp/false'.format(
                     i)
-                # self.rls.sadd('hg3535.gunqiu.ids', i)
-                # up_time = str(time.time()) + '&' + 'bq'
-                # self.rls.hset('hg3535.ball.ids', i, up_time)
                 creation = time.strftime('%Y-%m-%d', time.localtime())
                 self.rls.hsetnx('hg3535.GunQiu.ids', i, creation)
                 yield Request(url=urls, callback=self.parse_each, dont_filter=True)

hg3535/spiders/roll_lanqiu.py

@@ -67,9 +67,6 @@ class LanqiuSpider(scrapy.Spider):
                         es = es['es']
                         for e in es:
                             match_id = e['i'][16]
-                            # self.rls.sadd('hg3535.gunqiu.ids', match_id)
-                            # up_time = str(time.time()) + '&' + 'lq'
-                            # self.rls.hset('hg3535.ball.ids', match_id, up_time)
                             creation = time.strftime('%Y-%m-%d', time.localtime())
                             self.rls.hsetnx('hg3535.GunQiu.ids', match_id, creation)
                             url = 'https://odata.yonghuai5515.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/true/ubt/am/isp/false'.format(match_id)

hg3535/spiders/roll_wangqiu.py

@@ -64,9 +64,6 @@ class WangqiuSpider(scrapy.Spider):
                 urls = 'https://odata.yonghuai5515.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/true/ubt/am/isp/false'.format(id)
                 # 玩法规则
                 rle = rules[index]
-                self.rls.sadd('hg3535.gunqiu.ids', id)
-                # up_time = str(time.time()) + '&' + 'wq'
-                # self.rls.hset('hg3535.ball.ids', id, up_time)
                 creation = time.strftime('%Y-%m-%d', time.localtime())
                 self.rls.hsetnx('hg3535.GunQiu.ids', id, creation)
                 yield Request(url=urls, callback=self.parse_other, meta={'rule': rle}, dont_filter=True)

hg3535/spiders/roll_zuqiu.py

@@ -40,10 +40,7 @@ class ZuqiuSpider(scrapy.Spider):
                         es = es['es']
                         for e in es:
                             match_id = e['k']
-                            # up_time = str(time.time()) + '&' + 'zq'
-                            # self.rls.sadd('hg3535.gunqiu.ids', match_id)
                             creation = time.strftime('%Y-%m-%d', time.localtime())
-                            # self.rls.hset('hg3535.ball.ids', match_id, up_time)
                             self.rls.hsetnx('hg3535.GunQiu.ids', match_id, creation)
                             url = 'https://odata.yonghuai5515.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)

hg3535/spiders/saiguo.py

@@ -54,10 +54,6 @@ class HgjieshuSpider(scrapy.Spider):
                         h_scores = data.xpath('.//div[contains(@class, "rt-ht ")]')
                         # 时间
                         stimes = data.xpath('//div[@class="rt-event"]/../div[1]/span/text()')
-                        # 子集玩法
-                        # odd_names = data.xpath('//div[@class="rt-sub rt-data-hide"]/table/tbody[2]/tr/td[2]')
-                        # 子集玩法结果
-                        # odd_plays = data.xpath('//div[@class="rt-sub rt-data-hide"]/table/tbody[2]/tr/td[3]/span')
                         match_ids = data.xpath('//div[@class="flex-wrap"]/../div[1]/@id')
                         odd_datas = data.xpath('//div[contains(@class, "rt-sub ")]/table/tbody[2]')
                         for y in range(len(odd_datas)):

hg3535/spiders/wangqiu.py

@@ -24,7 +24,7 @@ class LanqiuSpider(scrapy.Spider):
         # 'LOG_LEVEL': 'DEBUG',
         # 'LOG_FILE': "../hg3535/log/wangqiu_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day)
     }
-    rls = redis.Redis(host=R_HOST, port=R_POST, db=R_DB, password=R_PASSWORD)
+    # rls = redis.Redis(host=R_HOST, port=R_POST, db=R_DB, password=R_PASSWORD)
 
     def start_requests(self):
         for y in range(1, 4):
@@ -46,8 +46,6 @@ class LanqiuSpider(scrapy.Spider):
                     new_results = result['es']
                     for new_result in new_results:
                         game_id = new_result['i'][16]
-                        up_time = str(time.time()) + '&' + 'wq'
-                        self.rls.hset('hg3535.ball.ids', game_id, up_time)
                         if pt == 1:
                             url = "https://odata.yonghuai5515.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/false/ubt/am/isp/false".format(game_id)
                             yield Request(url=url, callback=self.parse_each, meta={'pt': pt}, dont_filter=True)

hg3535/spiders/wqbodan.py

@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-import copy
-import datetime
-import json
-
-import scrapy
-
-from scrapy.http import Request
-
-from ..items import Wqbodan
-
-
-class WgbodanSpider(scrapy.Spider):
-    name = 'wqbodan'
-    to_day = datetime.datetime.now()
-    allowed_domains = ['hg3535z.com']
-    custom_settings = {
-        "ITEM_PIPELINES": {
-            'hg3535.pipeline.Wqbodanpipeline': 300,
-        },
-        # 'LOG_LEVEL': 'DEBUG',
-        # 'LOG_FILE': "../hg3535/log/wqbodan_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day)
-    }
-
-    def start_requests(self):
-        url = 'https://hg3535z.com/odds2/d/getmenu?pid=0'
-        yield scrapy.Request(url=url, callback=self.parse_one, dont_filter=True)
-
-    def parse_one(self, response):
-        for y in range(1, 4):
-            url = 'https://hg3535z.com/odds2/d/getodds?sid=3&pt=' + str(y) + '&ubt=stcs&pn=0&sb=2&dc=null&pid=0'
-            yield Request(url=url, callback=self.parse, meta={'pt': y}, dont_filter=True)
-
-    def parse(self, response):
-        try:
-            datas = json.loads(response.text)
-        except:
-            datas = ""
-        try:
-            results = datas['n-ot']['egs']
-        except:
-            results = ""
-        try:
-            pt = copy.copy(response.meta['pt'])
-        except:
-            pt = 0
-        if results:
-            for result in results:
-                # 联赛id
-                league_id = result['c']['k']
-                # 联赛名
-                league_name = result['c']['n']
-                new_results = result['es']
-                for new_result in new_results:
-                    item = Wqbodan()
-                    # 比赛id
-                    game_id = str(new_result['i'][16])
-                    # 球队1
-                    team_home = new_result['i'][0]
-                    # 球队2
-                    team_guest = new_result['i'][1]
-                    # 数量(97>)
-                    number = new_result['i'][2]
-                    # 状态
-                    zhuangtai = new_result['i'][3]
-                    # 日期
-                    data_game = new_result['i'][4]
-                    # 开赛时间
-                    time_game = new_result['i'][5]
-                    # 队1分数
-                    score_home = new_result['i'][10]
-                    # 队2分数
-                    score_guest = new_result['i'][11]
-                    # 下半场
-                    half_way = new_result['i'][12]
-                    # 角球或者其他
-                    corner_ball = new_result['pci'].get('ctn', "")
-                    bodan_data = {}
-                    # 波胆
-                    bodans = new_result['o'].get('sb', "")
-                    if bodans:
-                        one_list = ["bodanhome_two_zero", "bodanhome_two_one", "bodanhome_three_zero",
-                                    "bodanhome_three_one", "bodanhome_three_two", "bodanhome_four_zero",
-                                    "bodanhome_four_one", "bodanhome_four_two", "bodanhome_four_three"]
-                        two_list = ["bodanguest_two_zero", "bodanguest_two_one", "bodanguest_three_zero",
-                                    "bodanguest_three_one", "bodanguest_three_two", "bodanguest_four_zero",
-                                    "bodanguest_four_one", "bodanguest_four_two", "bodanguest_four_three"]
-
-                        new_bodans = [bodans[i] for i in range(len(bodans)) if i % 2 == 1]
-                        # 主队bodan_home
-                        bodan_home = [new_bodans[i] for i in range(len(new_bodans)) if i % 2 == 0]
-                        for index, t in enumerate(one_list):
-                            bodan_data[t] = bodan_home[index]
-                        # 客队bodan_guest
-                        bodan_guest = [new_bodans[i] for i in range(len(new_bodans)) if i % 2 == 1]
-                        for y, z in enumerate(two_list):
-                            bodan_data[z] = bodan_guest[y]
-                    item['league_id'] = league_id
-                    item['league_name'] = league_name
-                    item['game_id'] = game_id
-                    item['team_home'] = team_home
-                    item['team_guest'] = team_guest
-                    item['number'] = number
-                    item['data_game'] = data_game
-                    item['time_game'] = time_game
-                    item['corner_ball'] = corner_ball
-                    item['score_home'] = score_home
-                    item['score_guest'] = score_guest
-                    item['half_way'] = half_way
-                    item['pt'] = pt
-                    item['zhuangtai'] = zhuangtai
-                    item['bodan_data'] = bodan_data
-                    yield item
-
-

hg3535/spiders/zhibo.py

@@ -115,7 +115,6 @@ class ZuqiuSpider(scrapy.Spider):
                         event_name = match_event['name']
                         event_uts = match_event['uts']
                         warn_type = 3
-                        # updated_uts = match_event['updated_uts']
                         list_ball.append((team_name, event_name, event_uts, warn_type))
                 if list_ball:
                     item = FTzhibo()

hg3535/spiders/zuqiu.py

@@ -24,7 +24,7 @@ class ZuqiuSpider(scrapy.Spider):
         # 'LOG_LEVEL': 'DEBUG',
         # 'LOG_FILE': "./log/zuqiu_{}_{}_{}.log".format(to_day.year, to_day.month, to_day.day),
     }
-    rls = redis.Redis(host=R_HOST, port=R_POST, db=R_DB, password=R_PASSWORD)
+    # rls = redis.Redis(host=R_HOST, port=R_POST, db=R_DB, password=R_PASSWORD)
 
     def start_requests(self):
         for y in range(1, 4):
@@ -47,7 +47,7 @@ class ZuqiuSpider(scrapy.Spider):
                     for new_result in new_results:
                         game_id = new_result['k']
                         up_time = str(time.time()) + '&' + 'zq'
-                        self.rls.hset('hg3535.ball.ids', game_id, up_time)
+                        # self.rls.hset('hg3535.ball.ids', game_id, up_time)
                         if pt == 3:
                             url = "https://odata.yonghuai5515.com/odds6i/d/getamodds/zh-cn/eid/{}/iip/false/ubt/am/isp/true".format(game_id)
                             yield Request(url=url, callback=self.parse_each, dont_filter=True, meta={'pt': pt})
@@ -555,5 +555,4 @@ class ZuqiuSpider(scrapy.Spider):
                 item['horn_oe_dict'] = horn_oe_dict
                 item['horn_oe_dict_rule'] = horn_oe_dict_rule
                 item['horn_team'] = horn_team
-                # item['zuqiu'] = zuqiu
                 yield item