Your Name 6 years ago
parent
commit
b64788784f
8 changed files with 562 additions and 505 deletions
  1. 144 83
      hg3535/.idea/workspace.xml
  2. 1 1
      hg3535/main.py
  3. 34 38
      hg3535/pipelines.py
  4. 12 12
      hg3535/settings.py
  5. 54 54
      hg3535/spiders/bangqiu.py
  6. 265 265
      hg3535/spiders/lanqiu.py
  7. 46 46
      hg3535/spiders/wangqiu.py
  8. 6 6
      hg3535/spiders/wqbodan.py

+ 144 - 83
hg3535/.idea/workspace.xml

@@ -2,11 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7fa42e97-ddea-4404-91db-5a9ccc162649" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/items.py" beforeDir="false" afterPath="$PROJECT_DIR$/items.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/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/lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/lanqiu.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" afterPath="$PROJECT_DIR$/spiders/wqbodan.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -16,7 +19,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="1557310176053" 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="1557371769499" 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" />
@@ -46,8 +49,8 @@
       <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="252">
-              <caret line="246" column="32" lean-forward="true" selection-start-line="246" selection-start-column="32" selection-end-line="246" selection-end-column="32" />
+            <state relative-caret-position="342">
+              <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" />
@@ -59,7 +62,7 @@
       <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="54">
+            <state relative-caret-position="-3402">
               <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" />
@@ -69,31 +72,55 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pipelines.py">
+        <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-144">
-              <caret line="45" column="29" lean-forward="true" selection-start-line="45" selection-start-column="29" selection-end-line="45" selection-end-column="29" />
+            <state relative-caret-position="3366">
+              <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#0#15#0" expanded="true" />
+                <element signature="e#24#35#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/settings.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="226">
-              <caret line="129" column="28" lean-forward="true" selection-start-line="129" selection-start-column="28" selection-end-line="129" selection-end-column="28" />
+            <state relative-caret-position="563">
+              <caret line="124" column="22" lean-forward="true" selection-start-line="124" selection-start-column="22" selection-end-line="124" selection-end-column="22" />
+            </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="342">
+              <caret line="19" lean-forward="true" 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="342">
+              <caret line="19" lean-forward="true" 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="true">
         <entry file="file://$PROJECT_DIR$/main.py">
           <provider selected="true" editor-type-id="text-editor">
             <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" />
+              <caret line="13" column="34" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="39" />
               <folding>
                 <element signature="e#0#10#0" expanded="true" />
               </folding>
@@ -101,6 +128,18 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pipelines.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="162">
+              <caret line="45" column="30" lean-forward="true" selection-start-line="45" selection-start-column="30" selection-end-line="45" selection-end-column="30" />
+              <folding>
+                <element signature="e#0#15#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -139,6 +178,8 @@
       <find>st_zq_league</find>
       <find>zqtwo_intodb</find>
       <find>odds_only</find>
+      <find>wq_</find>
+      <find>Zuqiustatus</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -179,16 +220,17 @@
         <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/wangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/guanjun.py" />
-        <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/wgbodan.py" />
         <option value="$PROJECT_DIR$/jianting.py" />
-        <option value="$PROJECT_DIR$/spiders/lanqiu.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$/items.py" />
+        <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/wangqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/wqbodan.py" />
         <option value="$PROJECT_DIR$/pipelines.py" />
         <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/settings.py" />
@@ -196,10 +238,10 @@
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="26" />
-    <option name="y" value="10" />
-    <option name="width" value="1309" />
-    <option name="height" value="1064" />
+    <option name="x" value="21" />
+    <option name="y" value="25" />
+    <option name="width" value="1492" />
+    <option name="height" value="1053" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -207,7 +249,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -215,11 +256,6 @@
               <item name="hg3535" type="b2602c69:ProjectViewProjectNode" />
               <item name="hg3535" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="hg3535" type="b2602c69:ProjectViewProjectNode" />
-              <item name="hg3535" type="462c0819:PsiDirectoryNode" />
-              <item name="spiders" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="hg3535" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
@@ -228,6 +264,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -445,7 +482,8 @@
       <workItem from="1556500244997" duration="22444000" />
       <workItem from="1556584868377" duration="15320000" />
       <workItem from="1557018228723" duration="19258000" />
-      <workItem from="1557293774618" duration="6910000" />
+      <workItem from="1557293774618" duration="7402000" />
+      <workItem from="1557364694196" duration="6105000" />
     </task>
     <task id="LOCAL-00001" summary="修改后,版本二">
       <created>1555727493584</created>
@@ -556,7 +594,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1333521000" />
+    <option name="totallyTimeSpent" value="1340118000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -568,10 +606,9 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
-    <editor active="true" />
+    <frame x="21" y="25" width="1492" height="1053" extended-state="1" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.13219616" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.2611732" />
       <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" />
@@ -584,9 +621,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.6630901" />
-      <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49573562" weight="0.16021505" />
+      <window_info active="true" anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49573562" visible="true" weight="0.42219803" />
       <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.41416308" />
+      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.4946695" weight="0.5767138" />
       <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" />
@@ -682,9 +719,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/spiders/bqguanjun.py" />
-    <entry file="file://$PROJECT_DIR$/spiders/wangqiuls.py" />
-    <entry file="file://$PROJECT_DIR$/spiders/bodan.py" />
     <entry file="file://$PROJECT_DIR$/spiders/duying.py" />
     <entry file="file://$PROJECT_DIR$/spiders/firstlast.py" />
     <entry file="file://$PROJECT_DIR$/spiders/halffull.py" />
@@ -852,127 +886,154 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="777">
-          <caret line="60" column="17" lean-forward="true" selection-start-line="60" selection-start-column="17" selection-end-line="60" selection-end-column="17" />
+        <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$/spiders/guanjun.py">
+    <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="273">
-          <caret line="37" column="21" selection-start-line="37" selection-start-column="17" selection-end-line="37" selection-end-column="21" />
+        <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://$PROJECT_DIR$/myspider/requests.seen" />
-    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+    <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="907">
-          <caret line="593" column="58" selection-start-line="593" selection-start-column="58" selection-end-line="593" selection-end-column="58" />
+        <state relative-caret-position="160">
+          <caret line="464" selection-start-line="464" selection-end-line="464" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/jianting.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="17" column="30" lean-forward="true" selection-start-line="17" selection-start-column="30" selection-end-line="17" selection-end-column="30" />
           <folding>
-            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#0#9#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/wgbodan.py" />
+    <entry file="file://$PROJECT_DIR$/requirements.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="735">
+          <caret line="62" selection-start-line="62" selection-end-line="62" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-846">
-          <caret line="32" column="16" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" />
+        <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" />
           <folding>
             <element signature="e#48#59#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/liansai.py">
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.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" />
+        <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" />
           <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">
+    <entry file="file://$PROJECT_DIR$/spiders/wqbodan.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="464" selection-start-line="464" selection-end-line="464" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/items.py">
+    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="246" column="32" lean-forward="true" selection-start-line="246" selection-start-column="32" selection-end-line="246" selection-end-column="32" />
+        <state relative-caret-position="-3402">
+          <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#320#1230#0" />
-            <element signature="e#1382#1528#0" />
+            <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/jianting.py">
+    <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="17" column="30" lean-forward="true" selection-start-line="17" selection-start-column="30" selection-end-line="17" selection-end-column="30" />
+        <state relative-caret-position="3366">
+          <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#0#9#0" expanded="true" />
+            <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
+    <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="129" column="14" selection-start-line="129" selection-start-column="14" selection-end-line="129" selection-end-column="14" />
+        <state relative-caret-position="342">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
           <folding>
-            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#25#40#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipelines.py">
+    <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-144">
-          <caret line="45" column="29" lean-forward="true" selection-start-line="45" selection-start-column="29" selection-end-line="45" selection-end-column="29" />
+        <state relative-caret-position="342">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
           <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$/items.py">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="342">
+          <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#0#10#0" expanded="true" />
+            <element signature="e#320#1230#0" />
+            <element signature="e#1382#1528#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/requirements.txt">
+    <entry file="file://$PROJECT_DIR$/pipelines.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="735">
-          <caret line="62" selection-start-line="62" selection-end-line="62" />
+        <state relative-caret-position="162">
+          <caret line="45" column="30" lean-forward="true" selection-start-line="45" selection-start-column="30" selection-end-line="45" selection-end-column="30" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/settings.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="226">
-          <caret line="129" column="28" lean-forward="true" selection-start-line="129" selection-start-column="28" selection-end-line="129" selection-end-column="28" />
+        <state relative-caret-position="563">
+          <caret line="124" column="22" lean-forward="true" selection-start-line="124" selection-start-column="22" selection-end-line="124" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/main.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="234">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="39" />
+          <folding>
+            <element signature="e#0#10#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

+ 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结束时间更新状态

+ 34 - 38
hg3535/pipelines.py

@@ -43,7 +43,7 @@ import psycopg2.extras
 
 
 # 生成哈希索引 sole
-from items import Zuqiustatus
+from .items import Zuqiustatus
 
 
 def hash_func(match_id, odds_code, sort, p_id):
@@ -795,38 +795,38 @@ class Lanqiupipeline(object):
         team_scores_dict = item['team_score']
         team_scores_dict_rule = item['team_score_rule']
         # 让球
-        concede = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 1, 'p_code': "lq_concede",
+        concede = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 1, 'p_code': "concede",
                    'source': "hg3535", 'expire_time': expire_time}
         # 让球 数据插入数据库
         one_intodb(data1=concedes_dict, data2=concede, data3=concedes_dict_rule, cursor=cursor, redis_db=self.redis_db)
 
-        two_sides = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 2, 'p_code': "lq_two_sides",
+        two_sides = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 2, 'p_code': "two_sides",
                      'source': "hg3535", 'expire_time': expire_time}
         # 总分单双 数据插入数据库
         one_intodb(data1=odd_evens_dict, data2=two_sides, data3=odd_evens_dict_rule, cursor=cursor, redis_db=self.redis_db)
 
-        total_size = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 3, 'p_code': "lq_total_size",
+        total_size = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 3, 'p_code': "total_size",
                       'source': "hg3535", 'expire_time': expire_time}
         # 全场总分大小 数据插入数据库
         one_intodb(data1=total_sizes_dict, data2=total_size, data3=total_sizes_dict_rule, cursor=cursor, redis_db=self.redis_db)
 
-        data4 = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 6, 'p_code': "lq_team_score",
+        data4 = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 6, 'p_code': "team_score",
                  'source': "hg3535", 'expire_time': expire_time}
         # 全场总分大小 数据插入数据库
         one_intodb(data1=team_scores_dict, data2=data4, data3=team_scores_dict_rule, cursor=cursor, redis_db=self.redis_db)
         # 主队进球最后一位数
         last_number_home = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 4,
-                            'p_code': "lq_last_number",
+                            'p_code': "last_number",
                             'source': "hg3535", 'expire_time': expire_time, 'sort': 0}
-        two_intodb(data1=last_numbers_dict['lq_last_home'], data2=last_number_home, data3="lq_last_home", cursor=cursor,redis_db=self.redis_db)
+        two_intodb(data1=last_numbers_dict['last_home'], data2=last_number_home, data3="last_home", cursor=cursor,redis_db=self.redis_db)
         # 客队进球最后一位数
         last_number_guest = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 4,
-                             'p_code': "lq_last_number",
+                             'p_code': "last_number",
                              'source': "hg3535", 'expire_time': expire_time, 'sort': 0}
-        two_intodb(data1=last_numbers_dict['lq_last_home'], data2=last_number_guest, data3="lq_last_guest",
+        two_intodb(data1=last_numbers_dict['last_home'], data2=last_number_guest, data3="last_guest",
                    cursor=cursor, redis_db=self.redis_db)
         # 独赢
-        capot_data = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 5, 'p_code': "lq_capot",
+        capot_data = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 5, 'p_code': "capot",
                       'source': "hg3535", 'expire_time': expire_time, 'sort': 0}
         three_intodb(data1=capots_dict, data2=capot_data, cursor=cursor, redis_db=self.redis_db)
         match_date, match_time, time3 = new_time(ctime)
