Your Name 6 tahun lalu
induk
melakukan
3581b2551d

+ 87 - 156
hg3535/.idea/workspace.xml

@@ -6,10 +6,9 @@
       <change beforePath="$PROJECT_DIR$/ball_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/ball_func.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipelines.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipelines.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/settings.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/spiders/roll_wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_wangqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/spiders/roll_zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_zuqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/spiders/zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/zuqiu.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/roll_lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_lanqiu.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/wangqiu.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -19,7 +18,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="1559557155593" 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="1559617710661" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/hg3535$hgjieshu.coverage" NAME="hgjieshu Coverage Results" MODIFIED="1558494720094" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
     <SUITE FILE_PATH="coverage/hg3535$halffull.coverage" NAME="halffull Coverage Results" MODIFIED="1554544334424" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
     <SUITE FILE_PATH="coverage/hg3535$pipelines.coverage" NAME="pipelines Coverage Results" MODIFIED="1554290866137" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
@@ -46,73 +45,7 @@
     <favorites_list name="hg3535" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pipelines.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="307">
-              <caret line="289" column="21" lean-forward="true" selection-start-line="289" selection-start-column="21" selection-end-line="289" selection-end-column="21" />
-              <folding>
-                <element signature="e#0#11#0" expanded="true" />
-                <element signature="e#16016#23080#0" />
-                <element signature="e#23234#30141#0" />
-                <element signature="e#30297#33238#0" />
-                <element signature="e#33392#39660#0" />
-                <element signature="e#39810#41670#0" />
-                <element signature="e#41821#50540#0" />
-                <element signature="e#43093#59596#0" />
-                <element signature="e#65460#78016#0" />
-                <element signature="e#65318#70468#0" />
-                <element signature="e#70518#83933#0" />
-                <element signature="e#84497#84609#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/json/__init__.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="123">
-              <caret line="226" selection-start-line="226" selection-end-line="226" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/ball_func.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="53" column="43" lean-forward="true" selection-start-line="53" selection-start-column="40" selection-end-line="53" selection-end-column="49" />
-              <folding>
-                <element signature="e#0#15#0" expanded="true" />
-                <element signature="e#34620#35398#0" />
-                <element signature="e#3638#4763#0" />
-                <element signature="e#4759#5852#0" />
-                <element signature="e#37743#39435#0" />
-                <element signature="e#39539#41983#0" />
-                <element signature="e#40800#41366#0" />
-                <element signature="e#41398#41964#0" />
-                <element signature="e#42189#43941#0" />
-                <element signature="e#11992#13441#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/main.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
-              <caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
-              <folding>
-                <element signature="e#0#10#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -123,10 +56,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>psycopg2.extras</find>
-      <find>pt</find>
-      <find>Lanqiustatus</find>
-      <find>new_times</find>
       <find>status</find>
       <find>3206572</find>
       <find>sizes</find>
@@ -153,6 +82,10 @@
       <find>match_score_t</find>
       <find>match_score_dict</find>
       <find>three_post</find>
+      <find>two_score_guest_small</find>
+      <find>lq_two_score_guest_small</find>
+      <find>two_sides_single</find>
+      <find>guest_team</find>
     </findStrings>
     <replaceStrings>
       <replace>tema_ball</replace>
@@ -203,7 +136,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/spiders/wangqiuls.py" />
         <option value="$PROJECT_DIR$/spiders/temaball.py" />
         <option value="$PROJECT_DIR$/spiders/wqguanjun.py" />
         <option value="$PROJECT_DIR$/spiders/lqguanjun.py" />
@@ -244,16 +176,17 @@
         <option value="$PROJECT_DIR$/spiders/bq_jieshu.py" />
         <option value="$PROJECT_DIR$/spiders/wqbodan.py" />
         <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/wangqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
         <option value="$PROJECT_DIR$/spiders/wq_jieshu.py" />
-        <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/settings.py" />
         <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
-        <option value="$PROJECT_DIR$/ball_func.py" />
+        <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/wangqiu.py" />
+        <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/pipelines.py" />
+        <option value="$PROJECT_DIR$/ball_func.py" />
       </list>
     </option>
   </component>
@@ -269,6 +202,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -289,12 +223,11 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../sports_collect/collectSports" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../sports_collect" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
@@ -545,7 +478,8 @@
       <workItem from="1559195646143" duration="22396000" />
       <workItem from="1559272619876" duration="1306000" />
       <workItem from="1559296152679" duration="663000" />
