Your Name 6 years ago
parent
commit
617b06a1fc

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

@@ -3,6 +3,16 @@
   <component name="ChangeListManager">
     <list default="true" id="7fa42e97-ddea-4404-91db-5a9ccc162649" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/items.py" beforeDir="false" afterPath="$PROJECT_DIR$/items.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pipelines.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipelines.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/lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/lanqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/liansai.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/liansai.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/zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/zuqiu.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -12,7 +22,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="1557372361302" 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="1557458984638" 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$halffull.coverage" NAME="halffull Coverage Results" MODIFIED="1554544334424" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
     <SUITE FILE_PATH="coverage/hg3535$pipelines.coverage" NAME="pipelines Coverage Results" MODIFIED="1554290866137" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/hg3535$today_all.coverage" NAME="today_all Coverage Results" MODIFIED="1553172114927" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
@@ -39,117 +49,40 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/items.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4914">
-              <caret line="316" column="17" selection-start-line="316" selection-start-column="6" selection-end-line="316" selection-end-column="17" />
-              <folding>
-                <element signature="e#320#1230#0" />
-                <element signature="e#1382#1528#0" />
-              </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="2214">
-              <caret line="129" column="14" selection-start-line="129" selection-start-column="14" selection-end-line="129" selection-end-column="14" />
-              <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/bangqiu.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3258">
-              <caret line="187" column="45" selection-start-line="187" selection-start-column="45" selection-end-line="187" selection-end-column="45" />
-              <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/hg3535_zq_status.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="36">
-              <caret line="19" selection-start-line="19" selection-end-line="19" />
-              <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/hg3535_zq_status_up.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="54">
-              <caret line="19" selection-start-line="19" selection-end-line="19" />
-              <folding>
-                <element signature="e#25#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/main.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="36">
-              <caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
-              <folding>
-                <element signature="e#0#10#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/main_time.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="22" column="23" selection-start-line="22" selection-start-column="23" selection-end-line="22" selection-end-column="23" />
-              <folding>
-                <element signature="e#0#11#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/hg3535_zuqiu.py">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pipelines.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-19031">
-              <caret line="45" column="30" selection-start-line="45" selection-start-column="30" selection-end-line="45" selection-end-column="30" />
+            <state relative-caret-position="-3235">
+              <caret line="377" lean-forward="true" selection-start-line="377" selection-end-line="377" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
+                <element signature="e#1528#3401#0" />
+                <element signature="e#3463#5238#0" />
+                <element signature="e#5295#6993#0" />
+                <element signature="e#7046#7880#0" />
+                <element signature="e#8040#8724#0" />
+                <element signature="e#8768#9481#0" />
+                <element signature="e#9527#10237#0" />
+                <element signature="e#10421#12227#0" />
+                <element signature="e#12315#13898#0" />
+                <element signature="e#13959#15711#0" />
+                <element signature="e#15772#17523#0" />
+                <element signature="e#17584#19334#0" />
+                <element signature="e#19395#21146#0" />
+                <element signature="e#21326#23142#0" />
+                <element signature="e#23322#25137#0" />
+                <element signature="e#25178#25659#0" />
+                <element signature="e#25811#41407#0" />
+                <element signature="e#41560#48459#0" />
+                <element signature="e#48613#55932#0" />
+                <element signature="e#60609#67553#0" />
+                <element signature="e#67704#73651#0" />
+                <element signature="e#73802#80953#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/settings.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2430">
-              <caret line="135" column="24" selection-start-line="135" selection-start-column="24" selection-end-line="135" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -231,29 +164,29 @@
         <option value="$PROJECT_DIR$/spiders/lanqiuls.py" />
         <option value="$PROJECT_DIR$/spiders/testone.py" />
         <option value="$PROJECT_DIR$/middlewares.py" />
-        <option value="$PROJECT_DIR$/spiders/guanjun.py" />
         <option value="$PROJECT_DIR$/spiders/wgbodan.py" />
         <option value="$PROJECT_DIR$/jianting.py" />
-        <option value="$PROJECT_DIR$/spiders/liansai.py" />
-        <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
         <option value="$PROJECT_DIR$/requirements.txt" />
+        <option value="$PROJECT_DIR$/main_time.py" />
         <option value="$PROJECT_DIR$/items.py" />
+        <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/guanjun.py" />
         <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/wangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/liansai.py" />
         <option value="$PROJECT_DIR$/spiders/wqbodan.py" />
-        <option value="$PROJECT_DIR$/pipelines.py" />
-        <option value="$PROJECT_DIR$/main.py" />
+        <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
         <option value="$PROJECT_DIR$/settings.py" />
-        <option value="$PROJECT_DIR$/main_time.py" />
+        <option value="$PROJECT_DIR$/spiders/wangqiu.py" />
+        <option value="$PROJECT_DIR$/pipelines.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="264" />
-    <option name="y" value="112" />
-    <option name="width" value="1031" />
-    <option name="height" value="1053" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1583" />
+    <option name="height" value="1064" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -286,7 +219,7 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../jiebao/jiebao" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
@@ -503,6 +436,9 @@
       <workItem from="1557364694196" duration="10610000" />
       <workItem from="1557379397322" duration="33000" />
       <workItem from="1557379446771" duration="4219000" />
+      <workItem from="1557396895400" duration="1197000" />
+      <workItem from="1557407270851" duration="1123000" />
+      <workItem from="1557452403593" duration="11722000" />
     </task>
     <task id="LOCAL-00001" summary="修改后,版本二">
       <created>1555727493584</created>
@@ -627,7 +563,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1348875000" />
+    <option name="totallyTimeSpent" value="1362917000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -640,8 +576,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.13326226" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.20042644" />
       <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" />
@@ -654,9 +591,9 @@
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.2918455" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5053305" side_tool="true" weight="0.40128756" />
-      <window_info active="true" anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.4946695" visible="true" weight="0.2918455" />
+      <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.4946695" weight="0.29291844" />
       <window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" weight="0.41309014" />
-      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.4946695" weight="0.44206008" />
+      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.4946695" visible="true" weight="0.4356223" />
       <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" />
@@ -666,22 +603,22 @@
       <window_info anchor="right" id="R Graphics" order="6" weight="0.32995737" />
     </layout>
     <layout-to-restore>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.18017058" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.13539445" />
       <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.3290461" />
-      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" weight="0.29291844" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" weight="0.30686694" />
       <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" />
       <window_info anchor="bottom" id="Docker" order="6" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32939914" />
+      <window_info anchor="bottom" id="Version Control" order="7" weight="0.2918455" />
       <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.4195279" />