@@ -942,19 +942,19 @@ class Wangqiupipeline(object):
         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': "wq_concede",
+        concede = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 1, 'p_code': "concede",
                    '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': "wq_bureau",
+        bureaus = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 3, 'p_code': "bureau",
                    '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)
 
         total_number = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 4,
-                        'p_code': "wq_total_number", 'source': "hg3535", 'expire_time': expire_time, 'sort': 0, 'pt': pt}
+                        'p_code': "total_number", 'source': "hg3535", 'expire_time': expire_time, 'sort': 0, 'pt': pt}
         wqone_intodb(data1=total_number_dict, data2=total_number, data3=total_number_dict_rule, cursor=cursor, redis_db=self.redis_db)
 
-        odd_evens = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 5, 'p_code': "wq_two_sides",
+        odd_evens = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 5, 'p_code': "two_sides",
                      'source': "hg3535", 'expire_time': expire_time, 'sort': 0, 'pt': pt}
         wqone_intodb(data1=odd_evens_dict, data2=odd_evens, data3=odd_evens_dict_rule, cursor=cursor, redis_db=self.redis_db)
         match_date, match_time, time3 = new_time(ctime)
@@ -971,12 +971,12 @@ class Wangqiupipeline(object):
                         self.redis_db.hset("hg3535_wangqiu", r_hash, 0)
                         sql1 = "insert into st_wq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,odds_only,expire_time) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s) on conflict(sole) do update set utime = %s,odds = %s,odds_only=%s;"
                         cursor.execute(sql1, (
-                            int(league_id), key, int(game_id), utime, utime, value, 2, "wq_kemp", 0, "hg3535", new_hash,
+                            int(league_id), key, int(game_id), utime, utime, value, 2, "kemp", 0, "hg3535", new_hash,
                             odds_only,expire_time, utime, value, odds_only))
                         # 更新主队st_zq_odds_record表
                         sql2 = "insert into st_wq_odds_record(lg_id, odds_code, match_id, ctime, utime,odds, p_id, p_code, sort, source,odds_only) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s);"
                         cursor.execute(sql2, (
-                            int(league_id), key, int(game_id), utime, utime, value, 2, "wq_kemp", 0, "hg3535", odds_only))
+                            int(league_id), key, int(game_id), utime, utime, value, 2, "kemp", 0, "hg3535", odds_only))
         us_time = ctime
         # 插入赛事表
         if pt is 1:
@@ -1068,18 +1068,18 @@ class Wqbodanpipeline(object):
         # 类型早盘,今日,滚球,串场
         pt = item['pt']
         bodan_datas = item['bodan_data']
-        p_code = "wq_bodan"
+        p_code = "bodan"
         p_id = 7
-        bodan_dict = {"wq_bodanhome_two_zero": "2-0", "wq_bodanhome_two_one": "2-1",
-                      "wq_bodanhome_three_zero": "3-0", "wq_bodanhome_three_one": "3-1",
-                      "wq_bodanhome_three_two": "3-2",
-                      "wq_bodanhome_four_zero": "4-0", "wq_bodanhome_four_one": "4-1",
-                      "wq_bodanhome_four_two": "4-2", "wq_bodanhome_four_three": "4-3",
-                      "wq_bodanguest_two_zero": "2-0", "wq_bodanguest_two_one": "2-1",
-                      "wq_bodanguest_three_zero": "3-0",
-                      "wq_bodanguest_three_one": "3-1", "wq_bodanguest_three_two": "3-2",
-                      "wq_bodanguest_four_zero": "4-0", "wq_bodanguest_four_one": "4-1",
-                      "wq_bodanguest_four_two": "4-2", "wq_bodanguest_four_three": "4-3"}
+        bodan_dict = {"bodanhome_two_zero": "2-0", "bodanhome_two_one": "2-1",
+                      "bodanhome_three_zero": "3-0", "bodanhome_three_one": "3-1",
+                      "bodanhome_three_two": "3-2",
+                      "bodanhome_four_zero": "4-0", "bodanhome_four_one": "4-1",
+                      "bodanhome_four_two": "4-2", "bodanhome_four_three": "4-3",
+                      "bodanguest_two_zero": "2-0", "bodanguest_two_one": "2-1",
+                      "bodanguest_three_zero": "3-0",
+                      "bodanguest_three_one": "3-1", "bodanguest_three_two": "3-2",
+                      "bodanguest_four_zero": "4-0", "bodanguest_four_one": "4-1",
+                      "bodanguest_four_two": "4-2", "bodanguest_four_three": "4-3"}
 
         if bodan_datas:
             for key, value in bodan_datas.items():
@@ -1189,15 +1189,15 @@ class Bangqiupipeline(object):
         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': "bq_concede",
+        concede = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 1, 'p_code': "concede",
                    'source': "hg3535", 'expire_time': expire_time, 'sort': 0, 'pt': pt}
         bqone_intodb(data1=concedes_dict, data2=concede, data3=concedes_dict_rule, cursor=cursor, redis_db=self.redis_db)
         # 总得分:大/小
-        total_size = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 2, 'p_code': "bq_total_size",
+        total_size = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 2, 'p_code': "total_size",
                       'source': "hg3535", 'expire_time': expire_time, 'sort': 0, 'pt': pt}
         bqone_intodb(data1=total_size_dict, data2=total_size, data3=total_size_dict_rule, cursor=cursor, redis_db=self.redis_db)
 
-        odd_even = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 3, 'p_code': "bq_two_sides",
+        odd_even = {'league_id': league_id, 'game_id': game_id, 'utime': utime, 'p_id': 3, 'p_code': "two_sides",
                     'source': "hg3535", 'expire_time': expire_time, 'sort': 0, 'pt': pt}
         bqone_intodb(data1=odd_evens_dict, data2=odd_even, data3=odd_evens_dict_rule, cursor=cursor, redis_db=self.redis_db)
         # 赛事失效时间
@@ -1216,12 +1216,12 @@ class Bangqiupipeline(object):
                         self.redis_db.hset("hg3535_bangqiu", r_hash, 0)
                         sql1 = "insert into st_bq_odds(lg_id, odds_code, match_id, ctime, utime, odds, p_id, p_code, sort, source, sole,odds_only,expire_time) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s, %s,%s) on conflict(sole) do update set utime = %s,odds = %s,odds_only=%s,expire_time=%s;"
                         cursor.execute(sql1, (
-                            int(league_id), key, int(game_id), utime, utime, value, 4, "bq_capot", 0, "hg3535", new_hash,
+                            int(league_id), key, int(game_id), utime, utime, value, 4, "capot", 0, "hg3535", new_hash,
                             odds_only, expire_time,utime, value, odds_only, expire_time))
                         # 更新主队st_zq_odds_record表
                         sql2 = "insert into st_bq_odds_record(lg_id, odds_code, match_id, ctime, utime,odds, p_id, p_code, sort, source,odds_only) values (%s, %s, %s, %s, %s, %s, %s,%s, %s, %s, %s);"
                         cursor.execute(sql2, (
-                            int(league_id), key, int(game_id), utime, utime, value, 4, "bq_capot", 0, "hg3535", odds_only))
+                            int(league_id), key, int(game_id), utime, utime, value, 4, "capot", 0, "hg3535", odds_only))
         us_time = ctime
         # 插入赛事表
         if pt == 1:
@@ -1468,10 +1468,6 @@ class Liansaipipeline(object):
         self.dbpool.close()
         # self.redis_db.disconnect()
 
-
-
-
-
 #************************************滚球-------------------------------------------------------------------------------
 
 
@@ -1886,8 +1882,8 @@ class BallStatuspipeline(object):
                 cursor.execute(sql3)
                 cursor.execute(sql4)
 
-        # 现在时间,时间戳
-        utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+    # 现在时间,时间戳
+    utime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
     def close_spider(self, spider):
         self.conn.close()
         self.dbpool.close()

+ 12 - 12
hg3535/settings.py

@@ -126,25 +126,25 @@ REDIRECT_ENABLED = False
 # RETRY_TIMES = 2
 # RETRY_HTTP_CODES = [500, 502, 503, 504, 400, 408]
 
-# POST_HOST = 'localhost'
-# POST_DATABASE = 'postgres'
-# POST_USER = 'postgres'
-# POST_PORT = '5433'
-# POST_PASSWORD = '123456'
+POST_HOST = 'localhost'
+POST_DATABASE = 'postgres'
+POST_USER = 'postgres'
+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 = '192.168.2.200'
+# POST_HOST = 'localhost'
 # POST_DATABASE = 'kaiyou'
 # POST_USER = 'kaiyou'
 # POST_PORT = '10432'

+ 54 - 54
hg3535/spiders/bangqiu.py

@@ -91,80 +91,80 @@ class BqrangqiuSpider(scrapy.Spider):
                     concedes_dict_rule = {}
                     try:
                         concedes = result['o']["ah"]["v"]
-                        concedes_dict_rule['bq_concede_home'] = concedes[1]
-                        concedes_dict_rule['bq_concede_guest'] = concedes[3]
+                        concedes_dict_rule['concede_home'] = concedes[1]
+                        concedes_dict_rule['concede_guest'] = concedes[3]
                         if pt is 3:
-                            concedes_dict['bq_concede_home'] = float(concedes[5]) - 1
-                            concedes_dict['bq_concede_guest'] = float(concedes[7]) - 1
+                            concedes_dict['concede_home'] = float(concedes[5]) - 1
+                            concedes_dict['concede_guest'] = float(concedes[7]) - 1
                         else:
-                            concedes_dict['bq_concede_home'] = float(concedes[5])
-                            concedes_dict['bq_concede_guest'] = float(concedes[7])
+                            concedes_dict['concede_home'] = float(concedes[5])
+                            concedes_dict['concede_guest'] = float(concedes[7])
                     except:
-                        concedes_dict_rule['bq_concede_home'] = ""
-                        concedes_dict['bq_concede_home'] = ""
-                        concedes_dict_rule['bq_concede_guest'] = ""
-                        concedes_dict['bq_concede_guest'] = ""
+                        concedes_dict_rule['concede_home'] = ""
+                        concedes_dict['concede_home'] = ""
+                        concedes_dict_rule['concede_guest'] = ""
+                        concedes_dict['concede_guest'] = ""
 # 让球 前5局-------------------------------------------------------------------------------------------------------------
                     try:
                         concedes = result['o']["ahf5in"]["v"]
-                        concedes_dict_rule['bq_five_concede_home'] = concedes[1]
-                        concedes_dict_rule['bq_five_concede_guest'] = concedes[3]
+                        concedes_dict_rule['five_concede_home'] = concedes[1]
+                        concedes_dict_rule['five_concede_guest'] = concedes[3]
                         if pt is 3:
-                            concedes_dict['bq_five_concede_home'] = float(concedes[5]) - 1
-                            concedes_dict['bq_five_concede_guest'] = float(concedes[7]) - 1
+                            concedes_dict['five_concede_home'] = float(concedes[5]) - 1
+                            concedes_dict['five_concede_guest'] = float(concedes[7]) - 1
                         else:
-                            concedes_dict['bq_five_concede_home'] = concedes[5]
-                            concedes_dict['bq_five_concede_guest'] = concedes[7]
+                            concedes_dict['five_concede_home'] = concedes[5]
+                            concedes_dict['five_concede_guest'] = concedes[7]
                     except:
-                        concedes_dict_rule['bq_five_concede_home'] = ""
-                        concedes_dict['bq_five_concede_home'] = ""
-                        concedes_dict_rule['bq_five_concede_guest'] = ""
-                        concedes_dict['bq_five_concede_guest'] = ""
+                        concedes_dict_rule['five_concede_home'] = ""
+                        concedes_dict['five_concede_home'] = ""
+                        concedes_dict_rule['five_concede_guest'] = ""
+                        concedes_dict['five_concede_guest'] = ""
 # ---------------------------------------------------独赢----------------------------------------------------------------
                     capots_dict = {}
                     try:
                         capots = result['o']["ml"]["v"]
-                        capots_dict['bq_capot_home'] = capots[1]
-                        capots_dict['bq_capot_guest'] = capots[3]
+                        capots_dict['capot_home'] = capots[1]
+                        capots_dict['capot_guest'] = capots[3]
 
                     except:
-                        capots_dict['bq_capot_home'] = ""
-                        capots_dict['bq_capot_guest'] = ""
+                        capots_dict['capot_home'] = ""
+                        capots_dict['capot_guest'] = ""
 # ---------------------------------------------------总得分:大/小--------------------------------------------------------
 
                     total_size_dict = {}
                     total_size_dict_rule = {}
                     try:
                         total_sizes = result['o']["ou"]["v"]
-                        total_size_dict_rule['bq_total_number_big'] = total_sizes[1]
-                        total_size_dict_rule['bq_total_number_small'] = total_sizes[3]
+                        total_size_dict_rule['total_number_big'] = total_sizes[1]
+                        total_size_dict_rule['total_number_small'] = total_sizes[3]
                         if pt is 3:
-                            total_size_dict['bq_total_number_big'] = float(total_sizes[5]) - 1
-                            total_size_dict['bq_total_number_small'] = float(total_sizes[7]) - 1
+                            total_size_dict['total_number_big'] = float(total_sizes[5]) - 1
+                            total_size_dict['total_number_small'] = float(total_sizes[7]) - 1
                         else:
-                            total_size_dict['bq_total_number_big'] = total_sizes[5]
-                            total_size_dict['bq_total_number_small'] = total_sizes[7]
+                            total_size_dict['total_number_big'] = total_sizes[5]
+                            total_size_dict['total_number_small'] = total_sizes[7]
                     except:
-                        total_size_dict_rule['bq_total_number_big'] = ""
-                        total_size_dict['bq_total_number_big'] = ""
-                        total_size_dict_rule['bq_total_number_small'] = ""
-                        total_size_dict['bq_total_number_small'] = ""
+                        total_size_dict_rule['total_number_big'] = ""
+                        total_size_dict['total_number_big'] = ""
+                        total_size_dict_rule['total_number_small'] = ""
+                        total_size_dict['total_number_small'] = ""
 # 总得分: 大/小 前5局-----------------------------------------------------------------------------------------------------
                     try:
                         total_sizes = result['o']["ouf5in"]["v"]
-                        total_size_dict_rule['bq_five_total_number_big'] = total_sizes[1]
-                        total_size_dict_rule['bq_five_total_number_small'] = total_sizes[3]
+                        total_size_dict_rule['five_total_number_big'] = total_sizes[1]
+                        total_size_dict_rule['five_total_number_small'] = total_sizes[3]
                         if pt is 3:
-                            total_size_dict['bq_five_total_number_big'] = float(total_sizes[5]) - 1
-                            total_size_dict['bq_five_total_number_small'] = float(total_sizes[7]) - 1
+                            total_size_dict['five_total_number_big'] = float(total_sizes[5]) - 1
+                            total_size_dict['five_total_number_small'] = float(total_sizes[7]) - 1
                         else:
-                            total_size_dict['bq_five_total_number_big'] = total_sizes[5]
-                            total_size_dict['bq_five_total_number_small'] = total_sizes[7]
+                            total_size_dict['five_total_number_big'] = total_sizes[5]
+                            total_size_dict['five_total_number_small'] = total_sizes[7]
                     except:
-                        total_size_dict_rule['bq_five_total_number_big'] = ""
-                        total_size_dict['bq_five_total_number_big'] = ""
-                        total_size_dict_rule['bq_five_total_number_small'] = ""
-                        total_size_dict['bq_five_total_number_small'] = ""
+                        total_size_dict_rule['five_total_number_big'] = ""
+                        total_size_dict['five_total_number_big'] = ""
+                        total_size_dict_rule['five_total_number_small'] = ""
+                        total_size_dict['five_total_number_small'] = ""
 
 # ------------------------------------------------------总得分:单/双-----------------------------------------------------
                     odd_evens_dict = {}
@@ -172,20 +172,20 @@ class BqrangqiuSpider(scrapy.Spider):
                     try:
                         odd_evens = result['o']["oe"]["v"]
                         # 上半场 主队让球条件
-                        odd_evens_dict_rule['bq_two_sides_single'] = "单"
-                        odd_evens_dict_rule['bq_two_sides_double'] = "双"
+                        odd_evens_dict_rule['two_sides_single'] = "单"
+                        odd_evens_dict_rule['two_sides_double'] = "双"
                         if pt is 3:
-                            odd_evens_dict['bq_two_sides_single'] = float(odd_evens[1]) - 1
-                            odd_evens_dict['bq_two_sides_double'] = float(odd_evens[3]) - 1
+                            odd_evens_dict['two_sides_single'] = float(odd_evens[1]) - 1
+                            odd_evens_dict['two_sides_double'] = float(odd_evens[3]) - 1
                         else:
-                            odd_evens_dict['bq_two_sides_single'] = odd_evens[1]
-                            odd_evens_dict['bq_two_sides_double'] = odd_evens[3]
+                            odd_evens_dict['two_sides_single'] = odd_evens[1]
+                            odd_evens_dict['two_sides_double'] = odd_evens[3]
 
                     except:
-                        odd_evens_dict['bq_two_sides_single'] = ""
-                        odd_evens_dict['bq_two_sides_single'] = ""
-                        odd_evens_dict_rule['bq_two_sides_double'] = ""
-                        odd_evens_dict_rule['bq_two_sides_double'] = ""
+                        odd_evens_dict['two_sides_single'] = ""
+                        odd_evens_dict['two_sides_single'] = ""
+                        odd_evens_dict_rule['two_sides_double'] = ""
+                        odd_evens_dict_rule['two_sides_double'] = ""
 
                     # 联赛id
                     item['league_id'] = league_id

+ 265 - 265
hg3535/spiders/lanqiu.py

@@ -123,110 +123,110 @@ class LanqiuSpider(scrapy.Spider):
                 # print(concedes)
                 # 主队让球条件,主队让球赔率,客队让球条件,客队让球赔率
                 concede_home_rule,concede_home,concede_guest_rule,concede_guest=rangqiu_daxiao(inner=concedes, pt=pt)
-                concedes_dict_rule['lq_concede_home'] = concede_home_rule
-                concedes_dict['lq_concede_home'] = concede_home
-                concedes_dict_rule['lq_concede_guest'] = concede_guest_rule
-                concedes_dict['lq_concede_guest'] = concede_guest
+                concedes_dict_rule['concede_home'] = concede_home_rule
+                concedes_dict['concede_home'] = concede_home
+                concedes_dict_rule['concede_guest'] = concede_guest_rule
+                concedes_dict['concede_guest'] = concede_guest
             except:
                 concede_guest = ""
                 concede_guest_rule = ""
                 concede_home = ""
                 concede_home_rule = ""
-                concedes_dict_rule['lq_concede_home'] = concede_home_rule
-                concedes_dict['lq_concede_home'] = concede_home
-                concedes_dict_rule['lq_concede_guest'] = concede_guest_rule
-                concedes_dict['lq_concede_guest'] = concede_guest
+                concedes_dict_rule['concede_home'] = concede_home_rule
+                concedes_dict['concede_home'] = concede_home
+                concedes_dict_rule['concede_guest'] = concede_guest_rule
+                concedes_dict['concede_guest'] = concede_guest
             # print(concedes_dict)
             try:
                 half_concedes = result['o']["ah1st"]["v"]
                 # 上半场 主队让球条件
                 half_concede_home_rule, half_concede_home, half_concede_guest_rule, half_concede_guest=rangqiu_daxiao(inner=half_concedes, pt=pt)
-                concedes_dict_rule['lq_half_concede_home'] = half_concede_home_rule
-                concedes_dict['lq_half_concede_home'] = half_concede_home
-                concedes_dict_rule['lq_half_concede_guest'] = half_concede_guest_rule
-                concedes_dict['lq_half_concede_guest'] = half_concede_guest
+                concedes_dict_rule['half_concede_home'] = half_concede_home_rule
+                concedes_dict['half_concede_home'] = half_concede_home
+                concedes_dict_rule['half_concede_guest'] = half_concede_guest_rule
+                concedes_dict['half_concede_guest'] = half_concede_guest
 
             except:
                 half_concede_home_rule = ""
                 half_concede_home = ""
                 half_concede_guest_rule = ""
                 half_concede_guest = ""
-                concedes_dict_rule['lq_half_concede_home'] = half_concede_home_rule
-                concedes_dict['lq_half_concede_home'] = half_concede_home
-                concedes_dict_rule['lq_half_concede_guest'] = half_concede_guest_rule
-                concedes_dict['lq_half_concede_guest'] = half_concede_guest
+                concedes_dict_rule['half_concede_home'] = half_concede_home_rule
+                concedes_dict['half_concede_home'] = half_concede_home
+                concedes_dict_rule['half_concede_guest'] = half_concede_guest_rule
+                concedes_dict['half_concede_guest'] = half_concede_guest
 
             # 第一节让球
             try:
                 one_concedes = result['o']["ahq1"]["v"]
                 one_concede_home_rule,one_concede_home,one_concede_guest_rule,one_concede_guest = rangqiu_daxiao(inner=one_concedes, pt=pt)
-                concedes_dict_rule['lq_one_concede_home'] = one_concede_home_rule
-                concedes_dict['lq_one_concede_home'] = one_concede_home
-                concedes_dict_rule['lq_one_concede_guest'] = one_concede_guest_rule
-                concedes_dict['lq_one_concede_guest'] = one_concede_guest
+                concedes_dict_rule['one_concede_home'] = one_concede_home_rule
+                concedes_dict['one_concede_home'] = one_concede_home
+                concedes_dict_rule['one_concede_guest'] = one_concede_guest_rule
+                concedes_dict['one_concede_guest'] = one_concede_guest
 
             except:
                 one_concede_guest = ""
                 one_concede_guest_rule = ""
                 one_concede_home = ""
                 one_concede_home_rule = ""
-                concedes_dict['lq_one_concede_home_rule'] = one_concede_home_rule
-                concedes_dict['lq_one_concede_home'] = one_concede_home
-                concedes_dict['lq_one_concede_guest_rule'] = one_concede_guest_rule
-                concedes_dict['lq_one_concede_guest'] = one_concede_guest
+                concedes_dict['one_concede_home_rule'] = one_concede_home_rule
+                concedes_dict['one_concede_home'] = one_concede_home
+                concedes_dict['one_concede_guest_rule'] = one_concede_guest_rule
+                concedes_dict['one_concede_guest'] = one_concede_guest
             # 第二节让球
             try:
                 two_concedes = result['o']["ahq2"]["v"]
                 two_concede_home_rule,two_concede_home,two_concede_guest_rule,two_concede_guest = rangqiu_daxiao(inner=two_concedes, pt=pt)
-                concedes_dict_rule['lq_two_concede_home'] = two_concede_home_rule
-                concedes_dict['lq_two_concede_home'] = two_concede_home
-                concedes_dict_rule['lq_two_concede_guest'] = two_concede_guest_rule
-                concedes_dict['lq_two_concede_guest'] = two_concede_guest
+                concedes_dict_rule['two_concede_home'] = two_concede_home_rule
+                concedes_dict['two_concede_home'] = two_concede_home
+                concedes_dict_rule['two_concede_guest'] = two_concede_guest_rule
+                concedes_dict['two_concede_guest'] = two_concede_guest
             except:
                 two_concede_guest = ""
                 two_concede_guest_rule = ""
                 two_concede_home = ""
                 two_concede_home_rule = ""
-                concedes_dict_rule['lq_two_concede_home'] = two_concede_home_rule
-                concedes_dict['lq_two_concede_home'] = two_concede_home
-                concedes_dict_rule['lq_two_concede_guest'] = two_concede_guest_rule
-                concedes_dict['lq_two_concede_guest'] = two_concede_guest
+                concedes_dict_rule['two_concede_home'] = two_concede_home_rule
+                concedes_dict['two_concede_home'] = two_concede_home
+                concedes_dict_rule['two_concede_guest'] = two_concede_guest_rule
+                concedes_dict['two_concede_guest'] = two_concede_guest
             # 第三节让球
             try:
                 three_concedes = result['o']["ahq3"]["v"]
                 three_concede_home_rule,three_concede_home,three_concede_guest_rule,three_concede_guest = rangqiu_daxiao(inner=three_concedes, pt=pt)