-      <workItem from="1559524031484" duration="31662000" />
+      <workItem from="1559524031484" duration="32266000" />
+      <workItem from="1559610788179" duration="8154000" />
     </task>
     <task id="LOCAL-00001" summary="修改后,版本二">
       <created>1555727493584</created>
@@ -701,11 +635,18 @@
       <option name="project" value="LOCAL" />
       <updated>1559296171755</updated>
     </task>
-    <option name="localTasksCounter" value="23" />
+    <task id="LOCAL-00023" summary="'更新'">
+      <created>1559557316152</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1559557316153</updated>
+    </task>
+    <option name="localTasksCounter" value="24" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1638286000" />
+    <option name="totallyTimeSpent" value="1647044000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -718,14 +659,13 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.1913646" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.19349681" />
       <window_info id="Structure" order="1" sideWeight="0.2882615" side_tool="true" weight="0.1108742" />
       <window_info id="Favorites" order="2" sideWeight="0.5013405" side_tool="true" weight="0.108208954" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32832617" />
-      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" weight="0.57403433" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" weight="0.40343347" />
       <window_info anchor="bottom" id="Cvs" order="3" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="4" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="5" weight="0.32832617" />
@@ -734,7 +674,7 @@
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50586355" side_tool="true" weight="0.39055794" />
       <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49413645" weight="0.38626608" />
-      <window_info active="true" anchor="bottom" id="Run" order="11" sideWeight="0.4946695" visible="true" weight="0.40987125" />
+      <window_info anchor="bottom" id="Run" order="11" sideWeight="0.4946695" weight="0.26502147" />
       <window_info anchor="bottom" id="Python Console" order="12" sideWeight="0.49946696" weight="0.28540772" />
       <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" />
@@ -849,8 +789,13 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipelines.py</url>
-          <line>286</line>
-          <option name="timeStamp" value="17" />
+          <line>619</line>
+          <option name="timeStamp" value="20" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipelines.py</url>
+          <line>862</line>
+          <option name="timeStamp" value="21" />
         </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
@@ -985,16 +930,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status_up.py" />
-    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="37" column="14" selection-start-line="37" selection-start-column="12" selection-end-line="37" selection-end-column="23" />
-          <folding>
-            <element signature="e#24#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status.py" />
     <entry file="file://$PROJECT_DIR$/main_notroll.py" />
     <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
@@ -1025,16 +960,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="111">
-          <caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
-          <folding>
-            <element signature="e#24#35#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/text.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="162">
@@ -1104,18 +1029,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="846">
-          <caret line="453" column="50" selection-start-line="453" selection-start-column="45" selection-end-line="453" selection-end-column="54" />
-          <folding>
-            <element signature="e#24#35#0" expanded="true" />
-            <element signature="e#33118#41233#0" />
-            <element signature="e#41448#49794#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/settings.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="612">
@@ -1181,17 +1094,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/json/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="310">
-          <caret line="177" column="52" selection-start-line="177" selection-start-column="36" selection-end-line="177" selection-end-column="52" />
+        <state relative-caret-position="123">
+          <caret line="226" selection-start-line="226" selection-end-line="226" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
+        <state relative-caret-position="180">
+          <caret line="10" column="39" lean-forward="true" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />
           <folding>
             <element signature="e#0#10#0" expanded="true" />
           </folding>
@@ -1200,47 +1113,65 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/ball_func.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="53" column="43" lean-forward="true" selection-start-line="53" selection-start-column="40" selection-end-line="53" selection-end-column="49" />
+        <state relative-caret-position="506">
+          <caret line="205" column="32" selection-start-line="205" selection-start-column="32" selection-end-line="205" selection-end-column="32" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
-            <element signature="e#34620#35398#0" />
-            <element signature="e#3638#4763#0" />
-            <element signature="e#4759#5852#0" />
-            <element signature="e#37743#39435#0" />
-            <element signature="e#39539#41983#0" />
-            <element signature="e#40800#41366#0" />
-            <element signature="e#41398#41964#0" />
-            <element signature="e#42189#43941#0" />
-            <element signature="e#11992#13441#0" />
+            <element signature="e#3690#4861#0" />
+            <element signature="e#4956#6095#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/json/__init__.py">
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="123">
-          <caret line="226" selection-start-line="226" selection-end-line="226" />
+        <state relative-caret-position="1201">
+          <caret line="711" column="52" selection-start-line="711" selection-start-column="52" selection-end-line="711" selection-end-column="52" />
+          <folding>
+            <element signature="e#24#35#0" expanded="true" />
+            <element signature="e#33118#41233#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="149">
+          <caret line="155" column="42" lean-forward="true" selection-start-line="155" selection-start-column="42" selection-end-line="155" selection-end-column="42" />
+          <folding>
+            <element signature="e#24#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/wangqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="184" column="59" lean-forward="true" selection-start-line="184" selection-start-column="59" selection-end-line="184" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/guanjun.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-949">
+          <caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
+          <folding>
+            <element signature="e#24#35#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pipelines.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="307">
-          <caret line="289" column="21" lean-forward="true" selection-start-line="289" selection-start-column="21" selection-end-line="289" selection-end-column="21" />
+        <state relative-caret-position="7723">
+          <caret line="1561" column="24" lean-forward="true" selection-start-line="1560" selection-end-line="1563" selection-end-column="36" />
           <folding>
             <element signature="e#0#11#0" expanded="true" />