-      <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49573562" visible="true" weight="0.41523606" />
-      <window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" weight="0.41371918" />
-      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.4946695" weight="0.51824033" />
+      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5053305" side_tool="true" weight="0.40128756" />
+      <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.4946695" weight="0.29291844" />
+      <window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" weight="0.41309014" />
+      <window_info active="true" anchor="bottom" id="Run" order="12" sideWeight="0.4946695" visible="true" weight="0.5214592" />
       <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" />
@@ -921,28 +858,8 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="37" column="21" selection-start-line="37" selection-start-column="17" selection-end-line="37" selection-end-column="21" />
-          <folding>
-            <element signature="e#24#35#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/myspider/requests.seen" />
     <entry file="file://$PROJECT_DIR$/spiders/wgbodan.py" />
-    <entry file="file://$PROJECT_DIR$/spiders/liansai.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-          <folding>
-            <element signature="e#24#35#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/twisted/enterprise/adbapi.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="160">
@@ -967,121 +884,164 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status_up.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1361">
-          <caret line="182" column="47" selection-start-line="182" selection-start-column="47" selection-end-line="182" selection-end-column="47" />
+        <state relative-caret-position="54">
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
           <folding>
-            <element signature="e#48#59#0" expanded="true" />
+            <element signature="e#25#40#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/main_time.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="778" column="97" lean-forward="true" selection-start-line="778" selection-start-column="97" selection-end-line="778" selection-end-column="97" />
+        <state relative-caret-position="-114">
+          <caret line="22" column="23" selection-start-line="22" selection-start-column="23" selection-end-line="22" selection-end-column="23" />
           <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$/spiders/wqbodan.py">
+    <entry file="file://$PROJECT_DIR$/spiders/hg3535_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="74" column="24" lean-forward="true" selection-start-line="74" selection-start-column="24" selection-end-line="74" selection-end-column="24" />
+        <state relative-caret-position="-324" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2664">
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
+          <folding>
+            <element signature="e#24#35#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/items.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4914">
-          <caret line="316" column="17" selection-start-line="316" selection-start-column="6" selection-end-line="316" selection-end-column="17" />
+        <state relative-caret-position="205">
+          <caret line="254" column="28" selection-start-line="254" selection-start-column="28" selection-end-line="254" selection-end-column="28" />
           <folding>
-            <element signature="e#320#1230#0" />
             <element signature="e#1382#1528#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/liansai.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2214">
-          <caret line="129" column="14" selection-start-line="129" selection-start-column="14" selection-end-line="129" selection-end-column="14" />
+        <state relative-caret-position="144">
+          <caret line="26" column="12" lean-forward="true" selection-start-line="26" selection-start-column="12" selection-end-line="26" selection-end-column="12" />
           <folding>
             <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3258">
-          <caret line="187" column="45" selection-start-line="187" selection-start-column="45" selection-end-line="187" selection-end-column="45" />
+        <state relative-caret-position="159">
+          <caret line="80" column="92" selection-start-line="80" selection-start-column="92" selection-end-line="80" selection-end-column="92" />
           <folding>
             <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status.py">
+    <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="36">
-          <caret line="19" selection-start-line="19" selection-end-line="19" />
+        <state relative-caret-position="234">
+          <caret line="13" column="41" lean-forward="true" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
           <folding>
-            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#0#10#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status_up.py">
+    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="54">
-          <caret line="19" selection-start-line="19" selection-end-line="19" />
+        <state relative-caret-position="17">
+          <caret line="21" column="77" selection-start-line="21" selection-start-column="77" selection-end-line="21" selection-end-column="77" />
           <folding>
-            <element signature="e#25#40#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/wqbodan.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1194">
+          <caret line="27" column="70" selection-start-line="27" selection-start-column="70" selection-end-line="27" selection-end-column="70" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="36">
-          <caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
+        <state relative-caret-position="-5686">
+          <caret line="44" column="35" lean-forward="true" selection-start-line="44" selection-start-column="35" selection-end-line="44" selection-end-column="35" />
           <folding>
-            <element signature="e#0#10#0" expanded="true" />
+            <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/hg3535_zuqiu.py">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="150" column="21" lean-forward="true" selection-start-line="150" selection-start-column="21" selection-end-line="150" selection-end-column="21" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main_time.py">
+    <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="22" column="23" selection-start-line="22" selection-start-column="23" selection-end-line="22" selection-end-column="23" />
+        <state relative-caret-position="241">
+          <caret line="94" column="41" selection-start-line="94" selection-start-column="40" selection-end-line="94" selection-end-column="46" />
           <folding>
-            <element signature="e#0#11#0" expanded="true" />
+            <element signature="e#48#59#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipelines.py">
+    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-19031">
-          <caret line="45" column="30" selection-start-line="45" selection-start-column="30" selection-end-line="45" selection-end-column="30" />
+        <state relative-caret-position="215">
+          <caret line="28" column="12" lean-forward="true" selection-start-line="28" selection-start-column="12" selection-end-line="28" selection-end-column="12" />
           <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$/settings.py">
+    <entry file="file://$PROJECT_DIR$/pipelines.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2430">
-          <caret line="135" column="24" selection-start-line="135" selection-start-column="24" selection-end-line="135" selection-end-column="24" />
+        <state relative-caret-position="-3235">
+          <caret line="377" lean-forward="true" selection-start-line="377" selection-end-line="377" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#1528#3401#0" />
+            <element signature="e#3463#5238#0" />
+            <element signature="e#5295#6993#0" />
+            <element signature="e#7046#7880#0" />
+            <element signature="e#8040#8724#0" />
+            <element signature="e#8768#9481#0" />
+            <element signature="e#9527#10237#0" />
+            <element signature="e#10421#12227#0" />
+            <element signature="e#12315#13898#0" />
+            <element signature="e#13959#15711#0" />
+            <element signature="e#15772#17523#0" />
+            <element signature="e#17584#19334#0" />
+            <element signature="e#19395#21146#0" />
+            <element signature="e#21326#23142#0" />
+            <element signature="e#23322#25137#0" />
+            <element signature="e#25178#25659#0" />
+            <element signature="e#25811#41407#0" />
+            <element signature="e#41560#48459#0" />
+            <element signature="e#48613#55932#0" />
+            <element signature="e#60609#67553#0" />
+            <element signature="e#67704#73651#0" />
+            <element signature="e#73802#80953#0" />
+          </folding>
         </state>
       </provider>
     </entry>

+ 4 - 0
hg3535/items.py