-                concedes_dict_rule['lq_three_concede_home'] = three_concede_home_rule
-                concedes_dict['lq_three_concede_home'] = three_concede_home
-                concedes_dict_rule['lq_three_concede_guest'] = three_concede_guest_rule
-                concedes_dict['lq_three_concede_guest'] = three_concede_guest
+                concedes_dict_rule['three_concede_home'] = three_concede_home_rule
+                concedes_dict['three_concede_home'] = three_concede_home
+                concedes_dict_rule['three_concede_guest'] = three_concede_guest_rule
+                concedes_dict['three_concede_guest'] = three_concede_guest
 
             except:
                 three_concede_guest = ""
                 three_concede_guest_rule = ""
                 three_concede_home = ""
                 three_concede_home_rule = ""
-                concedes_dict_rule['lq_three_concede_home'] = three_concede_home_rule
-                concedes_dict['lq_three_concede_home'] = three_concede_home
-                concedes_dict_rule['lq_three_concede_guest'] = three_concede_guest_rule
-                concedes_dict['lq_three_concede_guest'] = three_concede_guest
+                concedes_dict_rule['three_concede_home'] = three_concede_home_rule
+                concedes_dict['three_concede_home'] = three_concede_home
+                concedes_dict_rule['three_concede_guest'] = three_concede_guest_rule
+                concedes_dict['three_concede_guest'] = three_concede_guest
             # 第四节让球
             try:
                 four_concedes = result['o']["ahq4"]["v"]
                 four_concede_home_rule,four_concede_home,four_concede_guest_rule,four_concede_guest = rangqiu_daxiao(inner=four_concedes, pt=pt)
-                concedes_dict_rule['lq_four_concede_home'] = four_concede_home_rule
-                concedes_dict['lq_four_concede_home'] = four_concede_home
-                concedes_dict_rule['lq_four_concede_guest'] = four_concede_guest_rule
-                concedes_dict['lq_four_concede_guest'] = four_concede_guest
+                concedes_dict_rule['four_concede_home'] = four_concede_home_rule
+                concedes_dict['four_concede_home'] = four_concede_home
+                concedes_dict_rule['four_concede_guest'] = four_concede_guest_rule
+                concedes_dict['four_concede_guest'] = four_concede_guest
 
             except:
                 four_concede_guest = ""
                 four_concede_guest_rule = ""
                 four_concede_home = ""
                 four_concede_home_rule = ""
-                concedes_dict_rule['lq_four_concede_home'] = four_concede_home_rule
-                concedes_dict['lq_four_concede_home'] = four_concede_home
-                concedes_dict_rule['lq_four_concede_guest'] = four_concede_guest_rule
-                concedes_dict['lq_four_concede_guest'] = four_concede_guest
+                concedes_dict_rule['four_concede_home'] = four_concede_home_rule
+                concedes_dict['four_concede_home'] = four_concede_home
+                concedes_dict_rule['four_concede_guest'] = four_concede_guest_rule
+                concedes_dict['four_concede_guest'] = four_concede_guest
 # ----------------------------------------总分大小分割线 - ---------------------------------------------------------------
             # 全场总分大小
             total_sizes_dict = {}
@@ -234,104 +234,104 @@ class LanqiuSpider(scrapy.Spider):
             try:
                 total_sizes = result['o']["ou"]["v"]
                 total_sizes_big_rule,total_sizes_big,total_sizes_small_rule,total_sizes_small = rangqiu_daxiao(inner=total_sizes, pt=pt)
-                total_sizes_dict_rule["lq_total_sizes_big"] = total_sizes_big_rule
-                total_sizes_dict["lq_total_sizes_big"] = total_sizes_big
-                total_sizes_dict_rule["lq_total_sizes_small"] = total_sizes_small_rule
-                total_sizes_dict["lq_total_sizes_small"] = total_sizes_small
+                total_sizes_dict_rule["total_sizes_big"] = total_sizes_big_rule
+                total_sizes_dict["total_sizes_big"] = total_sizes_big
+                total_sizes_dict_rule["total_sizes_small"] = total_sizes_small_rule
+                total_sizes_dict["total_sizes_small"] = total_sizes_small
             except:
                 total_sizes_big_rule = ""
                 total_sizes_big = ""
                 total_sizes_small_rule = ""
                 total_sizes_small = ""
-                total_sizes_dict_rule["lq_total_sizes_big"] = total_sizes_big_rule
-                total_sizes_dict["lq_total_sizes_big"] = total_sizes_big
-                total_sizes_dict_rule["lq_total_sizes_small"] = total_sizes_small_rule
-                total_sizes_dict["lq_total_sizes_small"] = total_sizes_small
+                total_sizes_dict_rule["total_sizes_big"] = total_sizes_big_rule
+                total_sizes_dict["total_sizes_big"] = total_sizes_big
+                total_sizes_dict_rule["total_sizes_small"] = total_sizes_small_rule
+                total_sizes_dict["total_sizes_small"] = total_sizes_small
             # 上半场总分大小
             try:
                 half_total_sizes = result['o']["ou1st"]["v"]
                 half_total_sizes_big_rule,half_total_sizes_big,half_total_sizes_small_rule,half_total_sizes_small = rangqiu_daxiao(inner=half_total_sizes, pt=pt)
-                total_sizes_dict_rule["lq_half_total_sizes_big"] = half_total_sizes_big_rule
-                total_sizes_dict["lq_half_total_sizes_big"] = half_total_sizes_big
-                total_sizes_dict_rule["lq_half_total_sizes_small"] = half_total_sizes_small_rule
-                total_sizes_dict["lq_half_total_sizes_small"] = half_total_sizes_small
+                total_sizes_dict_rule["half_total_sizes_big"] = half_total_sizes_big_rule
+                total_sizes_dict["half_total_sizes_big"] = half_total_sizes_big
+                total_sizes_dict_rule["half_total_sizes_small"] = half_total_sizes_small_rule
+                total_sizes_dict["half_total_sizes_small"] = half_total_sizes_small
             except:
                 half_total_sizes_big_rule = ""
                 half_total_sizes_big = ""
                 half_total_sizes_small_rule = ""
                 half_total_sizes_small = ""
-                total_sizes_dict_rule["lq_half_total_sizes_big"] = half_total_sizes_big_rule
-                total_sizes_dict["lq_half_total_sizes_big"] = half_total_sizes_big
-                total_sizes_dict_rule["lq_half_total_sizes_small"] = half_total_sizes_small_rule
-                total_sizes_dict["lq_half_total_sizes_small"] = half_total_sizes_small
+                total_sizes_dict_rule["half_total_sizes_big"] = half_total_sizes_big_rule
+                total_sizes_dict["half_total_sizes_big"] = half_total_sizes_big
+                total_sizes_dict_rule["half_total_sizes_small"] = half_total_sizes_small_rule
+                total_sizes_dict["half_total_sizes_small"] = half_total_sizes_small
             # 第一节总分大小
             try:
                 one_total_sizes = result['o']["ou1st"]["v"]
                 one_total_sizes_big_rule,one_total_sizes_big,one_total_sizes_small_rule,one_total_sizes_small = rangqiu_daxiao(inner=one_total_sizes, pt=pt)
-                total_sizes_dict_rule["lq_one_total_sizes_big"] = one_total_sizes_big_rule
-                total_sizes_dict["lq_one_total_sizes_big"] = one_total_sizes_big
-                total_sizes_dict_rule["lq_one_total_sizes_small"] = one_total_sizes_small_rule
-                total_sizes_dict["lq_one_total_sizes_small"] = one_total_sizes_small
+                total_sizes_dict_rule["one_total_sizes_big"] = one_total_sizes_big_rule
+                total_sizes_dict["one_total_sizes_big"] = one_total_sizes_big
+                total_sizes_dict_rule["one_total_sizes_small"] = one_total_sizes_small_rule
+                total_sizes_dict["one_total_sizes_small"] = one_total_sizes_small
             except:
                 one_total_sizes_big_rule = ""
                 one_total_sizes_big = ""
                 one_total_sizes_small_rule = ""
                 one_total_sizes_small = ""
-                total_sizes_dict_rule["lq_one_total_sizes_big"] = one_total_sizes_big_rule
-                total_sizes_dict["lq_one_total_sizes_big"] = one_total_sizes_big
-                total_sizes_dict_rule["lq_one_total_sizes_small"] = one_total_sizes_small_rule
-                total_sizes_dict["lq_one_total_sizes_small"] = one_total_sizes_small
+                total_sizes_dict_rule["one_total_sizes_big"] = one_total_sizes_big_rule
+                total_sizes_dict["one_total_sizes_big"] = one_total_sizes_big
+                total_sizes_dict_rule["one_total_sizes_small"] = one_total_sizes_small_rule
+                total_sizes_dict["one_total_sizes_small"] = one_total_sizes_small
             # 第二节场总分大小
             try:
                 two_total_sizes = result['o']["ou1st"]["v"]
                 two_total_sizes_big_rule,two_total_sizes_big,two_total_sizes_small_rule,two_total_sizes_small = rangqiu_daxiao(inner=two_total_sizes, pt=pt)
-                total_sizes_dict_rule["lq_two_total_sizes_big"] = two_total_sizes_big_rule
-                total_sizes_dict["lq_two_total_sizes_big"] = two_total_sizes_big
-                total_sizes_dict_rule["lq_two_total_sizes_small"] = two_total_sizes_small_rule
-                total_sizes_dict["lq_two_total_sizes_small"] = two_total_sizes_small
+                total_sizes_dict_rule["two_total_sizes_big"] = two_total_sizes_big_rule
+                total_sizes_dict["two_total_sizes_big"] = two_total_sizes_big
+                total_sizes_dict_rule["two_total_sizes_small"] = two_total_sizes_small_rule
+                total_sizes_dict["two_total_sizes_small"] = two_total_sizes_small
             except:
                 two_total_sizes_big_rule = ""
                 two_total_sizes_big = ""
                 two_total_sizes_small_rule = ""
                 two_total_sizes_small = ""
-                total_sizes_dict_rule["lq_two_total_sizes_big"] = two_total_sizes_big_rule
-                total_sizes_dict["lq_two_total_sizes_big"] = two_total_sizes_big
-                total_sizes_dict_rule["lq_two_total_sizes_small"] = two_total_sizes_small_rule
-                total_sizes_dict["lq_two_total_sizes_small"] = two_total_sizes_small
+                total_sizes_dict_rule["two_total_sizes_big"] = two_total_sizes_big_rule
+                total_sizes_dict["two_total_sizes_big"] = two_total_sizes_big
+                total_sizes_dict_rule["two_total_sizes_small"] = two_total_sizes_small_rule
+                total_sizes_dict["two_total_sizes_small"] = two_total_sizes_small
             # 第三节总分大小
             try:
                 three_total_sizes = result['o']["ou1st"]["v"]
                 three_total_sizes_big_rule,three_total_sizes_big,three_total_sizes_small_rule,three_total_sizes_small = rangqiu_daxiao(inner=three_total_sizes, pt=pt)
-                total_sizes_dict_rule["lq_three_total_sizes_big"] = three_total_sizes_big_rule
-                total_sizes_dict["lq_three_total_sizes_big"] = three_total_sizes_big
-                total_sizes_dict_rule["lq_three_total_sizes_small"] = three_total_sizes_small_rule
-                total_sizes_dict["lq_three_total_sizes_small"] = three_total_sizes_small
+                total_sizes_dict_rule["three_total_sizes_big"] = three_total_sizes_big_rule
+                total_sizes_dict["three_total_sizes_big"] = three_total_sizes_big
+                total_sizes_dict_rule["three_total_sizes_small"] = three_total_sizes_small_rule
+                total_sizes_dict["three_total_sizes_small"] = three_total_sizes_small
             except:
                 three_total_sizes_big_rule = ""
                 three_total_sizes_big = ""
                 three_total_sizes_small_rule = ""
                 three_total_sizes_small = ""