-            <element signature="e#16016#23080#0" />
-            <element signature="e#23234#30141#0" />
-            <element signature="e#30297#33238#0" />
-            <element signature="e#33392#39660#0" />
-            <element signature="e#39810#41670#0" />
-            <element signature="e#41821#50540#0" />
-            <element signature="e#43093#59596#0" />
-            <element signature="e#65460#78016#0" />
-            <element signature="e#65318#70468#0" />
-            <element signature="e#70518#83933#0" />
-            <element signature="e#84497#84609#0" />
+            <element signature="e#23844#30751#0" />
+            <element signature="e#27501#28441#0" />
+            <element signature="e#28482#29422#0" />
+            <element signature="e#30907#33848#0" />
+            <element signature="e#43705#58539#0" />
           </folding>
         </state>
       </provider>

TEMPAT SAMPAH
hg3535/__pycache__/ball_func.cpython-36.pyc


TEMPAT SAMPAH
hg3535/__pycache__/pipelines.cpython-36.pyc


TEMPAT SAMPAH
hg3535/__pycache__/settings.cpython-36.pyc


+ 40 - 5
hg3535/ball_func.py

@@ -158,7 +158,10 @@ def three_post(data, match_id, p_id, league_id, p_code, condition, game_code, zq
             if value:
                 s_hash = hash_func(match_id=match_id, odds_code=key, sort=0, p_id=p_id)
                 o_hash = r_func(match_id=match_id, odds_code=key, sort=0, p_id=p_id, odd=value)
-                f1 = fuhao(str(condition[key]))
+                try:
+                    f1 = fuhao(str(condition[key]))
+                except:
+                    f1 = None
                 payload = {
                     "game_code": game_code,
                     "title": "odds",
@@ -191,11 +194,19 @@ def gs_post(ball, league_id, league_name, data_game):
             "title": "competition",
             "data": {
                 "home_team": league_name,
+                "guest_team": None,
                 "lg_id": league_id,
                 "status": 0,
                 "match_id": n_gameid,
                 "source": "hg3535",
-                "us_time": data_game
+                "us_time": data_game,
+                "match_date": None,
+                "match_time": None,
+                "tag": None,
+                "is_rollball": 0,
+                "is_today": 0,
+                "is_morningplate": 0,
+                "is_stringscene": 0,
                 }
         }
     elif ball == "篮球":
@@ -205,11 +216,19 @@ def gs_post(ball, league_id, league_name, data_game):
             "title": "competition",
             "data": {
                 "home_team": league_name,
+                "guest_team": None,
                 "lg_id": league_id,
                 "status": 0,
                 "match_id": n_gameid,
                 "source": "hg3535",
-                "us_time": data_game
+                "us_time": data_game,
+                "match_date": None,
+                "match_time": None,
+                "tag": None,
+                "is_rollball": 0,
+                "is_today": 0,
+                "is_morningplate": 0,
+                "is_stringscene": 0,
             }
         }
     elif ball == "网球":
@@ -219,11 +238,19 @@ def gs_post(ball, league_id, league_name, data_game):
             "title": "competition",
             "data": {
                 "home_team": league_name,
+                "guest_team": None,
                 "lg_id": league_id,
                 "status": 0,
                 "match_id": n_gameid,
                 "source": "hg3535",
-                "us_time": data_game
+                "us_time": data_game,
+                "match_date": None,
+                "match_time": None,
+                "tag": None,
+                "is_rollball": 0,
+                "is_today": 0,
+                "is_morningplate": 0,
+                "is_stringscene": 0,
             }
         }
     elif ball == "棒球":