@@ -48,6 +48,7 @@ class Lanqiu(scrapy.Field):
     capot = scrapy.Field()
     team_score = scrapy.Field()
     team_score_rule = scrapy.Field()
+    lanqiu = scrapy.Field()
 
 
 # 联赛---------------------------------------------------------------------------------------------------------------
@@ -135,6 +136,7 @@ class Zuqiu(scrapy.Field):
     bodan_data = scrapy.Field()
     # 足球 最先进球/最后进球
     first_last_ball = scrapy.Field()
+    zuqiu = scrapy.Field()
 
 
 # 网球 让球&大小盘--------------------------------------------------------------------------------------------------------
@@ -177,6 +179,7 @@ class Wangqiu(scrapy.Field):
     total_number_dict_rule = scrapy.Field()
     odd_evens_dict = scrapy.Field()
     odd_evens_dict_rule = scrapy.Field()
+    wangqiu = scrapy.Field()
 
 
 # 网球 波胆--------------------------------------------------------------------------------------------------------------
@@ -249,6 +252,7 @@ class Bangqiu(scrapy.Field):
     total_size_dict_rule = scrapy.Field()
     odd_evens_dict = scrapy.Field()
     odd_evens_dict_rule = scrapy.Field()
+    bangqiu = scrapy.Field()
 
 
 # 滚球------------------------------------------------------------------------------------------------------------------

+ 1 - 1
hg3535/main.py

@@ -11,6 +11,6 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 # execute(["scrapy", "crawl", "wangqiu"])
 # execute(["scrapy", "crawl", "wqbodan"])
 # execute(["scrapy", "crawl", "bangqiu"])
-execute(["scrapy", "crawl", "roll_zuqiu"]) #滚球
+# execute(["scrapy", "crawl", "roll_zuqiu"]) #滚球
 # execute(["scrapy", "crawl", "ball_status"]) #滚球id本地存
 # execute(["scrapy", "crawl", "ball_status_update"]) #滚球id结束时间更新状态

+ 120 - 300
hg3535/pipelines.py

@@ -3,44 +3,7 @@ import time
 import hashlib
 import redis
 from twisted.enterprise import adbapi
-import psycopg2.extras
-
-# class MySnow:
-#     def __init__(self,dataID):
-#         self.start = int(time.mktime(time.strptime('2018-01-01 00:00:00', "%Y-%m-%d %H:%M:%S")))
-#         self.last = int(time.time())
-#         self.countID = 0
-#         self.dataID = dataID    # 数据ID,这个自定义或是映射
-#
-#     def get_id(self):
-#         # 时间差部分
-#         now = int(time.time())
-#         temp = now-self.start
-#         if len(str(temp)) < 9:  # 时间差不够9位的在前面补0
-#             length = len(str(temp))
-#             s = "0" * (9-length)
-#             temp = s + str(temp)
-#         if now == self.last:
-#             self.countID += 1   # 同一时间差,序列号自增
-#         else:
-#             self.countID = 0    # 不同时间差,序列号重新置为0
-#             self.last = now
-#         # 标识ID部分
-#         if len(str(self.dataID)) < 2:
-#             length = len(str(self.dataID))
-#             s = "0" * (2-length)
-#             self.dataID = s + str(self.dataID)
-#         # 自增序列号部分
-#         if self.countID == 99999:  # 序列号自增5位满了,睡眠一秒钟
-#             time.sleep(1)
-#         countIDdata = str(self.countID)
-#         if len(countIDdata) < 5:  # 序列号不够5位的在前面补0
-#             length = len(countIDdata)
-#             s = "0"*(5-length)
-#             countIDdata = s + countIDdata
-#         id = str(temp) + str(self.dataID) + countIDdata
-#         return id
-
+from scrapy.conf import settings
 
 # 生成哈希索引 sole
 from .items import Zuqiustatus
@@ -433,26 +396,10 @@ def get_pcode(corner_ball, code):
 
 # 足球 赔率 赛事---------------------------------------------------------------------------------------------------------
 class Zuqiupipeline(object):