-                total_sizes_dict_rule["lq_three_total_sizes_big"] = three_total_sizes_big_rule
-                total_sizes_dict["lq_three_total_sizes_big"] = three_total_sizes_big
-                total_sizes_dict_rule["lq_three_total_sizes_small"] = three_total_sizes_small_rule
-                total_sizes_dict["lq_three_total_sizes_small"] = three_total_sizes_small
+                total_sizes_dict_rule["three_total_sizes_big"] = three_total_sizes_big_rule
+                total_sizes_dict["three_total_sizes_big"] = three_total_sizes_big
+                total_sizes_dict_rule["three_total_sizes_small"] = three_total_sizes_small_rule
+                total_sizes_dict["three_total_sizes_small"] = three_total_sizes_small
             # 第四节总分大小
             try:
                 four_total_sizes = result['o']["ou1st"]["v"]
                 four_total_sizes_big_rule,four_total_sizes_big,four_total_sizes_small_rule,four_total_sizes_small = rangqiu_daxiao(inner=four_total_sizes, pt=pt)
-                total_sizes_dict_rule["lq_four_total_sizes_big"] = four_total_sizes_big_rule
-                total_sizes_dict["lq_four_total_sizes_big"] = four_total_sizes_big
-                total_sizes_dict_rule["lq_four_total_sizes_small"] = four_total_sizes_small_rule
-                total_sizes_dict["lq_four_total_sizes_small"] = four_total_sizes_small
+                total_sizes_dict_rule["four_total_sizes_big"] = four_total_sizes_big_rule
+                total_sizes_dict["four_total_sizes_big"] = four_total_sizes_big
+                total_sizes_dict_rule["four_total_sizes_small"] = four_total_sizes_small_rule
+                total_sizes_dict["four_total_sizes_small"] = four_total_sizes_small
             except:
                 four_total_sizes_big_rule = ""
                 four_total_sizes_big = ""
                 four_total_sizes_small_rule = ""
                 four_total_sizes_small = ""
-                total_sizes_dict_rule["lq_four_total_sizes_big"] = four_total_sizes_big_rule
-                total_sizes_dict["lq_four_total_sizes_big"] = four_total_sizes_big
-                total_sizes_dict_rule["lq_four_total_sizes_small"] = four_total_sizes_small_rule
-                total_sizes_dict["lq_four_total_sizes_small"] = four_total_sizes_small
+                total_sizes_dict_rule["four_total_sizes_big"] = four_total_sizes_big_rule
+                total_sizes_dict["four_total_sizes_big"] = four_total_sizes_big
+                total_sizes_dict_rule["four_total_sizes_small"] = four_total_sizes_small_rule
+                total_sizes_dict["four_total_sizes_small"] = four_total_sizes_small
 
 # ----------------------------------------总分单双分割线------------------------------------------------------------------
             # 全场 总分单双
@@ -341,85 +341,85 @@ class LanqiuSpider(scrapy.Spider):
                 odd_evens = result['o']["oe"]["v"]
                 # # 全场 总分单, 全场 总分双
                 odd_even_odd, odd_even_even = danshaung_fun(inner=odd_evens)
-                odd_evens_dict["lq_two_sides_single"] = odd_even_odd
-                odd_evens_dict_rule['lq_two_sides_single'] = '单'
-                odd_evens_dict["lq_two_sides_double"] = odd_even_even
-                odd_evens_dict_rule['lq_two_sides_double'] = '双'
+                odd_evens_dict["two_sides_single"] = odd_even_odd
+                odd_evens_dict_rule['two_sides_single'] = '单'
+                odd_evens_dict["two_sides_double"] = odd_even_even
+                odd_evens_dict_rule['two_sides_double'] = '双'
             except:
                 odd_even_odd = ""
                 odd_even_even = ""
-                odd_evens_dict["lq_two_sides_single"] = odd_even_odd
-                odd_evens_dict_rule['lq_two_sides_single'] = '单'
-                odd_evens_dict["lq_two_sides_double"] = odd_even_even
-                odd_evens_dict_rule['lq_two_sides_double'] = '双'
+                odd_evens_dict["two_sides_single"] = odd_even_odd
+                odd_evens_dict_rule['two_sides_single'] = '单'
+                odd_evens_dict["two_sides_double"] = odd_even_even
+                odd_evens_dict_rule['two_sides_double'] = '双'
             # 上半场全场 总分单双
 
             try:
                 half_odd_evens = result['o']["oe1st"]["v"]
                 # 上半场 总分单, 上半场 总分双
                 half_odd_even_odd,half_odd_even_even = danshaung_fun(inner=half_odd_evens)
-                odd_evens_dict["lq_two_sides_single"] = half_odd_even_odd
-                odd_evens_dict_rule['lq_two_sides_single'] = '单'
-                odd_evens_dict["lq_two_sides_double"] = half_odd_even_even
-                odd_evens_dict_rule['lq_two_sides_double'] = '双'
+                odd_evens_dict["two_sides_single"] = half_odd_even_odd
+                odd_evens_dict_rule['two_sides_single'] = '单'
+                odd_evens_dict["two_sides_double"] = half_odd_even_even
+                odd_evens_dict_rule['two_sides_double'] = '双'
             except:
                 half_odd_even_odd = ""
                 half_odd_even_even = ""
-                odd_evens_dict["lq_half_two_sides_single"] = half_odd_even_odd
-                odd_evens_dict_rule['lq_half_two_sides_single'] = '单'
-                odd_evens_dict["lq_half_two_sides_double"] = half_odd_even_even
-                odd_evens_dict_rule['lq_half_two_sides_double'] = '双'
+                odd_evens_dict["half_two_sides_single"] = half_odd_even_odd
+                odd_evens_dict_rule['half_two_sides_single'] = '单'
+                odd_evens_dict["half_two_sides_double"] = half_odd_even_even
+                odd_evens_dict_rule['half_two_sides_double'] = '双'
 
             # 总分:单/双-第一节
             try:
                 one_odd_evens = result['o']["oeq1"]["v"]
                 one_odd_even_odd,one_odd_even_even = danshaung_fun(inner=one_odd_evens)
-                odd_evens_dict["lq_one_two_sides_single"] = one_odd_even_odd
-                odd_evens_dict_rule['lq_one_two_sides_single'] = '单'
-                odd_evens_dict["lq_one_two_sides_double"] = one_odd_even_even
-                odd_evens_dict_rule['lq_one_two_sides_double'] = '双'
+                odd_evens_dict["one_two_sides_single"] = one_odd_even_odd
+                odd_evens_dict_rule['one_two_sides_single'] = '单'
+                odd_evens_dict["one_two_sides_double"] = one_odd_even_even
+                odd_evens_dict_rule['one_two_sides_double'] = '双'
             except:
                 one_odd_even_odd = ""
                 one_odd_even_even = ""
-                odd_evens_dict["lq_one_two_sides_single"] = one_odd_even_odd
-                odd_evens_dict_rule['lq_one_two_sides_single'] = '单'
-                odd_evens_dict["lq_one_two_sides_double"] = one_odd_even_even
-                odd_evens_dict_rule['lq_one_two_sides_double'] = '双'
+                odd_evens_dict["one_two_sides_single"] = one_odd_even_odd
+                odd_evens_dict_rule['one_two_sides_single'] = '单'
+                odd_evens_dict["one_two_sides_double"] = one_odd_even_even
+                odd_evens_dict_rule['one_two_sides_double'] = '双'
 
 
             # 总分:单/双-第二节
             try:
                 two_odd_evens = result['o']["oeq2"]["v"]
                 two_odd_even_odd,two_odd_even_even = danshaung_fun(inner=two_odd_evens)
-                odd_evens_dict["lq_two_two_sides_single"] = two_odd_even_odd
-                odd_evens_dict_rule['lq_two_two_sides_single'] = '单'
-                odd_evens_dict["lq_two_two_sides_double"] = two_odd_even_even
-                odd_evens_dict_rule['lq_two_two_sides_double'] = '双'
+                odd_evens_dict["two_two_sides_single"] = two_odd_even_odd
+                odd_evens_dict_rule['two_two_sides_single'] = '单'
+                odd_evens_dict["two_two_sides_double"] = two_odd_even_even
+                odd_evens_dict_rule['two_two_sides_double'] = '双'
             except:
                 two_odd_even_odd = ""
                 two_odd_even_even = ""
-                odd_evens_dict["lq_two_two_sides_single"] = two_odd_even_odd
-                odd_evens_dict_rule['lq_two_two_sides_single'] = '单'
-                odd_evens_dict["lq_two_two_sides_double"] = two_odd_even_even
-                odd_evens_dict_rule['lq_two_two_sides_double'] = '双'
+                odd_evens_dict["two_two_sides_single"] = two_odd_even_odd
+                odd_evens_dict_rule['two_two_sides_single'] = '单'
+                odd_evens_dict["two_two_sides_double"] = two_odd_even_even
+                odd_evens_dict_rule['two_two_sides_double'] = '双'
 
             # 总分:单/双-第三节
             try:
                 three_odd_evens = result['o']["oeq3"]["v"]
                 three_odd_even_odd,three_odd_even_even = danshaung_fun(inner=three_odd_evens)
-                odd_evens_dict["lq_three_two_sides_single"] = three_odd_even_odd
-                odd_evens_dict_rule['lq_three_two_sides_single'] = '单'
-                odd_evens_dict["lq_three_two_sides_double"] = three_odd_even_even
-                odd_evens_dict_rule['lq_three_two_sides_double'] = '双'
+                odd_evens_dict["three_two_sides_single"] = three_odd_even_odd
+                odd_evens_dict_rule['three_two_sides_single'] = '单'
+                odd_evens_dict["three_two_sides_double"] = three_odd_even_even
+                odd_evens_dict_rule['three_two_sides_double'] = '双'
 
 
             except:
                 three_odd_even_odd = ""
                 three_odd_even_even = ""
-                odd_evens_dict["lq_three_two_sides_single"] = three_odd_even_odd
-                odd_evens_dict_rule['lq_three_two_sides_single'] = '单'
-                odd_evens_dict["lq_three_two_sides_double"] = three_odd_even_even
-                odd_evens_dict_rule['lq_three_two_sides_double'] = '双'
+                odd_evens_dict["three_two_sides_single"] = three_odd_even_odd
+                odd_evens_dict_rule['three_two_sides_single'] = '单'
+                odd_evens_dict["three_two_sides_double"] = three_odd_even_even
+                odd_evens_dict_rule['three_two_sides_double'] = '双'
 
 
 
@@ -427,17 +427,17 @@ class LanqiuSpider(scrapy.Spider):
             try:
                 four_odd_evens = result['o']["oeq4"]["v"]
                 four_odd_even_odd,four_odd_even_even = danshaung_fun(inner=four_odd_evens)
-                odd_evens_dict["lq_four_two_sides_single"] = four_odd_even_odd
-                odd_evens_dict_rule['lq_four_two_sides_single'] = '单'
-                odd_evens_dict["lq_four_two_sides_double"] = four_odd_even_even
-                odd_evens_dict_rule['lq_four_two_sides_double'] = '双'
+                odd_evens_dict["four_two_sides_single"] = four_odd_even_odd
+                odd_evens_dict_rule['four_two_sides_single'] = '单'
+                odd_evens_dict["four_two_sides_double"] = four_odd_even_even
+                odd_evens_dict_rule['four_two_sides_double'] = '双'
             except:
                 four_odd_even_odd = ""
                 four_odd_even_even = ""
-                odd_evens_dict["lq_four_two_sides_single"] = four_odd_even_odd
-                odd_evens_dict_rule['lq_four_two_sides_single'] = '单'
-                odd_evens_dict["lq_four_two_sides_double"] = four_odd_even_even
-                odd_evens_dict_rule['lq_four_two_sides_double'] = '双'
+                odd_evens_dict["four_two_sides_single"] = four_odd_even_odd
+                odd_evens_dict_rule['four_two_sides_single'] = '单'
+                odd_evens_dict["four_two_sides_double"] = four_odd_even_even
+                odd_evens_dict_rule['four_two_sides_double'] = '双'
 
 # ----------------------------------------球队得分最后一位数分割线---------------------------------------------------------
             # 球队得分最后一位数 主队
@@ -449,7 +449,7 @@ class LanqiuSpider(scrapy.Spider):
                     last_home[last_number[0]] = last_number[2]
             except:
                 last_home = {}