@@ -233,11 +260,19 @@ def gs_post(ball, league_id, league_name, data_game):
             "title": "competition",
             "data": {
                 "home_team": league_name,
+                "guest_team": None,
                 "lg_id": league_id,
                 "status": 0,
                 "match_id": n_gameid,
                 "source": "hg3535",
-                "us_time": data_game
+                "us_time": data_game,
+                "match_date": None,
+                "match_time": None,
+                "tag": None,
+                "is_rollball": 0,
+                "is_today": 0,
+                "is_morningplate": 0,
+                "is_stringscene": 0,
             }
         }
     return payload

+ 2 - 2
hg3535/main.py

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

+ 114 - 100
hg3535/pipelines.py

@@ -284,13 +284,8 @@ class Zuqiupipeline(object):
                     }
                 }
             zq_odds.append(payload)
-        # b = json.dumps(zq_odds)
-        # print(json.dumps(zq_odds))
         r = requests.post(url, data={"data": json.dumps(zq_odds)})
         print(r.text)
-        # print(len(zq_odds))
-        # print(zq_odds)
-        # print(zq_competitions)
         return item
 
 
@@ -298,6 +293,8 @@ class Zuqiupipeline(object):
 class Lanqiupipeline(object):
     def process_item(self, item, spider):
         # 使用twisted将mysql插入变成异步执行
+        lq_odds = []
+        url = 'http://admin.5gogo.com/setSports'
         logger = logging.getLogger(__name__)
         # # logger.warning(query.addErrback(self.handle_error, item, spider))
         # 联赛id
@@ -362,104 +359,109 @@ class Lanqiupipeline(object):
         if concedes_dict:
             for key, value in concedes_dict.items():
                 two_post(data=value, match_id=game_id, odds_code=key, p_id=1,
-                         league_id=league_id, p_code='concede', condition=concedes_dict_rule[key], game_code='lq')
+                         league_id=league_id, p_code='concede', condition=concedes_dict_rule[key], game_code='lq', zq_odds=lq_odds)
         if odd_evens_dict:
             for key, value in odd_evens_dict.items():
                 two_post(data=value, match_id=game_id, odds_code=key, p_id=2,
-                         league_id=league_id, p_code='two_sides', condition=odd_evens_dict_rule[key], game_code='lq')
+                         league_id=league_id, p_code='two_sides', condition=odd_evens_dict_rule[key], game_code='lq', zq_odds=lq_odds)
         # 总分单双 数据插入数据库
         if total_sizes_dict:
             for key, value in total_sizes_dict.items():
                 two_post(data=value, match_id=game_id, odds_code=key, p_id=3,
-                         league_id=league_id, p_code='total_size', condition=total_sizes_dict_rule[key], game_code='lq')
+                         league_id=league_id, p_code='total_size', condition=total_sizes_dict_rule[key], game_code='lq', zq_odds=lq_odds)
         # 全场总分大小 数据插入数据库
         # 全场总分大小 数据插入数据库
         if team_scores_dict:
             for key, value in team_scores_dict.items():
                 two_post(data=value, match_id=game_id, odds_code=key, p_id=6,
-                         league_id=league_id, p_code='total_size', condition=team_scores_dict_rule[key], game_code='lq')
+                         league_id=league_id, p_code='total_size', condition=team_scores_dict_rule[key], game_code='lq', zq_odds=lq_odds)
         if last_numbers_dict['last_home']:
             for key, value in last_numbers_dict['last_home'].items():
                 one_post(data=value, match_id=game_id, odds_code="last_home" + key, p_id=4,
-                         league_id=league_id, p_code='team_score', condition=key, game_code='lq')
+                         league_id=league_id, p_code='team_score', condition=key, game_code='lq', zq_odds=lq_odds)
         if last_numbers_dict['last_guest']:
             for key, value in last_numbers_dict['last_guest'].items():
                 one_post(data=value, match_id=game_id, odds_code="last_guest" + key, p_id=4,
-                         league_id=league_id, p_code='team_score', condition=key, game_code='lq')
+                         league_id=league_id, p_code='team_score', condition=key, game_code='lq', zq_odds=lq_odds)
+        three_post(data=capots_dict, match_id=game_id, p_id=5, league_id=league_id, p_code='capot', condition=None, game_code='lq', zq_odds=lq_odds)
         match_date, match_time, time3 = new_time(ctime)
         n_time = out_time(time3, 1.5)
         us_time = ctime
         if lanqiu == "篮球":