-    def __init__(self, dbpool, conn, cursor, redis_db):
-        self.dbpool = dbpool
-        self.conn = conn
-        self.cursor = cursor
-        self.redis_db = redis_db
-
-    @classmethod
-    def from_settings(cls, settings):
-        dbparms = dict(
-            host=settings["POST_HOST"],
-            user=settings["POST_USER"],
-            password=settings["POST_PASSWORD"],
-            port=settings['POST_PORT'],
-        )
-        dbpool = adbapi.ConnectionPool("psycopg2", **dbparms)
-        conn = psycopg2.connect(host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
-        cursor = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
-        pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
-        redis_db = redis.StrictRedis(connection_pool=pool)
-        return cls(dbpool, conn, cursor, redis_db)
+    def open_spider(self, spider):
+        self.dbpool = adbapi.ConnectionPool("psycopg2",host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
+        self.pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
+        self.redis_db = redis.StrictRedis(connection_pool=self.pool)
 
     def process_item(self, item, spider):
         # 使用twisted将mysql插入变成异步执行
@@ -497,6 +444,7 @@ class Zuqiupipeline(object):
         half_size_guest_rule = item["half_size_guest_rule"]
         half_size_home = item["half_size_home"]
         half_size_home_rule = item["half_size_home_rule"]
+        zuqiu = item['zuqiu']
 
         size_data = {'league_id': league_id, 'game_id': competition_id, 'utime': utime, 'p_id': p_id, 'p_code': p_code,
                      'source': "hg3535", 'expire_time': expire_time, 'pt': pt}
@@ -689,52 +637,36 @@ class Zuqiupipeline(object):
         match_date, match_time, time3 = new_time(ctime)
         n_time = out_time(time3, 1.5)
         # 插入st_zq_competition表
-        if pt == 1:
-            data_competition = {'team_home': team_home, 'team_guest': team_guest, 'league_id': league_id,
-                                'game_id': competition_id,
-                                'match_date': match_date, 'match_time': match_time, 'utime': utime, 'number': number,
-                                'source': "hg3535", "expire_time": n_time, 'is_today': 1, "us_time": ctime}
-            zqone_competition(data=data_competition, cursor=cursor)
-        if pt == 2:
-            data_competition = {'team_home': team_home, 'team_guest': team_guest, 'league_id': league_id,
-                                'game_id': competition_id,
-                                'match_date': match_date, 'match_time': match_time, 'utime': utime, 'number': number,
-                                'source': "hg3535", "expire_time": n_time, 'is_morningplate': 1, "us_time": ctime}
-            zqtwo_competition(data=data_competition, cursor=cursor)
-        if pt == 3:
-            data_competition = {'team_home': team_home, 'team_guest': team_guest, 'league_id': league_id,
-                                'game_id': competition_id,
-                                'match_date': match_date, 'match_time': match_time, 'utime': utime, 'number': number,
-                                'source': "hg3535", "expire_time": n_time, "is_stringscene": 1, "us_time": ctime}
-            zqthree_competition(data=data_competition, cursor=cursor)
+        if zuqiu == "足球":
+            if pt == 1:
+                data_competition = {'team_home': team_home, 'team_guest': team_guest, 'league_id': league_id,
+                                    'game_id': competition_id,
+                                    'match_date': match_date, 'match_time': match_time, 'utime': utime, 'number': number,
+                                    'source': "hg3535", "expire_time": n_time, 'is_today': 1, "us_time": ctime}
+                zqone_competition(data=data_competition, cursor=cursor)
+            if pt == 2:
+                data_competition = {'team_home': team_home, 'team_guest': team_guest, 'league_id': league_id,
+                                    'game_id': competition_id,
+                                    'match_date': match_date, 'match_time': match_time, 'utime': utime, 'number': number,
+                                    'source': "hg3535", "expire_time": n_time, 'is_morningplate': 1, "us_time": ctime}
+                zqtwo_competition(data=data_competition, cursor=cursor)
+            if pt == 3:
+                data_competition = {'team_home': team_home, 'team_guest': team_guest, 'league_id': league_id,
+                                    'game_id': competition_id,
+                                    'match_date': match_date, 'match_time': match_time, 'utime': utime, 'number': number,
+                                    'source': "hg3535", "expire_time": n_time, "is_stringscene": 1, "us_time": ctime}
+                zqthree_competition(data=data_competition, cursor=cursor)
 
     def close_spider(self, spider):
-        self.conn.close()
         self.dbpool.close()
 
 
 # 篮球 让球大小----------------------------------------------------------------------------------------------------------
 class Lanqiupipeline(object):
-    def __init__(self, dbpool, conn, cursor, redis_db):
-        self.dbpool = dbpool
-        self.conn = conn
-        self.cursor = cursor
-        self.redis_db = redis_db
-
-    @classmethod
-    def from_settings(cls, settings):
-        dbparms = dict(
-            host=settings["POST_HOST"],
-            user=settings["POST_USER"],
-            password=settings["POST_PASSWORD"],
-            port=settings['POST_PORT'],
-        )
-        dbpool = adbapi.ConnectionPool("psycopg2", **dbparms)
-        conn = psycopg2.connect(host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
-        cursor = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
-        pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
-        redis_db = redis.StrictRedis(connection_pool=pool)
-        return cls(dbpool, conn, cursor, redis_db)
+    def open_spider(self, spider):
+        self.dbpool = adbapi.ConnectionPool("psycopg2",host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
+        self.pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
+        self.redis_db = redis.StrictRedis(connection_pool=self.pool)
 
     def process_item(self, item, spider):
         # 使用twisted将mysql插入变成异步执行
@@ -795,6 +727,7 @@ class Lanqiupipeline(object):
         team_scores_dict = item['team_score']
         team_scores_dict_rule = item['team_score_rule']
         # 让球
+        lanqiu = item['lanqiu']
         concede = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 1, 'p_code': "concede",
                    'source': "hg3535", 'expire_time': expire_time}
         # 让球 数据插入数据库
@@ -833,50 +766,33 @@ class Lanqiupipeline(object):
         n_time = out_time(time3, 1.5)
         us_time = ctime
         # 插入赛事表
-
-        if pt == 1:
-            Competition_sql = "insert into st_lq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_today,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_today=%s;"
-            cursor.execute(Competition_sql, (
-                team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
-                n_time,1, us_time, number, n_time, 1))
-        if pt == 2:
-            Competition_sql = "insert into st_lq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_morningplate,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_morningplate=%s;"
-            cursor.execute(Competition_sql, (
-                team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
-                n_time,1, us_time, number, n_time, 1))
-        if pt == 3:
-            Competition_sql = "insert into st_lq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_stringscene,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_stringscene=%s;"
-            cursor.execute(Competition_sql, (
-                team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
-                n_time,1, us_time, number, n_time, 1))
+        if lanqiu == "篮球":
+            if pt == 1:
+                Competition_sql = "insert into st_lq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_today,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_today=%s;"
+                cursor.execute(Competition_sql, (
+                    team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
+                    n_time,1, us_time, number, n_time, 1))
+            if pt == 2:
+                Competition_sql = "insert into st_lq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_morningplate,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_morningplate=%s;"
+                cursor.execute(Competition_sql, (
+                    team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
+                    n_time,1, us_time, number, n_time, 1))
+            if pt == 3:
+                Competition_sql = "insert into st_lq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_stringscene,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_stringscene=%s;"
+                cursor.execute(Competition_sql, (
+                    team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
+                    n_time,1, us_time, number, n_time, 1))
 
     def close_spider(self, spider):
-        self.conn.close()
         self.dbpool.close()
 
 
 # 网球 让球&大小盘--------------------------------------------------------------------------------------------------------
 class Wangqiupipeline(object):
-    def __init__(self, dbpool, conn, cursor, redis_db):
-        self.dbpool = dbpool
-        self.conn = conn
-        self.cursor = cursor
-        self.redis_db = redis_db
-
-    @classmethod
-    def from_settings(cls, settings):
-        dbparms = dict(
-            host=settings["POST_HOST"],
-            user=settings["POST_USER"],
-            password=settings["POST_PASSWORD"],
-            port=settings['POST_PORT'],
-        )
-        dbpool = adbapi.ConnectionPool("psycopg2", **dbparms)
-        conn = psycopg2.connect(host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
-        cursor = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
-        pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
-        redis_db = redis.StrictRedis(connection_pool=pool)
-        return cls(dbpool, conn, cursor, redis_db)
+    def open_spider(self, spider):
+        self.dbpool = adbapi.ConnectionPool("psycopg2",host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
+        self.pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
+        self.redis_db = redis.StrictRedis(connection_pool=self.pool)
 
     def process_item(self, item, spider):
         # 使用twisted将mysql插入变成异步执行
@@ -940,13 +856,14 @@ class Wangqiupipeline(object):
         # 总局数单双
         odd_evens_dict = item['odd_evens_dict']
         odd_evens_dict_rule = item['odd_evens_dict_rule']
-        #
-        # 让球
-        concede = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 1, 'p_code': "concede",
+        wangqiu = item['wangqiu']
+
+        # 让盘
+        concede = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 1, 'p_code': "dishes",
                    'source': "hg3535", 'expire_time': expire_time, 'sort': 0, 'pt': pt}
         wqone_intodb(data1=concedes_dict, data2=concede, data3=concedes_dict_rule, cursor=cursor, redis_db=self.redis_db)
-
-        bureaus = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 3, 'p_code': "bureau",
+        # 让局
+        bureaus = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 3, 'p_code': "concede",
                    'source': "hg3535", 'expire_time': expire_time, 'sort': 0, 'pt': pt}
         wqone_intodb(data1=bureaus_dict, data2=bureaus, data3=bureaus_dict_rule, cursor=cursor, redis_db=self.redis_db)
 
@@ -979,51 +896,33 @@ class Wangqiupipeline(object):
                             int(league_id), key, int(game_id), utime, utime, value, 2, "kemp", 0, "hg3535", odds_only))
         us_time = ctime
         # 插入赛事表
-        if pt is 1:
-            Competition_sql = "insert into st_wq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_today,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_today=%s;"
-            cursor.execute(Competition_sql, (
-                team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
-                n_time,1, us_time, number, n_time, 1))
-        if pt is 2:
-            Competition_sql = "insert into st_wq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_morningplate,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_morningplate=%s;"
-            cursor.execute(Competition_sql, (
-                team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
-                n_time,1, us_time, number, n_time, 1))
-        if pt is 3:
-            Competition_sql = "insert into st_wq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_stringscene,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_stringscene=%s;"
-            cursor.execute(Competition_sql, (
-                team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
-                n_time,1, us_time, number, n_time, 1))
+        if wangqiu == "网球":
+            if pt is 1:
+                Competition_sql = "insert into st_wq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_today,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_today=%s;"
+                cursor.execute(Competition_sql, (
+                    team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
+                    n_time,1, us_time, number, n_time, 1))
+            if pt is 2:
+                Competition_sql = "insert into st_wq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_morningplate,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_morningplate=%s;"
+                cursor.execute(Competition_sql, (
+                    team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
+                    n_time,1, us_time, number, n_time, 1))
+            if pt is 3:
+                Competition_sql = "insert into st_wq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_stringscene,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_stringscene=%s;"
+                cursor.execute(Competition_sql, (
+                    team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
+                    n_time,1, us_time, number, n_time, 1))
 
     def close_spider(self, spider):
-        self.conn.close()
         self.dbpool.close()
 
 
 # 网球 波胆--------------------------------------------------------------------------------------------------------------
 class Wqbodanpipeline(object):
-    def __init__(self, dbpool, conn, cursor, redis_db):
-        self.dbpool = dbpool
-        self.conn = conn
-        self.cursor = cursor
-        self.redis_db = redis_db
-
-    @classmethod
-    def from_settings(cls, settings):
-        dbparms = dict(
-            host=settings["POST_HOST"],
-            # db = settings["POST_DATABASE"],
-            user=settings["POST_USER"],
-            password=settings["POST_PASSWORD"],
-            port=settings['POST_PORT'],
-        )
-        dbpool = adbapi.ConnectionPool("psycopg2", **dbparms)
-        conn = psycopg2.connect(host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
-        cursor = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
-        pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
-        redis_db = redis.StrictRedis(connection_pool=pool)
-        return cls(dbpool, conn, cursor, redis_db)
-
+    def open_spider(self, spider):
+        self.dbpool = adbapi.ConnectionPool("psycopg2",host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
+        self.pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
+        self.redis_db = redis.StrictRedis(connection_pool=self.pool)
     def process_item(self, item, spider):
         # 使用twisted将mysql插入变成异步执行
         query = self.dbpool.runInteraction(self.do_insert, item)
@@ -1100,32 +999,15 @@ class Wqbodanpipeline(object):
                         cursor.execute(sql2, (
                             int(league_id), key, int(competition_id), utime, utime, value, p_id, p_code, 0, "hg3535", key,odds_only))
     def close_spider(self, spider):
-        self.conn.close()
         self.dbpool.close()
 
 
 # 棒球 让球&大小盘--------------------------------------------------------------------------------------------------------
 class Bangqiupipeline(object):
-    def __init__(self, dbpool, conn, cursor, redis_db):
-        self.dbpool = dbpool
-        self.conn = conn
-        self.cursor = cursor
-        self.redis_db = redis_db
-
-    @classmethod
-    def from_settings(cls, settings):
-        dbparms = dict(
-            host=settings["POST_HOST"],
-            user=settings["POST_USER"],
-            password=settings["POST_PASSWORD"],
-            port=settings['POST_PORT'],
-        )
-        dbpool = adbapi.ConnectionPool("psycopg2", **dbparms)
-        conn = psycopg2.connect(host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
-        cursor = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
-        pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
-        redis_db = redis.StrictRedis(connection_pool=pool)
-        return cls(dbpool, conn, cursor, redis_db)
+    def open_spider(self, spider):
+        self.dbpool = adbapi.ConnectionPool("psycopg2",host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
+        self.pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
+        self.redis_db = redis.StrictRedis(connection_pool=self.pool)
 
     def process_item(self, item, spider):
         # 使用twisted将mysql插入变成异步执行
@@ -1187,6 +1069,7 @@ class Bangqiupipeline(object):
         # 总得分单双
         odd_evens_dict = item['odd_evens_dict']
         odd_evens_dict_rule = item['odd_evens_dict_rule']
+        bangqiu = item['bangqiu']
 
         # 让球
         concede = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 1, 'p_code': "concede",
@@ -1224,50 +1107,33 @@ class Bangqiupipeline(object):
                             int(league_id), key, int(game_id), utime, utime, value, 4, "capot", 0, "hg3535", odds_only))
         us_time = ctime
         # 插入赛事表
-        if pt == 1:
-            Competition_sql = "insert into st_bq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_today,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_today=%s;"
-            cursor.execute(Competition_sql, (
-                team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
-                n_time, 1, us_time, number, n_time, 1))
-        if pt == 2:
-            Competition_sql = "insert into st_bq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_morningplate,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_morningplate=%s;"
-            cursor.execute(Competition_sql, (
-                team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
-                n_time,1, us_time, number, n_time, 1))
-        if pt == 3:
-            Competition_sql = "insert into st_bq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_stringscene,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_stringscene=%s;"
-            cursor.execute(Competition_sql, (
-                team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
-                n_time,1, us_time, number, n_time, 1))
-
+        if bangqiu == '棒球':
+            if pt == 1:
+                Competition_sql = "insert into st_bq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_today,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_today=%s;"
+                cursor.execute(Competition_sql, (
+                    team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
+                    n_time, 1, us_time, number, n_time, 1))
+            if pt == 2:
+                Competition_sql = "insert into st_bq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_morningplate,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_morningplate=%s;"
+                cursor.execute(Competition_sql, (
+                    team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
+                    n_time,1, us_time, number, n_time, 1))
+            if pt == 3:
+                Competition_sql = "insert into st_bq_competition(home_team, guest_team, lg_id, match_id, match_date, match_time,ctime, utime, tag,source,expire_time,is_stringscene,us_time) values (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,%s) on conflict(match_id) do update set tag = %s,expire_time=%s,is_stringscene=%s;"
+                cursor.execute(Competition_sql, (
+                    team_home, team_guest, league_id, game_id, match_date, match_time, utime, utime, number, "hg3535",
+                    n_time,1, us_time, number, n_time, 1))
 
     def close_spider(self, spider):
-        self.conn.close()
         self.dbpool.close()
 
 
 # 足球 篮球 网球 棒球 冠军------------------------------------------------------------------------------------------------
 class Guanjunpipeline(object):
-    def __init__(self, dbpool, conn, cursor, redis_db):
-        self.dbpool = dbpool
-        self.conn = conn
-        self.cursor = cursor
-        self.redis_db = redis_db
-
-    @classmethod
-    def from_settings(cls, settings):
-        dbparms = dict(
-            host=settings["POST_HOST"],
-            user=settings["POST_USER"],
-            password=settings["POST_PASSWORD"],
-            port=settings['POST_PORT'],
-        )
-        dbpool = adbapi.ConnectionPool("psycopg2", **dbparms)
-        conn = psycopg2.connect(host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
-        cursor = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
-        pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
-        redis_db = redis.StrictRedis(connection_pool=pool)
-        return cls(dbpool, conn, cursor, redis_db)
+    def open_spider(self, spider):
+        self.dbpool = adbapi.ConnectionPool("psycopg2",host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
+        self.pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
+        self.redis_db = redis.StrictRedis(connection_pool=self.pool)
 
     def process_item(self, item, spider):
         # 使用twisted将mysql插入变成异步执行
@@ -1309,6 +1175,8 @@ class Guanjunpipeline(object):
         r_hash = hash_func(league_id, new_champion, tema_home, champion_team)
         odds_only = r_hash
         s_hash = hash_func(league_id, league_name, ball, 0)
+        # if game_id == '8947612':
+        #     print(ball, league_name)
         if ball == "足球":
             n_gameid = int('1' + str(league_id))
             data_dict = {'league_id': league_id, 'new_champion': new_champion, 'utime': utime,
@@ -1354,32 +1222,16 @@ class Guanjunpipeline(object):
             cursor.execute(Competition_sql, (league_name, league_id, n_gameid, utime, utime, 'hg3535', data_game, utime))
 
     def close_spider(self, spider):
-        self.conn.close()
+        # self.conn.close()
         self.dbpool.close()
 
 
 # 足球 篮球 网球 棒球 联赛------------------------------------------------------------------------------------------------
 class Liansaipipeline(object):
-    def __init__(self, dbpool, conn, cursor, redis_db):
-        self.dbpool = dbpool
-        self.conn = conn
-        self.cursor = cursor
-        self.redis_db = redis_db
-
-    @classmethod
-    def from_settings(cls, settings):
-        dbparms = dict(
-            host=settings["POST_HOST"],
-            user=settings["POST_USER"],
-            password=settings["POST_PASSWORD"],
-            port=settings['POST_PORT'],
-        )
-        dbpool = adbapi.ConnectionPool("psycopg2", **dbparms)
-        conn = psycopg2.connect(host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
-        cursor = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
-        pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
-        redis_db = redis.StrictRedis(connection_pool=pool)
-        return cls(dbpool, conn, cursor, redis_db)
+    def open_spider(self, spider):
+        self.dbpool = adbapi.ConnectionPool("psycopg2",host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
+        self.pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
+        self.redis_db = redis.StrictRedis(connection_pool=self.pool)
 
     def process_item(self, item, spider):
         # 使用twisted将mysql插入变成异步执行
@@ -1464,15 +1316,11 @@ class Liansaipipeline(object):
                         cursor.execute(sql3, (area_id, area_name, 0, 0, 0, utime, "hg3535", utime, "hg3535"))
 
     def close_spider(self, spider):
-        self.conn.close()
         self.dbpool.close()
         # self.redis_db.disconnect()
 
 #************************************滚球-------------------------------------------------------------------------------
 
-
-
-
 #滚球方法都加了s
 
 def zqone_intodbs(data1, data2, data3, data4, cursor, redis_db):
@@ -1582,26 +1430,10 @@ def news_times(ctime):
 
 
 class Roll_Zuqiupipeline(object):
-    def __init__(self, dbpool, conn, cursor, redis_db):
-        self.dbpool = dbpool
-        self.conn = conn
-        self.cursor = cursor
-        self.redis_db = redis_db
-
-    @classmethod
-    def from_settings(cls, settings):
-        dbparms = dict(
-            host=settings["POST_HOST"],
-            user=settings["POST_USER"],
-            password=settings["POST_PASSWORD"],
-            port=settings['POST_PORT'],
-        )
-        dbpool = adbapi.ConnectionPool("psycopg2", **dbparms)
-        conn = psycopg2.connect(host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
-        cursor = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
-        pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
-        redis_db = redis.StrictRedis(connection_pool=pool)
-        return cls(dbpool, conn, cursor, redis_db)
+    def open_spider(self, spider):
+        self.dbpool = adbapi.ConnectionPool("psycopg2",host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
+        self.pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
+        self.redis_db = redis.StrictRedis(connection_pool=self.pool)
 
     def process_item(self, item, spider):
         # 使用twisted将mysql插入变成异步执行
@@ -1830,28 +1662,16 @@ class Roll_Zuqiupipeline(object):
                             'match_date': r_ctime, 'match_time': '00:00:00', 'utime': utime, 'number': number,
                             'source': "hg3535", "expire_time": expire_time, 'is_rollball': 1, "us_time":'2019-01-01 00:00:00','time_game':time_game}
         zqone_competitions(data=data_competition, cursor=cursor)
-
+    def close_spider(self, spider):
+        # self.conn.close()
+        self.dbpool.close()
 
 
 class BallStatuspipeline(object):
-    def __init__(self, dbpool, conn, cursor):
-        self.dbpool = dbpool
-        self.conn = conn
-        self.cursor = cursor
-
-    @classmethod
-    def from_settings(cls, settings):
-        dbparms = dict(
-            host=settings["POST_HOST"],
-            # db = settings["POST_DATABASE"],
-            user=settings["POST_USER"],
-            password=settings["POST_PASSWORD"],
-            port=settings['POST_PORT'],
-        )
-        dbpool = adbapi.ConnectionPool("psycopg2", **dbparms)
-        conn = psycopg2.connect(host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"],password=settings["POST_PASSWORD"],database=settings["POST_DATABASE"])
-        cursor = conn.cursor(cursor_factory=psycopg2.extras.DictCursor)
-        return cls(dbpool,conn,cursor)
+    def open_spider(self, spider):
+        self.dbpool = adbapi.ConnectionPool("psycopg2",host=settings["POST_HOST"], port=settings['POST_PORT'], user=settings["POST_USER"], password=settings["POST_PASSWORD"], database=settings["POST_DATABASE"])
+        self.pool = redis.ConnectionPool(host=settings["R_HOST"], port=settings["R_POST"], password=settings["R_PASSWORD"])
+        self.redis_db = redis.StrictRedis(connection_pool=self.pool)
 
     def process_item(self, item, spider):
         # 使用twisted将mysql插入变成异步执行
@@ -1885,5 +1705,5 @@ class BallStatuspipeline(object):
     # 现在时间,时间戳
     utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     def close_spider(self, spider):
-        self.conn.close()
+        # self.conn.close()
         self.dbpool.close()

+ 11 - 11
hg3535/settings.py

@@ -139,19 +139,19 @@ REDIRECT_ENABLED = False
 #POST_PORT = '5433'
 #POST_PASSWORD = '123456'
 
-POST_HOST = '172.17.0.4'
-POST_DATABASE = 'kaiyou'
-POST_USER = 'kaiyou'
-POST_PORT = '5432'
-POST_PASSWORD = 'yjkj8888'
+# POST_HOST = '172.17.0.4'
+# POST_DATABASE = 'kaiyou'
+# POST_USER = 'kaiyou'
+# POST_PORT = '5432'
+# POST_PASSWORD = 'yjkj8888'
 
 
 R_HOST = 'localhost'
 R_POST = '6379'
-#R_PASSWORD = '123456'
+R_PASSWORD = '123456'
 
-# POST_HOST = 'localhost'
-# POST_DATABASE = 'kaiyou'
-# POST_USER = 'kaiyou'
-# POST_PORT = '10432'
-# POST_PASSWORD = '123456'
+POST_HOST = 'localhost'
+POST_DATABASE = 'kaiyou'
+POST_USER = 'kaiyou'
+POST_PORT = '10432'
+POST_PASSWORD = '123456'

+ 5 - 4
hg3535/spiders/bangqiu.py

@@ -19,7 +19,7 @@ class BqrangqiuSpider(scrapy.Spider):
     def start_requests(self):
         for y in range(1, 4):
             url = 'https://hg3535z.com/odds2/d/getodds?sid=4&pt=' + str(y) + '&ubt=am&pn=0&sb=2&dc=null&pid=0'
-            yield scrapy.Request(url=url, callback=self.parse, meta={'pt': y, 'dont_redirect': True})
+            yield scrapy.Request(url=url, callback=self.parse, meta={'pt': y})
 
     def parse(self, response):
         if response.text:
@@ -49,12 +49,12 @@ class BqrangqiuSpider(scrapy.Spider):
     def parse_each(self, response):
         try:
             new_datas = json.loads(response.text)['eg']
-        except:
-            new_datas = ""
-        try:
             pt = response.meta['pt']
+            bangqiu = json.loads(response.text)['i-ot']["s"]["n"]
         except:
+            new_datas = ""
             pt = 0
+            bangqiu = ""
         if new_datas:
             # 联赛id
             league_id = new_datas["c"]["k"]
@@ -225,5 +225,6 @@ class BqrangqiuSpider(scrapy.Spider):
                     # 总得分:单/双
                     item['odd_evens_dict'] = odd_evens_dict
                     item['odd_evens_dict_rule'] = odd_evens_dict_rule
+                    item['bangqiu'] = bangqiu
                     yield item
 

+ 2 - 2
hg3535/spiders/guanjun.py

@@ -23,8 +23,8 @@ class LqguanjunSpider(scrapy.Spider):
                 for x in range(0, 4):
                     url = 'https://hg3535z.com/odds2/d/getodds?sid=' + str(z) + '&pt=' + str(y) + '&ubt=or&pn=' + str(
                         x) + '&sb=2&dc=null&pid=0'
-                    yield Request(url=url, callback=self.parse, meta={'pt': y, 'sid': z, 'url': url})
-
+                    # yield Request(url=url, callback=self.parse, meta={'pt': y, 'sid': z}, dont_filter=True)
+                    yield Request(url=url, callback=self.parse, meta={'pt': y, 'sid': z})
     def parse(self, response):
         try:
             datas = json.loads(response.text)

+ 7 - 3
hg3535/spiders/lanqiu.py

@@ -52,7 +52,7 @@ class LanqiuSpider(scrapy.Spider):
         # newall_lists = ['am', 'ftht1x2', 'oe', 'tg', 'htft', 'cs', 'fglg', 'or']
         for y in range(1, 4):
             url = 'https://hg3535z.com/odds2/d/getodds?sid=2&pt='+str(y)+'&ubt=am&pn=0&sb=2&dc=null&pid=0'
-            yield scrapy.Request(url=url, callback=self.parse, meta={'pt': y,'dont_redirect': True})
+            yield scrapy.Request(url=url, callback=self.parse, meta={'pt': y})
 
     def parse(self, response):
         if response.text:
@@ -80,11 +80,14 @@ class LanqiuSpider(scrapy.Spider):
                             url = "https://hg3535z.com/odds2/d/getamodds?eid=" + game_id + "iip=false&ubt=am&isp=true"
                             yield Request(url=url, callback=self.parse_each, meta={'pt': pt})
     def parse_each(self, response):
-        new_datas = json.loads(response.text).get('eg', "")
         try:
+            new_datas = json.loads(response.text)['eg']
             pt = response.meta['pt']
+            lanqiu = json.loads(response.text)['i'][31]
         except:
             pt = 0
+            new_datas = ""
+            lanqiu = ""
         item = Lanqiu()
         if new_datas:
             # 联赛id
@@ -553,7 +556,7 @@ class LanqiuSpider(scrapy.Spider):
                 score_home = new_data[1]
             except:
                 score_home = ""
-            print(game_id)
+            # print(game_id)
             if score_home:
                 try:
                     score_homes = score_home["o"]["ou"]['v']
@@ -817,6 +820,7 @@ class LanqiuSpider(scrapy.Spider):
             item['capot'] = capots_dict
             item['team_score'] = team_scores_dict
             item['team_score_rule'] = team_scores_dict_rule
+            item['lanqiu'] = lanqiu
             yield item
 
 

+ 1 - 1
hg3535/spiders/liansai.py

@@ -21,8 +21,8 @@ class LanqiulsSpider(scrapy.Spider):
         for y in range(1, 5):
             for i in range(1, 5):
                 url = 'https://hg3535z.com/odds2/d/getcomps?sid='+str(y)+'&pt=' + str(i) + '&ubt=am&dc=null&pn=0&pid=0'
+                # yield scrapy.Request(url=url, callback=self.parse, dont_filter=True)
                 yield scrapy.Request(url=url, callback=self.parse)
-
     def parse(self, response):
         try:
             datas = json.loads(response.text)['gs']

+ 25 - 25
hg3535/spiders/wangqiu.py

@@ -22,7 +22,7 @@ class LanqiuSpider(scrapy.Spider):
         # newall_lists = ['am', 'ftht1x2', 'oe', 'tg', 'htft', 'cs', 'fglg', 'or']
         for y in range(1, 4):
             url = 'https://hg3535z.com/odds2/d/getodds?sid=3&pt='+str(y)+'&ubt=am&pn=0&sb=2&dc=null&pid=0'
-            yield scrapy.Request(url=url, callback=self.parse, meta={'pt': y, 'dont_redirect': True})
+            yield scrapy.Request(url=url, callback=self.parse, meta={'pt': y})
 
     def parse(self, response):
         if response.text:
@@ -48,16 +48,15 @@ class LanqiuSpider(scrapy.Spider):
                         if pt == 3:
                             url = "https://hg3535z.com/odds2/d/getamodds?eid=" + game_id + "&iip=false&ubt=am&isp=true"
                             yield Request(url=url, callback=self.parse_each, meta={'pt': pt})
-                        # http://hg3535z.com/odds2/d/getamodds?eid=3120299&iip=false&ubt=am&isp=false
     def parse_each(self, response):
         try:
             new_datas = json.loads(response.text)['eg']
-        except:
-            new_datas = ""
-        try:
             pt = response.meta['pt']
+            wangqiu = json.loads(response.text)['i'][31]
         except:
+            new_datas = ""
             pt = 0
+            wangqiu = ""
         if new_datas:
             # 联赛id
             league_id = new_datas["c"]["k"]
@@ -93,19 +92,19 @@ class LanqiuSpider(scrapy.Spider):
                 concedes_dict_rule = {}
                 try:
                     concedes = result['o']["ah"]["v"]
-                    concedes_dict_rule['concede_home'] = concedes[1]
-                    concedes_dict_rule['concede_guest'] = concedes[3]
+                    concedes_dict_rule['dishes_home'] = concedes[1]
+                    concedes_dict_rule['dishes_guest'] = concedes[3]
                     if pt is 3:
-                        concedes_dict['concede_home'] = float(concedes[5]) - 1
-                        concedes_dict['concede_guest'] = float(concedes[7]) - 1
+                        concedes_dict['dishes_home'] = float(concedes[5]) - 1
+                        concedes_dict['dishes_guest'] = float(concedes[7]) - 1
                     else:
-                        concedes_dict['concede_guest'] = concedes[7]
-                        concedes_dict['concede_home'] = float(concedes[5])
+                        concedes_dict['dishes_guest'] = concedes[7]
+                        concedes_dict['dishes_home'] = float(concedes[5])
                 except:
-                    concedes_dict_rule['concede_home'] = ""
-                    concedes_dict['concede_home'] = ""
-                    concedes_dict_rule['concede_guest'] = ""
-                    concedes_dict['concede_guest'] = ""
+                    concedes_dict_rule['dishes_home'] = ""
+                    concedes_dict['dishes_home'] = ""
+                    concedes_dict_rule['dishes_guest'] = ""
+                    concedes_dict['dishes_guest'] = ""
 # ---------------------------------------------------冠军----------------------------------------------------------------
                 kemps_dict = {}
                 try:
@@ -132,19 +131,19 @@ class LanqiuSpider(scrapy.Spider):
                 bureaus_dict_rule = {}
                 try:
                     bureaus = result['o']["ahfts"]["v"]
-                    bureaus_dict_rule['bureau_home'] = bureaus[1]
-                    bureaus_dict_rule['bureau_guest'] = bureaus[3]
+                    bureaus_dict_rule['concede_home'] = bureaus[1]
+                    bureaus_dict_rule['concede_guest'] = bureaus[3]
                     if pt is 3:
-                        bureaus_dict['bureau_home'] = float(bureaus[5]) - 1
-                        bureaus_dict['bureau_guest'] = float(bureaus[7]) - 1
+                        bureaus_dict['concede_home'] = float(bureaus[5]) - 1
+                        bureaus_dict['concede_guest'] = float(bureaus[7]) - 1
                     else:
-                        bureaus_dict['bureau_home'] = bureaus[5]
-                        bureaus_dict['bureau_guest'] = bureaus[7]
+                        bureaus_dict['concede_home'] = bureaus[5]
+                        bureaus_dict['concede_guest'] = bureaus[7]
                 except:
-                    bureaus_dict_rule['bureau_home'] = ""
-                    bureaus_dict['bureau_home'] = ""
-                    bureaus_dict_rule['bureau_guest'] = ""
-                    bureaus_dict['bureau_guest'] = ""
+                    bureaus_dict_rule['concede_home'] = ""
+                    bureaus_dict['concede_home'] = ""
+                    bureaus_dict_rule['concede_guest'] = ""
+                    bureaus_dict['concede_guest'] = ""
 
 # -----------------------------------------------------总局数:大/小------------------------------------------------------
                 total_number_dict = {}
@@ -223,6 +222,7 @@ class LanqiuSpider(scrapy.Spider):
                 # 总局数单双
                 item['odd_evens_dict'] = odd_evens_dict
                 item['odd_evens_dict_rule'] = odd_evens_dict_rule
+                item['wangqiu'] = wangqiu
                 yield item
 
 

+ 3 - 0
hg3535/spiders/zuqiu.py

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