-            last_numbers_dict["lq_last_home"] = last_home
+            last_numbers_dict["last_home"] = last_home
             # 球队得分最后一位数 客队
             try:
                 new_last_numbers = result["p-o"][1]['o']
@@ -458,7 +458,7 @@ class LanqiuSpider(scrapy.Spider):
                     last_guest[new_last_number[0]] = new_last_number[2]
             except:
                 last_guest = {}
-            last_numbers_dict["lq_last_guest"] = last_guest
+            last_numbers_dict["last_guest"] = last_guest
 # ------------------------------------------------------独赢分割线---------------------------------------------------------
             capots_dict = {}
             # 独赢
@@ -467,13 +467,13 @@ class LanqiuSpider(scrapy.Spider):
                 capot_list = [capots[i] for i in range(len(capots)) if i % 2 == 1]
                 capot_home = capot_list[0]
                 capot_guest = capot_list[1]
-                capots_dict["lq_capot_home"] = capot_home
-                capots_dict["lq_capot_guest"] = capot_guest
+                capots_dict["capot_home"] = capot_home
+                capots_dict["capot_guest"] = capot_guest
             except:
                 capot_home = ""
                 capot_guest = ""
-                capots_dict["lq_capot_home"] = capot_home
-                capots_dict["lq_capot_guest"] = capot_guest
+                capots_dict["capot_home"] = capot_home
+                capots_dict["capot_guest"] = capot_guest
 
             # 上半场独赢
             try:
@@ -481,13 +481,13 @@ class LanqiuSpider(scrapy.Spider):
                 half_capot_list = [half_capots[i] for i in range(len(half_capots)) if i % 2 == 1]
                 half_capot_home = half_capot_list[0]
                 half_capot_guest = half_capot_list[1]
-                capots_dict["lq_half_capot_home"] = half_capot_home
-                capots_dict["lq_half_capot_guest"] = half_capot_guest
+                capots_dict["half_capot_home"] = half_capot_home
+                capots_dict["half_capot_guest"] = half_capot_guest
             except:
                 half_capot_home = ""
                 half_capot_guest = ""
-                capots_dict["lq_half_capot_home"] = half_capot_home
-                capots_dict["lq_half_capot_guest"] = half_capot_guest
+                capots_dict["half_capot_home"] = half_capot_home
+                capots_dict["half_capot_guest"] = half_capot_guest
 
             # 第一节独赢
             try:
@@ -495,13 +495,13 @@ class LanqiuSpider(scrapy.Spider):
                 one_capot_list = [one_capots[i] for i in range(len(one_capots)) if i % 2 == 1]
                 one_capot_home = one_capot_list[0]
                 one_capot_guest = one_capot_list[1]
-                capots_dict["lq_one_capot_home"] = one_capot_home
-                capots_dict["lq_one_capot_guest"] = one_capot_guest
+                capots_dict["one_capot_home"] = one_capot_home
+                capots_dict["one_capot_guest"] = one_capot_guest
             except:
                 one_capot_home = ""
                 one_capot_guest = ""
-                capots_dict["lq_one_capot_home"] = one_capot_home
-                capots_dict["lq_one_capot_guest"] = one_capot_guest
+                capots_dict["one_capot_home"] = one_capot_home
+                capots_dict["one_capot_guest"] = one_capot_guest
 
             # 第二节独赢
             try:
@@ -509,13 +509,13 @@ class LanqiuSpider(scrapy.Spider):
                 two_capot_list = [two_capots[i] for i in range(len(two_capots)) if i % 2 == 1]
                 two_capot_home = two_capot_list[0]
                 two_capot_guest = two_capot_list[1]
-                capots_dict["lq_two_capot_home"] = two_capot_home
-                capots_dict["lq_two_capot_guest"] = two_capot_guest
+                capots_dict["two_capot_home"] = two_capot_home
+                capots_dict["two_capot_guest"] = two_capot_guest
             except:
                 two_capot_home = ""
                 two_capot_guest = ""
-                capots_dict["lq_two_capot_home"] = two_capot_home
-                capots_dict["lq_two_capot_guest"] = two_capot_guest
+                capots_dict["two_capot_home"] = two_capot_home
+                capots_dict["two_capot_guest"] = two_capot_guest
 
             # 第三节独赢
             try:
@@ -523,13 +523,13 @@ class LanqiuSpider(scrapy.Spider):
                 three_capot_list = [three_capots[i] for i in range(len(three_capots)) if i % 2 == 1]
                 three_capot_home = three_capot_list[0]
                 three_capot_guest = three_capot_list[1]
-                capots_dict["lq_three_capot_home"] = three_capot_home
-                capots_dict["lq_three_capot_guest"] = three_capot_guest
+                capots_dict["three_capot_home"] = three_capot_home
+                capots_dict["three_capot_guest"] = three_capot_guest
             except:
                 three_capot_home = ""
                 three_capot_guest = ""
-                capots_dict["lq_three_capot_home"] = three_capot_home
-                capots_dict["lq_three_capot_guest"] = three_capot_guest
+                capots_dict["three_capot_home"] = three_capot_home
+                capots_dict["three_capot_guest"] = three_capot_guest
 
             # 第四节独赢
             try:
@@ -537,13 +537,13 @@ class LanqiuSpider(scrapy.Spider):
                 four_capot_list = [four_capots[i] for i in range(len(four_capots)) if i % 2 == 1]
                 four_capot_home = four_capot_list[0]
                 four_capot_guest = four_capot_list[1]
-                capots_dict["lq_four_capot_home"] = four_capot_home
-                capots_dict["lq_four_capot_guest"] = four_capot_guest
+                capots_dict["four_capot_home"] = four_capot_home
+                capots_dict["four_capot_guest"] = four_capot_guest
             except:
                 four_capot_home = ""
                 four_capot_guest = ""
-                capots_dict["lq_four_capot_home"] = four_capot_home
-                capots_dict["lq_four_capot_guest"] = four_capot_guest
+                capots_dict["four_capot_home"] = four_capot_home
+                capots_dict["four_capot_guest"] = four_capot_guest
 
 # ---------------------------------------------------华丽分割线列表es[1]--------------------------------------------------
             # 球队得分 全场主队 home
@@ -558,109 +558,109 @@ class LanqiuSpider(scrapy.Spider):
                 try:
                     score_homes = score_home["o"]["ou"]['v']
                     score_home_big_rule,score_home_big,score_home_small_rule,score_home_small = rangqiu_daxiao(inner=score_homes)
-                    team_scores_dict_rule["lq_score_home_big"] = score_home_big_rule
-                    team_scores_dict["lq_score_home_big"] = score_home_big
-                    team_scores_dict_rule["lq_score_home_small"] = score_home_small_rule
-                    team_scores_dict["lq_score_home_small"] = score_home_small
+                    team_scores_dict_rule["score_home_big"] = score_home_big_rule
+                    team_scores_dict["score_home_big"] = score_home_big
+                    team_scores_dict_rule["score_home_small"] = score_home_small_rule
+                    team_scores_dict["score_home_small"] = score_home_small
                 except:
                     score_home_small = ""
                     score_home_small_rule = ""
                     score_home_big_rule = ""
                     score_home_big = ""
-                    team_scores_dict_rule["lq_score_home_big"] = score_home_big_rule
-                    team_scores_dict["lq_score_home_big"] = score_home_big
-                    team_scores_dict_rule["lq_score_home_small"] = score_home_small_rule
-                    team_scores_dict["lq_score_home_small"] = score_home_small
+                    team_scores_dict_rule["score_home_big"] = score_home_big_rule
+                    team_scores_dict["score_home_big"] = score_home_big
+                    team_scores_dict_rule["score_home_small"] = score_home_small_rule
+                    team_scores_dict["score_home_small"] = score_home_small
                 # 球队得分 上半场主队 home
                 try:
                     half_score_homes = score_home['o']['ou1st']['v']
                     # 球队得分 上半场主队 大条件
                     half_score_home_big_rule,half_score_home_big,half_score_home_small_rule,half_score_home_small = rangqiu_daxiao(inner=half_score_homes)
-                    team_scores_dict_rule["lq_half_score_home_big"] = half_score_home_big_rule
-                    team_scores_dict["lq_half_score_home_big"] = half_score_home_big
-                    team_scores_dict_rule["lq_half_score_home_small"] = half_score_home_small_rule
-                    team_scores_dict["lq_half_score_home_small"] = half_score_home_small
+                    team_scores_dict_rule["half_score_home_big"] = half_score_home_big_rule
+                    team_scores_dict["half_score_home_big"] = half_score_home_big
+                    team_scores_dict_rule["half_score_home_small"] = half_score_home_small_rule
+                    team_scores_dict["half_score_home_small"] = half_score_home_small
                 except:
                     half_score_home_small = ""
                     half_score_home_small_rule = ""
                     half_score_home_big = ""
                     half_score_home_big_rule = ""
-                    team_scores_dict_rule["lq_half_score_home_big"] = half_score_home_big_rule
-                    team_scores_dict["lq_half_score_home_big"] = half_score_home_big
-                    team_scores_dict_rule["lq_half_score_home_small"] = half_score_home_small_rule
-                    team_scores_dict["lq_half_score_home_small"] = half_score_home_small
+                    team_scores_dict_rule["half_score_home_big"] = half_score_home_big_rule
+                    team_scores_dict["half_score_home_big"] = half_score_home_big
+                    team_scores_dict_rule["half_score_home_small"] = half_score_home_small_rule
+                    team_scores_dict["half_score_home_small"] = half_score_home_small
 
                 # 球队得分:主队-大 / 小-第一节
                 try:
                     one_score_homes = score_home['o']["ouq1"]["v"]
                     one_score_home_big_rule,one_score_home_big,one_score_home_small_rule,one_score_home_small = rangqiu_daxiao(inner=one_score_homes)
-                    team_scores_dict_rule["lq_one_score_home_big"] = one_score_home_big_rule
-                    team_scores_dict["lq_one_score_home_big"] = one_score_home_big
-                    team_scores_dict_rule["lq_one_score_home_small"] = one_score_home_small_rule
-                    team_scores_dict["lq_one_score_home_small"] = one_score_home_small
+                    team_scores_dict_rule["one_score_home_big"] = one_score_home_big_rule
+                    team_scores_dict["one_score_home_big"] = one_score_home_big
+                    team_scores_dict_rule["one_score_home_small"] = one_score_home_small_rule
+                    team_scores_dict["one_score_home_small"] = one_score_home_small
                 except:
                     one_score_home_small = ""
                     one_score_home_small_rule = ""
                     one_score_home_big = ""
                     one_score_home_big_rule = ""
-                    team_scores_dict_rule["lq_one_score_home_big"] = one_score_home_big_rule
-                    team_scores_dict["lq_one_score_home_big"] = one_score_home_big
-                    team_scores_dict_rule["lq_one_score_home_small"] = one_score_home_small_rule
-                    team_scores_dict["lq_one_score_home_small"] = one_score_home_small
+                    team_scores_dict_rule["one_score_home_big"] = one_score_home_big_rule
+                    team_scores_dict["one_score_home_big"] = one_score_home_big
+                    team_scores_dict_rule["one_score_home_small"] = one_score_home_small_rule
+                    team_scores_dict["one_score_home_small"] = one_score_home_small
 
                 # 球队得分:主队-大 / 小-第一节
                 try:
                     two_score_homes = score_home['o']["ouq2"]["v"]
                     two_score_home_big_rule,two_score_home_big,two_score_home_small_rule,two_score_home_small = rangqiu_daxiao(inner=two_score_homes)
-                    team_scores_dict_rule["lq_two_score_home_big"] = two_score_home_big_rule
-                    team_scores_dict["lq_two_score_home_big"] = two_score_home_big
-                    team_scores_dict_rule["lq_two_score_home_small"] = two_score_home_small_rule
-                    team_scores_dict["lq_two_score_home_small"] = two_score_home_small
+                    team_scores_dict_rule["two_score_home_big"] = two_score_home_big_rule
+                    team_scores_dict["two_score_home_big"] = two_score_home_big
+                    team_scores_dict_rule["two_score_home_small"] = two_score_home_small_rule
+                    team_scores_dict["two_score_home_small"] = two_score_home_small
                 except:
                     two_score_home_small = ""
                     two_score_home_small_rule = ""
                     two_score_home_big = ""
                     two_score_home_big_rule = ""