-                if pt == 1:
-                    payload = {
-                        "game_code": "lq",
-                        "title": "competition",
-                        "data": {
-                            "home_team": team_home,
-                            "guest_team": team_guest,
-                            "lg_id": league_id,
-                            "status": 0,
-                            "match_id": game_id,
-                            "match_date": match_date,
-                            "match_time": match_time,
-                            "tag": number,
-                            "source": "hg3535",
-                            "is_rollball": 0,
-                            "is_today": 1,
-                            "is_morningplate": 0,
-                            "is_stringscene": 0,
-                            "us_time": us_time
-                        }
+            if pt == 1:
+                payload = {
+                    "game_code": "lq",
+                    "title": "competition",
+                    "data": {
+                        "home_team": team_home,
+                        "guest_team": team_guest,
+                        "lg_id": league_id,
+                        "status": 0,
+                        "match_id": game_id,
+                        "match_date": match_date,
+                        "match_time": match_time,
+                        "tag": number,
+                        "source": "hg3535",
+                        "is_rollball": 0,
+                        "is_today": 1,
+                        "is_morningplate": 0,
+                        "is_stringscene": 0,
+                        "us_time": us_time
                     }
-                if pt == 2:
-                    payload = {
-                        "game_code": "lq",
-                        "title": "competition",
-                        "data": {
-                            "home_team": team_home,
-                            "guest_team": team_guest,
-                            "lg_id": league_id,
-                            "status": 0,
-                            "match_id": game_id,
-                            "match_date": match_date,
-                            "match_time": match_time,
-                            "tag": number,
-                            "source": "hg3535",
-                            "is_rollball": 0,
-                            "is_today": 0,
-                            "is_morningplate": 1,
-                            "is_stringscene": 0,
-                            "us_time": us_time
-                        }
+                }
+            if pt == 2:
+                payload = {
+                    "game_code": "lq",
+                    "title": "competition",
+                    "data": {
+                        "home_team": team_home,
+                        "guest_team": team_guest,
+                        "lg_id": league_id,
+                        "status": 0,
+                        "match_id": game_id,
+                        "match_date": match_date,
+                        "match_time": match_time,
+                        "tag": number,
+                        "source": "hg3535",
+                        "is_rollball": 0,
+                        "is_today": 0,
+                        "is_morningplate": 1,
+                        "is_stringscene": 0,
+                        "us_time": us_time
                     }
-                if pt == 3:
-                    payload = {
-                        "game_code": "lq",
-                        "title": "competition",
-                        "data": {
-                            "home_team": team_home,
-                            "guest_team": team_guest,
-                            "lg_id": league_id,
-                            "status": 0,
-                            "match_id": game_id,
-                            "match_date": match_date,
-                            "match_time": match_time,
-                            "tag": number,
-                            "source": "hg3535",
-                            "is_rollball": 0,
-                            "is_today": 0,
-                            "is_morningplate": 0,
-                            "is_stringscene": 1,
-                            "us_time": us_time
-                        }
+                }
+            if pt == 3:
+                payload = {
+                    "game_code": "lq",
+                    "title": "competition",
+                    "data": {
+                        "home_team": team_home,
+                        "guest_team": team_guest,
+                        "lg_id": league_id,
+                        "status": 0,
+                        "match_id": game_id,
+                        "match_date": match_date,
+                        "match_time": match_time,
+                        "tag": number,
+                        "source": "hg3535",
+                        "is_rollball": 0,
+                        "is_today": 0,
+                        "is_morningplate": 0,
+                        "is_stringscene": 1,
+                        "us_time": us_time
                     }
+                }
+            lq_odds.append(payload)
+        r = requests.post(url, data={"data": json.dumps(lq_odds)})
+        print(r.text)
 
 
 # 网球 让球&大小盘--------------------------------------------------------------------------------------------------------
 class Wangqiupipeline(object):
     def process_item(self, item, spider):
+        wq_odds = []
         logger = logging.getLogger(__name__)
-        url = 'http://sports.5gogo.com/Sports/WriteSports/setSports'
+        url = 'http://admin.5gogo.com/setSports'
         # logger.warning(query.addErrback(self.handle_error, item, spider))
         # 联赛id
         league_id = item['league_id']
@@ -598,29 +600,32 @@ class Wangqiupipeline(object):
                         "us_time": us_time
                     }
                 }
-                resp = requests.post(url, data={"data": json.dumps(payload)})
-                print(json.dumps(payload))
-                print(resp.text)
+                # resp = requests.post(url, data={"data": json.dumps(payload)})
+                # print(json.dumps(payload))
+                # print(resp.text)
+            wq_odds.append(payload)
         # 让盘
         if concedes_dict:
             for key, value in concedes_dict.items():
                 one_post(data=value, match_id=game_id, odds_code=key, p_id=1,
-                         league_id=league_id, p_code='concede', condition=fuhao(str(concedes_dict_rule[key])), game_code='wq')
+                         league_id=league_id, p_code='concede', condition=fuhao(str(concedes_dict_rule[key])), game_code='wq', zq_odds=wq_odds)
         # 让局
         if bureaus_dict:
             for key, value in bureaus_dict.items():
                 one_post(data=value, match_id=game_id, odds_code=key, p_id=3,
-                         league_id=league_id, p_code='bureau', condition=fuhao(str(bureaus_dict_rule[key])), game_code='wq')
+                         league_id=league_id, p_code='bureau', condition=fuhao(str(bureaus_dict_rule[key])), game_code='wq', zq_odds=wq_odds)
         if total_number_dict:
             for key, value in total_number_dict.items():
-                one_post(data=value, match_id=game_id, odds_code=key, p_id=4, league_id=league_id, p_code='total_number', condition=key, game_code='wq')
+                one_post(data=value, match_id=game_id, odds_code=key, p_id=4, league_id=league_id, p_code='total_number', condition=total_number_dict_rule[key], game_code='wq', zq_odds=wq_odds)
         if odd_evens_dict:
             for key, value in odd_evens_dict.items():
                 one_post(data=value, match_id=game_id, odds_code=key, p_id=5, league_id=league_id,
-                         p_code='two_game_sides', condition=key, game_code='wq')
+                         p_code='two_sides', condition=odd_evens_dict_rule[key], game_code='wq', zq_odds=wq_odds)
         if kemps_dict:
             for key, value in kemps_dict.items():
-                one_post(data=value, match_id=game_id, odds_code=key, p_id=2, league_id=league_id, p_code='kemp', condition=key, game_code='wq')
+                one_post(data=value, match_id=game_id, odds_code=key, p_id=2, league_id=league_id, p_code='kemp', condition=key, game_code='wq', zq_odds=wq_odds)
+        r = requests.post(url, data={"data": json.dumps(wq_odds)})
+        print(r.text)
         return item
 
 
@@ -628,7 +633,8 @@ class Wangqiupipeline(object):
 class Wqbodanpipeline(object):
     def process_item(self, item, spider):
         # 使用twisted将mysql插入变成异步执行
-        url = 'http://sports.5gogo.com/Sports/WriteSports/setSports'
+        wb_odds = []
+        url = 'http://admin.5gogo.com/setSports'
         logger = logging.getLogger(__name__)
         # logger.warning(query.addErrback(self.handle_error, item, spider))
         # 比赛日期
@@ -689,7 +695,10 @@ class Wqbodanpipeline(object):
         if bodan_datas:
             for key, value in bodan_datas.items():
                 one_post(data=value, match_id=competition_id, odds_code=key, p_id=2, league_id=league_id, p_code='bodan',
-                         condition=bodan_dict[key], game_code='wq')
+                         condition=bodan_dict[key], game_code='wq', zq_odds=wb_odds)
+        r = requests.post(url, data={"data": json.dumps(wb_odds)})
+        # logger.warning(r.text)
+        print(r.text)
         return item
 
 
@@ -698,7 +707,8 @@ class Bangqiupipeline(object):
     def process_item(self, item, spider):
         # print(item)
         logger = logging.getLogger(__name__)
-        url = 'http://sports.5gogo.com/Sports/WriteSports/setSports'
+        bq_odds = []
+        url = 'http://admin.5gogo.com/setSports'
         # logger.warning(query.addErrback(self.handle_error, item, spider))
         # 联赛id
         league_id = item['league_id']
@@ -784,9 +794,6 @@ class Bangqiupipeline(object):
                         "us_time": us_time
                     }
                 }
-                resp = requests.post(url, data={"data": json.dumps(payload)})
-                print(json.dumps(payload))
-                print(resp.text)
             if pt == 2:
                 payload = {
                     "game_code": "bq",
@@ -808,9 +815,6 @@ class Bangqiupipeline(object):
                         "us_time": us_time
                     }
                 }