-                    team_scores_dict_rule["lq_two_score_home_big"] = two_score_home_big_rule
-                    team_scores_dict["lq_two_score_home_big"] = two_score_home_big
-                    team_scores_dict_rule["lq_two_score_home_small"] = two_score_home_small_rule
-                    team_scores_dict["lq_two_score_home_small"] = two_score_home_small
+                    team_scores_dict_rule["two_score_home_big"] = two_score_home_big_rule
+                    team_scores_dict["two_score_home_big"] = two_score_home_big
+                    team_scores_dict_rule["two_score_home_small"] = two_score_home_small_rule
+                    team_scores_dict["two_score_home_small"] = two_score_home_small
 
                 # 球队得分:主队-大 / 小-第一节
                 try:
                     three_score_homes = score_home['o']["ouq3"]["v"]
                     three_score_home_big_rule,three_score_home_big,three_score_home_small_rule,three_score_home_small = rangqiu_daxiao(inner=three_score_homes)
-                    team_scores_dict_rule["lq_three_score_home_big"] = three_score_home_big_rule
-                    team_scores_dict["lq_three_score_home_big"] = three_score_home_big
-                    team_scores_dict_rule["lq_three_score_home_small"] = three_score_home_small_rule
-                    team_scores_dict["lq_three_score_home_small"] = three_score_home_small
+                    team_scores_dict_rule["three_score_home_big"] = three_score_home_big_rule
+                    team_scores_dict["three_score_home_big"] = three_score_home_big
+                    team_scores_dict_rule["three_score_home_small"] = three_score_home_small_rule
+                    team_scores_dict["three_score_home_small"] = three_score_home_small
                 except:
                     three_score_home_small = ""
                     three_score_home_small_rule = ""
                     three_score_home_big = ""
                     three_score_home_big_rule = ""
-                    team_scores_dict_rule["lq_three_score_home_big"] = three_score_home_big_rule
-                    team_scores_dict["lq_three_score_home_big"] = three_score_home_big
-                    team_scores_dict_rule["lq_three_score_home_small"] = three_score_home_small_rule
-                    team_scores_dict["lq_three_score_home_small"] = three_score_home_small
+                    team_scores_dict_rule["three_score_home_big"] = three_score_home_big_rule
+                    team_scores_dict["three_score_home_big"] = three_score_home_big
+                    team_scores_dict_rule["three_score_home_small"] = three_score_home_small_rule
+                    team_scores_dict["three_score_home_small"] = three_score_home_small
 
                 # 球队得分:主队-大 / 小-第四节
                 try:
                     four_score_homes = score_home['o']["ouq4"]["v"]
                     four_score_home_big_rule,four_score_home_big,four_score_home_small_rule,four_score_home_small = rangqiu_daxiao(inner=four_score_homes)
-                    team_scores_dict_rule["lq_four_score_home_big"] = four_score_home_big_rule
-                    team_scores_dict["lq_four_score_home_big"] = four_score_home_big
-                    team_scores_dict_rule["lq_four_score_home_small"] = four_score_home_small_rule
-                    team_scores_dict["lq_four_score_home_small"] = four_score_home_small
+                    team_scores_dict_rule["four_score_home_big"] = four_score_home_big_rule
+                    team_scores_dict["four_score_home_big"] = four_score_home_big
+                    team_scores_dict_rule["four_score_home_small"] = four_score_home_small_rule
+                    team_scores_dict["four_score_home_small"] = four_score_home_small
                 except:
                     four_score_home_small = ""
                     four_score_home_small_rule = ""
                     four_score_home_big = ""
                     four_score_home_big_rule = ""
-                    team_scores_dict_rule["lq_four_score_home_big"] = four_score_home_big_rule
-                    team_scores_dict["lq_four_score_home_big"] = four_score_home_big
-                    team_scores_dict_rule["lq_four_score_home_small"] = four_score_home_small_rule
-                    team_scores_dict["lq_four_score_home_small"] = four_score_home_small
+                    team_scores_dict_rule["four_score_home_big"] = four_score_home_big_rule
+                    team_scores_dict["four_score_home_big"] = four_score_home_big
+                    team_scores_dict_rule["four_score_home_small"] = four_score_home_small_rule
+                    team_scores_dict["four_score_home_small"] = four_score_home_small
 
 
 # ---------------------------------------------------华丽分割线列表es[2]--------------------------------------------------
@@ -674,110 +674,110 @@ class LanqiuSpider(scrapy.Spider):
                     # 球队得分: 大 / 小
                     score_guests = score_guest["o"]["ou"]['v']
                     score_guest_big_rule,score_guest_big,score_guest_small_rule,score_guest_small = rangqiu_daxiao(inner=score_guests)
-                    team_scores_dict_rule["lq_score_guest_big"] = score_guest_big_rule
-                    team_scores_dict["lq_score_guest_big"] = score_guest_big
-                    team_scores_dict_rule["lq_score_guest_small"] = score_guest_small_rule
-                    team_scores_dict["lq_score_guest_small"] = score_guest_small
+                    team_scores_dict_rule["score_guest_big"] = score_guest_big_rule
+                    team_scores_dict["score_guest_big"] = score_guest_big
+                    team_scores_dict_rule["score_guest_small"] = score_guest_small_rule
+                    team_scores_dict["score_guest_small"] = score_guest_small
                 except:
                     score_guest_small = ""
                     score_guest_small_rule = ""
                     score_guest_big = ""
                     score_guest_big_rule = ""
-                    team_scores_dict_rule["lq_score_guest_big"] = score_guest_big_rule
-                    team_scores_dict["lq_score_guest_big"] = score_guest_big
-                    team_scores_dict_rule["lq_score_guest_small"] = score_guest_small_rule
-                    team_scores_dict["lq_score_guest_small"] = score_guest_small
+                    team_scores_dict_rule["score_guest_big"] = score_guest_big_rule
+                    team_scores_dict["score_guest_big"] = score_guest_big
+                    team_scores_dict_rule["score_guest_small"] = score_guest_small_rule
+                    team_scores_dict["score_guest_small"] = score_guest_small
 
                 # 球队得分 上半场客队 guest
                 try:
                     half_score_guests = score_guest["o"]['ou1st']['v']
                     half_score_guest_big_rule,half_score_guest_big,half_score_guest_small_rule,half_score_guest_small = rangqiu_daxiao(inner=half_score_guests)
-                    team_scores_dict_rule["lq_half_score_guest_big"] = half_score_guest_big_rule
-                    team_scores_dict["lq_half_score_guest_big"] = half_score_guest_big
-                    team_scores_dict_rule["lq_half_score_guest_small"] = half_score_guest_small_rule
-                    team_scores_dict["lq_half_score_guest_small"] = half_score_guest_small
+                    team_scores_dict_rule["half_score_guest_big"] = half_score_guest_big_rule
+                    team_scores_dict["half_score_guest_big"] = half_score_guest_big
+                    team_scores_dict_rule["half_score_guest_small"] = half_score_guest_small_rule
+                    team_scores_dict["half_score_guest_small"] = half_score_guest_small
                 except:
                     half_score_guest_small = ""
                     half_score_guest_small_rule = ""
                     half_score_guest_big = ""
                     half_score_guest_big_rule = ""
-                    team_scores_dict_rule["lq_half_score_guest_big"] = half_score_guest_big_rule
-                    team_scores_dict["lq_half_score_guest_big"] = half_score_guest_big
-                    team_scores_dict_rule["lq_half_score_guest_small"] = half_score_guest_small_rule
-                    team_scores_dict["lq_half_score_guest_small"] = half_score_guest_small
+                    team_scores_dict_rule["half_score_guest_big"] = half_score_guest_big_rule
+                    team_scores_dict["half_score_guest_big"] = half_score_guest_big
+                    team_scores_dict_rule["half_score_guest_small"] = half_score_guest_small_rule
+                    team_scores_dict["half_score_guest_small"] = half_score_guest_small
                 # 球队得分第一节
                 try:
                     one_score_guests = score_guest["o"]['ouq1']['v']
                     one_score_guest_big_rule, one_score_guest_big, one_score_guest_small_rule, one_score_guest_small = rangqiu_daxiao(
                         inner=one_score_guests)
-                    team_scores_dict_rule["lq_one_score_guest_big"] = one_score_guest_big_rule
-                    team_scores_dict["lq_one_score_guest_big"] = one_score_guest_big
-                    team_scores_dict_rule["lq_one_score_guest_small"] = one_score_guest_small_rule
-                    team_scores_dict["lq_one_score_guest_small"] = one_score_guest_small
+                    team_scores_dict_rule["one_score_guest_big"] = one_score_guest_big_rule
+                    team_scores_dict["one_score_guest_big"] = one_score_guest_big
+                    team_scores_dict_rule["one_score_guest_small"] = one_score_guest_small_rule
+                    team_scores_dict["one_score_guest_small"] = one_score_guest_small
                 except:
                     one_score_guest_small = ""
                     one_score_guest_small_rule = ""
                     one_score_guest_big = ""
                     one_score_guest_big_rule = ""
-                    team_scores_dict_rule["lq_one_score_guest_big"] = one_score_guest_big_rule
-                    team_scores_dict["lq_one_score_guest_big"] = one_score_guest_big
-                    team_scores_dict_rule["lq_one_score_guest_small"] = one_score_guest_small_rule
-                    team_scores_dict["lq_one_score_guest_small"] = one_score_guest_small
+                    team_scores_dict_rule["one_score_guest_big"] = one_score_guest_big_rule
+                    team_scores_dict["one_score_guest_big"] = one_score_guest_big
+                    team_scores_dict_rule["one_score_guest_small"] = one_score_guest_small_rule
+                    team_scores_dict["one_score_guest_small"] = one_score_guest_small
 
                 # 球队得分第二节
                 try:
                     two_score_guests = score_guest["o"]['ouq2']['v']
                     two_score_guest_big_rule, two_score_guest_big, two_score_guest_small_rule, two_score_guest_small = rangqiu_daxiao(
                         inner=two_score_guests)
-                    team_scores_dict_rule["lq_two_score_guest_big"] = two_score_guest_big_rule
-                    team_scores_dict["lq_two_score_guest_big"] = two_score_guest_big
-                    team_scores_dict_rule["lq_two_score_guest_small"] = two_score_guest_small_rule
-                    team_scores_dict["lq_two_score_guest_small"] = two_score_guest_small
+                    team_scores_dict_rule["two_score_guest_big"] = two_score_guest_big_rule
+                    team_scores_dict["two_score_guest_big"] = two_score_guest_big
+                    team_scores_dict_rule["two_score_guest_small"] = two_score_guest_small_rule
+                    team_scores_dict["two_score_guest_small"] = two_score_guest_small
                 except:
                     two_score_guest_small = ""
                     two_score_guest_small_rule = ""
                     two_score_guest_big = ""
                     two_score_guest_big_rule = ""
-                    team_scores_dict_rule["lq_two_score_guest_big"] = two_score_guest_big_rule
-                    team_scores_dict["lq_two_score_guest_big"] = two_score_guest_big
+                    team_scores_dict_rule["two_score_guest_big"] = two_score_guest_big_rule
+                    team_scores_dict["two_score_guest_big"] = two_score_guest_big
                     team_scores_dict_rule["lq_two_score_guest_small"] = two_score_guest_small_rule
-                    team_scores_dict["lq_two_score_guest_small"] = two_score_guest_small
+                    team_scores_dict["two_score_guest_small"] = two_score_guest_small
                 # 球队得分第三节
                 try:
                     three_score_guests = score_guest["o"]['ouq3']['v']
                     three_score_guest_big_rule, three_score_guest_big, three_score_guest_small_rule, three_score_guest_small = rangqiu_daxiao(
                         inner=three_score_guests)