-                resp = requests.post(url, data={"data": json.dumps(payload)})
-                print(json.dumps(payload))
-                print(resp.text)
             if pt == 3:
                 payload = {
                     "game_code": "bq",
@@ -832,26 +836,29 @@ class Bangqiupipeline(object):
                         "us_time": us_time
                     }
                 }
-                resp = requests.post(url, data={"data": json.dumps(payload)})
-                print(json.dumps(payload))
-                print(resp.text)
         # 让球
-        three_post(data=concedes_dict, match_id=game_id, p_id=1, league_id=league_id, p_code='concede',condition=concedes_dict_rule, game_code='bq')
+        three_post(data=concedes_dict, match_id=game_id, p_id=1, league_id=league_id, p_code='concede',condition=concedes_dict_rule, game_code='bq', zq_odds=bq_odds)
         # 总得分:大/小
         three_post(data=total_size_dict, match_id=game_id, p_id=2, league_id=league_id, p_code='total_size',
-                   condition=total_size_dict_rule, game_code='bq')
+                   condition=total_size_dict_rule, game_code='bq', zq_odds=bq_odds)
         # 单双
         three_post(data=odd_evens_dict, match_id=game_id, p_id=3, league_id=league_id, p_code='two_sides',
-                   condition=odd_evens_dict_rule, game_code='bq')
+                   condition=odd_evens_dict_rule, game_code='bq', zq_odds=bq_odds)
         # 插入独赢
         if capots_dict:
             for key, value in capots_dict.items():
-                one_post(data=value, match_id=game_id, odds_code=key, p_id=4, league_id=league_id, p_code='capot', condition=None, game_code='bq')
+                one_post(data=value, match_id=game_id, odds_code=key, p_id=4, league_id=league_id, p_code='capot', condition=None, game_code='bq', zq_odds=bq_odds)
+        r = requests.post(url, data={"data": json.dumps(bq_odds)})
+        # logger.warning(r.text)
+        print(r.text)
         return item
 
+
 # 足球 篮球 网球 棒球 冠军------------------------------------------------------------------------------------------------
 class Guanjunpipeline(object):
     def process_item(self, item, spider):
+        gj_odds = []
+        url = 'http://admin.5gogo.com/setSports'
         logger = logging.getLogger(__name__)
         data_game = item['data_game'].replace('年', "-").replace('月', "-").replace('日', "")
         time_game = item['time_game']
@@ -882,11 +889,18 @@ class Guanjunpipeline(object):
         # s_hash = hash_func(league_id, league_name, ball, 0)
         # url = 'http://sports.5gogo.com/Sports/WriteSports/setSports'
         # 冠军赛事
-        gs_post(ball=ball, league_id=league_id, league_name=league_name, data_game=data_game)
+        gs = gs_post(ball=ball, league_id=league_id, league_name=league_name, data_game=data_game)
+        gj_odds.append(gs)
         # 冠军赔率
-        go_post(ball=ball, league_id=league_id, new_champion=new_champion, new_league_name=new_league_name, value=champion_team, r_hash=r_hash, new_hash=new_hash, tema_home=tema_home)
+        go = go_post(ball=ball, league_id=league_id, new_champion=new_champion, new_league_name=new_league_name, value=champion_team, r_hash=r_hash, new_hash=new_hash, tema_home=tema_home)
+        gj_odds.append(go)
         # 冠军联赛
-        guanl_post(ball=ball, league_name=league_name, league_id=league_id, time3=time3)
+        guanl = guanl_post(ball=ball, league_name=league_name, league_id=league_id, time3=time3)
+        gj_odds.append(guanl)
+
+        r = requests.post(url, data={"data": json.dumps(gj_odds)})
+        # logger.warning(r.text)
+        print(r.text)
 
 
 # 足球 篮球 网球 棒球 联赛------------------------------------------------------------------------------------------------
@@ -1556,7 +1570,7 @@ class Roll_Banqiupipeline(object):
             "title": "match_result",
             "data": {
                 "home_team": team_home,
-                "guest_team": team_home,
+                "guest_team": team_guest,
                 "lg_id": league_id,
                 "home_rate": None,
                 "guest_rate": None,

TEMPAT SAMPAH
hg3535/spiders/__pycache__/lanqiu.cpython-36.pyc


TEMPAT SAMPAH
hg3535/spiders/__pycache__/roll_lanqiu.cpython-36.pyc


TEMPAT SAMPAH
hg3535/spiders/__pycache__/roll_wangqiu.cpython-36.pyc


TEMPAT SAMPAH
hg3535/spiders/__pycache__/roll_zuqiu.cpython-36.pyc


TEMPAT SAMPAH
hg3535/spiders/__pycache__/wangqiu.cpython-36.pyc


TEMPAT SAMPAH
hg3535/spiders/__pycache__/wq_jieshu.cpython-36.pyc


TEMPAT SAMPAH
hg3535/spiders/__pycache__/zuqiu.cpython-36.pyc


+ 27 - 27
hg3535/spiders/lanqiu.py

@@ -198,9 +198,9 @@ class LanqiuSpider(scrapy.Spider):
                         one_concede_guest_rule = ""
                         one_concede_home = ""
                         one_concede_home_rule = ""
-                        concedes_dict['one_concede_home_rule'] = one_concede_home_rule
+                        concedes_dict_rule['one_concede_home'] = one_concede_home_rule
                         concedes_dict['one_concede_home'] = one_concede_home
-                        concedes_dict['one_concede_guest_rule'] = one_concede_guest_rule
+                        concedes_dict_rule['one_concede_guest'] = one_concede_guest_rule
                         concedes_dict['one_concede_guest'] = one_concede_guest
                     # 第二节让球
                     try:
@@ -709,10 +709,10 @@ class LanqiuSpider(scrapy.Spider):
                             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 = ""
+                            score_guest_small = None
+                            score_guest_small_rule = None
+                            score_guest_big = None
+                            score_guest_big_rule = None
                             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
@@ -727,10 +727,10 @@ class LanqiuSpider(scrapy.Spider):
                             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 = ""
+                            half_score_guest_small = None
+                            half_score_guest_small_rule = None
+                            half_score_guest_big = None
+                            half_score_guest_big_rule = None
                             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
@@ -745,10 +745,10 @@ class LanqiuSpider(scrapy.Spider):
                             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 = ""
+                            one_score_guest_small = None
+                            one_score_guest_small_rule = None
+                            one_score_guest_big = None
+                            one_score_guest_big_rule = None
                             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
@@ -764,13 +764,13 @@ class LanqiuSpider(scrapy.Spider):
                             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 = ""
+                            two_score_guest_small = None
+                            two_score_guest_small_rule = None
+                            two_score_guest_big = None
+                            two_score_guest_big_rule = None
                             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_rule["two_score_guest_small"] = two_score_guest_small_rule
                             team_scores_dict["two_score_guest_small"] = two_score_guest_small
                         # 球队得分第三节
                         try:
@@ -782,10 +782,10 @@ class LanqiuSpider(scrapy.Spider):
                             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 = ""
+                            three_score_guest_small = None
+                            three_score_guest_small_rule = None
+                            three_score_guest_big = None
+                            three_score_guest_big_rule = None
                             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
@@ -800,10 +800,10 @@ class LanqiuSpider(scrapy.Spider):
                             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 = ""
+                            four_score_guest_small = None
+                            four_score_guest_small_rule = None
+                            four_score_guest_big = None
+                            four_score_guest_big_rule = None
                             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

+ 2 - 2
hg3535/spiders/roll_lanqiu.py

@@ -154,9 +154,9 @@ class LanqiuSpider(scrapy.Spider):
                 one_concede_guest_rule = ""
                 one_concede_home = ""
                 one_concede_home_rule = ""
-                concedes_dict['one_concede_home_rule'] = one_concede_home_rule
+                concedes_dict_rule['one_concede_home'] = one_concede_home_rule
                 concedes_dict['one_concede_home'] = one_concede_home
-                concedes_dict['one_concede_guest_rule'] = one_concede_guest_rule
+                concedes_dict_rule['one_concede_guest'] = one_concede_guest_rule
                 concedes_dict['one_concede_guest'] = one_concede_guest
             # 第二节让球
             try:

+ 2 - 2
hg3535/spiders/wangqiu.py

@@ -182,8 +182,8 @@ class LanqiuSpider(scrapy.Spider):
 
                 except:
                     odd_evens_dict['two_sides_single'] = ""
-                    odd_evens_dict['two_sides_single'] = ""
-                    odd_evens_dict_rule['two_sides_double'] = ""
+                    odd_evens_dict['two_sides_double'] = ""
+                    odd_evens_dict_rule['two_sides_single'] = ""
                     odd_evens_dict_rule['two_sides_double'] = ""
 
                 # 联赛id