-                    team_scores_dict_rule["lq_three_score_guest_big"] = three_score_guest_big_rule
-                    team_scores_dict["lq_three_score_guest_big"] = three_score_guest_big
-                    team_scores_dict_rule["lq_three_score_guest_small"] = three_score_guest_small_rule
-                    team_scores_dict["lq_three_score_guest_small"] = three_score_guest_small
+                    team_scores_dict_rule["three_score_guest_big"] = three_score_guest_big_rule
+                    team_scores_dict["three_score_guest_big"] = three_score_guest_big
+                    team_scores_dict_rule["three_score_guest_small"] = three_score_guest_small_rule
+                    team_scores_dict["three_score_guest_small"] = three_score_guest_small
                 except:
                     three_score_guest_small = ""
                     three_score_guest_small_rule = ""
                     three_score_guest_big = ""
                     three_score_guest_big_rule = ""
-                    team_scores_dict_rule["lq_three_score_guest_big"] = three_score_guest_big_rule
-                    team_scores_dict["lq_three_score_guest_big"] = three_score_guest_big
-                    team_scores_dict_rule["lq_three_score_guest_small"] = three_score_guest_small_rule
-                    team_scores_dict["lq_three_score_guest_small"] = three_score_guest_small
+                    team_scores_dict_rule["three_score_guest_big"] = three_score_guest_big_rule
+                    team_scores_dict["three_score_guest_big"] = three_score_guest_big
+                    team_scores_dict_rule["three_score_guest_small"] = three_score_guest_small_rule
+                    team_scores_dict["three_score_guest_small"] = three_score_guest_small
                 # 球队得分第四节
                 try:
                     four_score_guests = score_guest["o"]['ouq4']['v']
                     four_score_guest_big_rule, four_score_guest_big, four_score_guest_small_rule, four_score_guest_small = rangqiu_daxiao(
                         inner=four_score_guests)
-                    team_scores_dict_rule["lq_four_score_guest_big"] = four_score_guest_big_rule
-                    team_scores_dict["lq_four_score_guest_big"] = four_score_guest_big
-                    team_scores_dict_rule["lq_four_score_guest_small"] = four_score_guest_small_rule
-                    team_scores_dict["lq_four_score_guest_small"] = four_score_guest_small
+                    team_scores_dict_rule["four_score_guest_big"] = four_score_guest_big_rule
+                    team_scores_dict["four_score_guest_big"] = four_score_guest_big
+                    team_scores_dict_rule["four_score_guest_small"] = four_score_guest_small_rule
+                    team_scores_dict["four_score_guest_small"] = four_score_guest_small
                 except:
                     four_score_guest_small = ""
                     four_score_guest_small_rule = ""
                     four_score_guest_big = ""
                     four_score_guest_big_rule = ""
-                    team_scores_dict_rule["lq_four_score_guest_big"] = four_score_guest_big_rule
-                    team_scores_dict["lq_four_score_guest_big"] = four_score_guest_big
-                    team_scores_dict_rule["lq_four_score_guest_small"] = four_score_guest_small_rule
-                    team_scores_dict["lq_four_score_guest_small"] = four_score_guest_small
+                    team_scores_dict_rule["four_score_guest_big"] = four_score_guest_big_rule
+                    team_scores_dict["four_score_guest_big"] = four_score_guest_big
+                    team_scores_dict_rule["four_score_guest_small"] = four_score_guest_small_rule
+                    team_scores_dict["four_score_guest_small"] = four_score_guest_small
 
             # 联赛id
             item['league_id'] = league_id

+ 46 - 46
hg3535/spiders/wangqiu.py

@@ -93,38 +93,38 @@ class LanqiuSpider(scrapy.Spider):
                 concedes_dict_rule = {}
                 try:
                     concedes = result['o']["ah"]["v"]
-                    concedes_dict_rule['wq_concede_home'] = concedes[1]
-                    concedes_dict_rule['wq_concede_guest'] = concedes[3]
+                    concedes_dict_rule['concede_home'] = concedes[1]
+                    concedes_dict_rule['concede_guest'] = concedes[3]
                     if pt is 3:
-                        concedes_dict['wq_concede_home'] = float(concedes[5]) - 1
-                        concedes_dict['wq_concede_guest'] = float(concedes[7]) - 1
+                        concedes_dict['concede_home'] = float(concedes[5]) - 1
+                        concedes_dict['concede_guest'] = float(concedes[7]) - 1
                     else:
-                        concedes_dict['wq_concede_guest'] = concedes[7]
-                        concedes_dict['wq_concede_home'] = float(concedes[5])
+                        concedes_dict['concede_guest'] = concedes[7]
+                        concedes_dict['concede_home'] = float(concedes[5])
                 except:
-                    concedes_dict_rule['wq_concede_home'] = ""
-                    concedes_dict['wq_concede_home'] = ""
-                    concedes_dict_rule['wq_concede_guest'] = ""
-                    concedes_dict['wq_concede_guest'] = ""
+                    concedes_dict_rule['concede_home'] = ""
+                    concedes_dict['concede_home'] = ""
+                    concedes_dict_rule['concede_guest'] = ""
+                    concedes_dict['concede_guest'] = ""
 # ---------------------------------------------------冠军----------------------------------------------------------------
                 kemps_dict = {}
                 try:
                     kemps = result['o']["ml"]["v"]
-                    kemps_dict['wq_kemp_home'] = kemps[1]
-                    kemps_dict['wq_kemp_guest'] = kemps[3]
+                    kemps_dict['kemp_home'] = kemps[1]
+                    kemps_dict['kemp_guest'] = kemps[3]
 
                 except:
-                    kemps_dict['wq_kemp_home'] = ""
-                    kemps_dict['wq_kemp_guest'] = ""
+                    kemps_dict['kemp_home'] = ""
+                    kemps_dict['kemp_guest'] = ""
                 # 第一盘 冠军
                 try:
                     kemps = result['o']["mls1"]["v"]
-                    kemps_dict['wq_one_kemp_home'] = kemps[1]
-                    kemps_dict['wq_one_kemp_guest'] = kemps[3]
+                    kemps_dict['one_kemp_home'] = kemps[1]
+                    kemps_dict['one_kemp_guest'] = kemps[3]
 
                 except:
-                    kemps_dict['wq_one_kemp_home'] = ""
-                    kemps_dict['wq_one_kemp_guest'] = ""
+                    kemps_dict['one_kemp_home'] = ""
+                    kemps_dict['one_kemp_guest'] = ""
 
 # ---------------------------------------------------让局---------------------------------------------------------------
 
@@ -132,38 +132,38 @@ class LanqiuSpider(scrapy.Spider):
                 bureaus_dict_rule = {}
                 try:
                     bureaus = result['o']["ahfts"]["v"]
-                    bureaus_dict_rule['wq_bureau_home'] = bureaus[1]
-                    bureaus_dict_rule['wq_bureau_guest'] = bureaus[3]
+                    bureaus_dict_rule['bureau_home'] = bureaus[1]
+                    bureaus_dict_rule['bureau_guest'] = bureaus[3]
                     if pt is 3:
-                        bureaus_dict['wq_bureau_home'] = float(bureaus[5]) - 1
-                        bureaus_dict['wq_bureau_guest'] = float(bureaus[7]) - 1
+                        bureaus_dict['bureau_home'] = float(bureaus[5]) - 1
+                        bureaus_dict['bureau_guest'] = float(bureaus[7]) - 1
                     else:
-                        bureaus_dict['wq_bureau_home'] = bureaus[5]
-                        bureaus_dict['wq_bureau_guest'] = bureaus[7]
+                        bureaus_dict['bureau_home'] = bureaus[5]
+                        bureaus_dict['bureau_guest'] = bureaus[7]
                 except:
-                    bureaus_dict_rule['wq_bureau_home'] = ""
-                    bureaus_dict['wq_bureau_home'] = ""
-                    bureaus_dict_rule['wq_bureau_guest'] = ""
-                    bureaus_dict['wq_bureau_guest'] = ""
+                    bureaus_dict_rule['bureau_home'] = ""
+                    bureaus_dict['bureau_home'] = ""
+                    bureaus_dict_rule['bureau_guest'] = ""
+                    bureaus_dict['bureau_guest'] = ""
 
 # -----------------------------------------------------总局数:大/小------------------------------------------------------
                 total_number_dict = {}
                 total_number_dict_rule = {}
                 try:
                     total_numbers = result['o']["oufts"]["v"]
-                    total_number_dict_rule['wq_total_number_big'] = total_numbers[1]
-                    total_number_dict_rule['wq_total_number_small'] = total_numbers[3]
+                    total_number_dict_rule['total_number_big'] = total_numbers[1]
+                    total_number_dict_rule['total_number_small'] = total_numbers[3]
                     if pt is 3:
-                        total_number_dict['wq_total_number_big'] = float(total_numbers[5]) - 1
-                        total_number_dict['wq_total_number_small'] = float(total_numbers[7]) - 1
+                        total_number_dict['total_number_big'] = float(total_numbers[5]) - 1
+                        total_number_dict['total_number_small'] = float(total_numbers[7]) - 1
                     else:
-                        total_number_dict['wq_total_number_big'] = total_numbers[5]
-                        total_number_dict['wq_total_number_small'] = total_numbers[7]
+                        total_number_dict['total_number_big'] = total_numbers[5]
+                        total_number_dict['total_number_small'] = total_numbers[7]
                 except:
-                    total_number_dict_rule['wq_total_number_big'] = ""
-                    total_number_dict['wq_total_number_big'] = ""
-                    total_number_dict_rule['wq_total_number_small'] = ""
-                    total_number_dict['wq_total_number_small'] = ""
+                    total_number_dict_rule['total_number_big'] = ""
+                    total_number_dict['total_number_big'] = ""
+                    total_number_dict_rule['total_number_small'] = ""
+                    total_number_dict['total_number_small'] = ""
 
 # ------------------------------------------------------总局数:单/双-----------------------------------------------------
                 odd_evens_dict = {}
@@ -171,16 +171,16 @@ class LanqiuSpider(scrapy.Spider):
                 try:
                     odd_evens = result['o']["oefts"]["v"]
                     # 上半场 主队让球条件
-                    odd_evens_dict['wq_two_sides_single'] = odd_evens[1]
-                    odd_evens_dict_rule['wq_two_sides_single'] = "单"
-                    odd_evens_dict['wq_two_sides_double'] = odd_evens[3]
-                    odd_evens_dict_rule['wq_two_sides_double'] = "双"
+                    odd_evens_dict['two_sides_single'] = odd_evens[1]
+                    odd_evens_dict_rule['two_sides_single'] = "单"
+                    odd_evens_dict['two_sides_double'] = odd_evens[3]
+                    odd_evens_dict_rule['two_sides_double'] = "双"
 
                 except:
-                    odd_evens_dict['wq_two_sides_single'] = ""
-                    odd_evens_dict['wq_two_sides_single'] = ""
-                    odd_evens_dict_rule['wq_two_sides_double'] = ""
-                    odd_evens_dict_rule['wq_two_sides_double'] = ""
+                    odd_evens_dict['two_sides_single'] = ""
+                    odd_evens_dict['two_sides_single'] = ""
+                    odd_evens_dict_rule['two_sides_double'] = ""
+                    odd_evens_dict_rule['two_sides_double'] = ""
 
                 # 联赛id
                 item['league_id'] = league_id

+ 6 - 6
hg3535/spiders/wqbodan.py

@@ -75,12 +75,12 @@ class WgbodanSpider(scrapy.Spider):
                     # 波胆
                     bodans = new_result['o'].get('sb', "")
                     if bodans:
-                        one_list = ["wq_bodanhome_two_zero", "wq_bodanhome_two_one", "wq_bodanhome_three_zero",
-                                    "wq_bodanhome_three_one", "wq_bodanhome_three_two", "wq_bodanhome_four_zero",
-                                    "wq_bodanhome_four_one", "wq_bodanhome_four_two", "wq_bodanhome_four_three"]
-                        two_list = ["wq_bodanguest_two_zero", "wq_bodanguest_two_one", "wq_bodanguest_three_zero",
-                                    "wq_bodanguest_three_one", "wq_bodanguest_three_two", "wq_bodanguest_four_zero",
-                                    "wq_bodanguest_four_one", "wq_bodanguest_four_two", "wq_bodanguest_four_three"]
+                        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