更新

hg3535/.idea/workspace.xml

@@ -3,6 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="7fa42e97-ddea-4404-91db-5a9ccc162649" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spiders/roll_wangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_wangqiu.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -12,7 +14,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="1568112960593" 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="1568169328806" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/hg3535$change.coverage" NAME="change Coverage Results" MODIFIED="1567749757856" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/hg3535$hgjieshu.coverage" NAME="hgjieshu Coverage Results" MODIFIED="1558494720094" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
     <SUITE FILE_PATH="coverage/hg3535$halffull.coverage" NAME="halffull Coverage Results" MODIFIED="1554544334424" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
@@ -44,8 +46,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/main.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="15" column="45" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
+            <state relative-caret-position="320">
+              <caret line="16" column="45" lean-forward="true" selection-start-line="16" selection-start-column="45" selection-end-line="16" selection-end-column="45" />
               <folding>
                 <element signature="e#0#10#0" expanded="true" />
               </folding>
@@ -53,11 +55,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4281">
-              <caret line="312" column="70" lean-forward="true" selection-start-line="312" selection-start-column="70" selection-end-line="312" selection-end-column="70" />
+            <state relative-caret-position="843">
+              <caret line="312" column="70" selection-start-line="312" selection-start-column="70" selection-end-line="312" selection-end-column="70" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
               </folding>
@@ -68,7 +70,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/utils/helper.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
+            <state relative-caret-position="220">
               <caret line="11" column="71" selection-start-line="11" selection-start-column="65" selection-end-line="11" selection-end-column="71" />
               <folding>
                 <element signature="e#0#14#0" expanded="true" />
@@ -80,8 +82,8 @@
       <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="137">
-              <caret line="150" column="50" lean-forward="true" selection-start-line="150" selection-start-column="50" selection-end-line="150" selection-end-column="50" />
+            <state relative-caret-position="3000">
+              <caret line="150" column="50" selection-start-line="150" selection-start-column="50" selection-end-line="150" selection-end-column="50" />
             </state>
           </provider>
         </entry>
@@ -89,7 +91,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="181">
+            <state relative-caret-position="12000">
               <caret line="600" selection-start-line="600" selection-end-line="600" />
               <folding>
                 <element signature="e#24#39#0" expanded="true" />
@@ -101,7 +103,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1480">
+            <state relative-caret-position="1560">
               <caret line="78" column="35" selection-start-line="78" selection-start-column="35" selection-end-line="78" selection-end-column="35" />
               <folding>
                 <element signature="e#24#35#0" expanded="true" />
@@ -110,10 +112,22 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="362">
+              <caret line="87" selection-start-line="87" selection-end-line="87" />
+              <folding>
+                <element signature="e#24#39#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="416">
+            <state relative-caret-position="4620">
               <caret line="231" column="19" selection-start-line="231" selection-start-column="8" selection-end-line="231" selection-end-column="101" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
@@ -248,7 +262,6 @@
         <option value="$PROJECT_DIR$/items.py" />
         <option value="$PROJECT_DIR$/change.py" />
         <option value="$PROJECT_DIR$/spiders/wangqiu.py" />
-        <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_bangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
@@ -264,10 +277,11 @@
         <option value="$PROJECT_DIR$/pipeline/roll_zuqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
         <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
-        <option value="$PROJECT_DIR$/main.py" />
         <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
         <option value="$PROJECT_DIR$/settings.py" />
+        <option value="$PROJECT_DIR$/spiders/roll_wangqiu.py" />
+        <option value="$PROJECT_DIR$/main.py" />
       </list>
     </option>
   </component>
@@ -283,6 +297,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -304,7 +319,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -608,14 +622,8 @@
       <workItem from="1567765446416" duration="3616000" />
       <workItem from="1567826229018" duration="3226000" />
       <workItem from="1567836768286" duration="10382000" />
-      <workItem from="1567990502559" duration="35670000" />
-    </task>
-    <task id="LOCAL-00023" summary="更新">
-      <created>1559820458233</created>
-      <option name="number" value="00023" />
-      <option name="presentableId" value="LOCAL-00023" />
-      <option name="project" value="LOCAL" />
-      <updated>1559820458233</updated>
+      <workItem from="1567990502559" duration="35803000" />
+      <workItem from="1568168522540" duration="732000" />
     </task>
     <task id="LOCAL-00024" summary="更新">
       <created>1559832627997</created>
@@ -953,11 +961,18 @@
       <option name="project" value="LOCAL" />
       <updated>1568112995602</updated>
     </task>
-    <option name="localTasksCounter" value="72" />
+    <task id="LOCAL-00072" summary="更新">
+      <created>1568165743587</created>
+      <option name="number" value="00072" />
+      <option name="presentableId" value="LOCAL-00072" />
+      <option name="project" value="LOCAL" />
+      <updated>1568165743587</updated>
+    </task>
+    <option name="localTasksCounter" value="73" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1919074000" />
+    <option name="totallyTimeSpent" value="1919939000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -970,14 +985,13 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.15245202" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.15405117" />
       <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.49573562" weight="0.32188842" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49573562" visible="true" weight="0.32188842" />
       <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" />
@@ -987,7 +1001,7 @@
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5042644" side_tool="true" weight="0.2725322" />
       <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49307036" weight="0.15987125" />
       <window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" weight="0.37017167" />
-      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" visible="true" weight="0.50107294" />
+      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.50107294" />
       <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" />
@@ -1112,16 +1126,6 @@
           <line>212</line>
           <option name="timeStamp" value="65" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/spiders/roll_wangqiu.py</url>
-          <line>268</line>
-          <option name="timeStamp" value="67" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/spiders/roll_wangqiu.py</url>
-          <line>273</line>
-          <option name="timeStamp" value="70" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_wangqiu.py</url>
           <line>277</line>
@@ -1302,6 +1306,11 @@
           <line>666</line>
           <option name="timeStamp" value="258" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/roll_wangqiu.py</url>
+          <line>85</line>
+          <option name="timeStamp" value="261" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -1471,13 +1480,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../zq_match_status.log">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="337">
-          <caret line="18554" column="211" lean-forward="true" selection-start-line="18554" selection-start-column="208" selection-end-line="18554" selection-end-column="215" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/../../zq_match_status.log" />
     <entry file="file://$PROJECT_DIR$/requirements.txt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-360" />
@@ -1629,13 +1632,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-700">
-          <caret line="10" selection-start-line="10" selection-end-line="10" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-8612">
@@ -1666,16 +1662,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="15" column="45" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
-          <folding>
-            <element signature="e#0#10#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="20">
@@ -1688,7 +1674,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/utils/helper.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
+        <state relative-caret-position="220">
           <caret line="11" column="71" selection-start-line="11" selection-start-column="65" selection-end-line="11" selection-end-column="71" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
@@ -1696,9 +1682,26 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3000">
+          <caret line="150" column="50" selection-start-line="150" selection-start-column="50" selection-end-line="150" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="12000">
+          <caret line="600" selection-start-line="600" selection-end-line="600" />
+          <folding>
+            <element signature="e#24#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1480">
+        <state relative-caret-position="1560">
           <caret line="78" column="35" selection-start-line="78" selection-start-column="35" selection-end-line="78" selection-end-column="35" />
           <folding>
             <element signature="e#24#35#0" expanded="true" />
@@ -1708,7 +1711,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="416">
+        <state relative-caret-position="4620">
           <caret line="231" column="19" selection-start-line="231" selection-start-column="8" selection-end-line="231" selection-end-column="101" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
@@ -1716,29 +1719,32 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="181">
-          <caret line="600" selection-start-line="600" selection-end-line="600" />
+        <state relative-caret-position="843">
+          <caret line="312" column="70" selection-start-line="312" selection-start-column="70" selection-end-line="312" selection-end-column="70" />
           <folding>
-            <element signature="e#24#39#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/settings.py">
+    <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="137">
-          <caret line="150" column="50" lean-forward="true" selection-start-line="150" selection-start-column="50" selection-end-line="150" selection-end-column="50" />
+        <state relative-caret-position="320">
+          <caret line="16" column="45" lean-forward="true" selection-start-line="16" selection-start-column="45" selection-end-line="16" selection-end-column="45" />
+          <folding>
+            <element signature="e#0#10#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4281">
-          <caret line="312" column="70" lean-forward="true" selection-start-line="312" selection-start-column="70" selection-end-line="312" selection-end-column="70" />
+        <state relative-caret-position="362">
+          <caret line="87" selection-start-line="87" selection-end-line="87" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#24#39#0" expanded="true" />
           </folding>
         </state>
       </provider>

hg3535/main.py

@@ -12,8 +12,8 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 # execute(["scrapy", "crawl", "wqbodan"])
 # execute(["scrapy", "crawl", "bangqiu"])
 # execute(["scrapy", "crawl", "roll_zuqiu"]) # 滚球足球 回来要解开这个注释 其他全部解封
-execute(["scrapy", "crawl", "roll_lanqiu"]) #滚球篮球
-# execute(["scrapy", "crawl", "roll_wangqiu"]) #滚球网球
+# execute(["scrapy", "crawl", "roll_lanqiu"]) #滚球篮球
+execute(["scrapy", "crawl", "roll_wangqiu"]) #滚球网球
 # execute(["scrapy", "crawl", "roll_bangqiu"])  # 滚球棒球
 # execute(["scrapy", "crawl", "ball_status"]) #滚球id本地存
 # execute(["scrapy", "crawl", "ball_status_update"]) #滚球id结束时间更新状态

hg3535/spiders/roll_wangqiu.py

@@ -83,264 +83,266 @@ class WangqiuSpider(scrapy.Spider):
             for result in new_data:
                 # result = new_data[0]
                 # 比赛id
-                game_id = str(result['k'])
-                # 球队1
-                team_home = result['i'][0]
-                # 球队2
-                team_guest = result['i'][1]
-                # 数量(97>)
-                number = result['i'][2]
-                # 比赛状态
-                zhuangtai = result['i'][3]
-                # 日期
-                data_game = result['i'][4]
-                # 开赛时间  滚球实际只有一个进行时间
-                # time_game = result['i'][5]
-                try:
-                    time_game = result['sb']['ct']
-                except:
-                    time_game = '01:00'
-                # qiudui = result['pci'].get('ctn', "")
-                # ----------------------------------------让盘分割线---------------------------------------------------------------------------
-                concedes_dict = {}
-                concedes_dict_rule = {}
-                try:
-                    # 滚球让盘
-                    concedes = result['o']["ah"]["v"]
-                    concedes_dict_rule['ldh'] = concedes[1]  # 主队
-                    concedes_dict['ldh'] = concedes[5]
-                    concedes_dict_rule['ldg'] = concedes[3]  # 客队
-                    concedes_dict['ldg'] = concedes[7]
-                except:
-                    concedes_dict_rule['ldh'] = ""
-                    concedes_dict['ldh'] = ""
-                    concedes_dict_rule['ldg'] = ""
-                    concedes_dict['ldg'] = ""
-                # print(concedes_dict)
+                ctid = result['pci']['ctid']
+                if ctid == 0:
+                    game_id = str(result['k'])
+                    # 球队1
+                    team_home = result['i'][0]
+                    # 球队2
+                    team_guest = result['i'][1]
+                    # 数量(97>)
+                    number = result['i'][2]
+                    # 比赛状态
+                    zhuangtai = result['i'][3]
+                    # 日期
+                    data_game = result['i'][4]
+                    # 开赛时间  滚球实际只有一个进行时间
+                    # time_game = result['i'][5]
+                    try:
+                        time_game = result['sb']['ct']
+                    except:
+                        time_game = '01:00'
+                    # qiudui = result['pci'].get('ctn', "")
+                    # ----------------------------------------让盘分割线---------------------------------------------------------------------------
+                    concedes_dict = {}
+                    concedes_dict_rule = {}
+                    try:
+                        # 滚球让盘
+                        concedes = result['o']["ah"]["v"]
+                        concedes_dict_rule['ldh'] = concedes[1]  # 主队
+                        concedes_dict['ldh'] = concedes[5]
+                        concedes_dict_rule['ldg'] = concedes[3]  # 客队
+                        concedes_dict['ldg'] = concedes[7]
+                    except:
+                        concedes_dict_rule['ldh'] = ""
+                        concedes_dict['ldh'] = ""
+                        concedes_dict_rule['ldg'] = ""
+                        concedes_dict['ldg'] = ""
+                    # print(concedes_dict)
 
-                # ----------------------------------------第一节让球分割线----------------------------------------------------------------
-                # 第一节让盘
-                try:
-                    # 第一节让球
-                    one_concedes = result['o']["ahs1"]["v"]
-                    concedes_dict_rule['one_dishes_home'] = one_concedes[1]
-                    concedes_dict['one_dishes_home'] = one_concedes[5]
-                    concedes_dict_rule['one_dishes_guest'] = one_concedes[3]
-                    concedes_dict['one_dishes_guest'] = one_concedes[7]
-                except:
-                    concedes_dict_rule['one_dishes_home'] = ""
-                    concedes_dict['one_dishes_home'] = ""
-                    concedes_dict_rule['one_dishes_guest'] = ""
-                    concedes_dict['one_dishes_guest'] = ""
+                    # ----------------------------------------第一节让球分割线----------------------------------------------------------------
+                    # 第一节让盘
+                    try:
+                        # 第一节让球
+                        one_concedes = result['o']["ahs1"]["v"]
+                        concedes_dict_rule['one_dishes_home'] = one_concedes[1]
+                        concedes_dict['one_dishes_home'] = one_concedes[5]
+                        concedes_dict_rule['one_dishes_guest'] = one_concedes[3]
+                        concedes_dict['one_dishes_guest'] = one_concedes[7]
+                    except:
+                        concedes_dict_rule['one_dishes_home'] = ""
+                        concedes_dict['one_dishes_home'] = ""
+                        concedes_dict_rule['one_dishes_guest'] = ""
+                        concedes_dict['one_dishes_guest'] = ""
 
-                # ----------------------------------------第二节让球分割线-------------------------------------------------
+                    # ----------------------------------------第二节让球分割线-------------------------------------------------
 
-                # 第二节让盘
-                try:
-                    two_concedes = result['o']["ahs2"]["v"]
-                    concedes_dict_rule['two_dishes_home'] = two_concedes[1]
-                    concedes_dict['two_dishes_home'] = two_concedes[5]
-                    concedes_dict_rule['two_dishes_guest'] = two_concedes[3]
-                    concedes_dict['two_dishes_guest'] = two_concedes[7]
-                except:
-                    concedes_dict_rule['two_dishes_home'] = ""
-                    concedes_dict['two_dishes_home'] = ""
-                    concedes_dict_rule['two_dishes_guest'] = ""
-                    concedes_dict['two_dishes_guest'] = ""
+                    # 第二节让盘
+                    try:
+                        two_concedes = result['o']["ahs2"]["v"]
+                        concedes_dict_rule['two_dishes_home'] = two_concedes[1]
+                        concedes_dict['two_dishes_home'] = two_concedes[5]
+                        concedes_dict_rule['two_dishes_guest'] = two_concedes[3]
+                        concedes_dict['two_dishes_guest'] = two_concedes[7]
+                    except:
+                        concedes_dict_rule['two_dishes_home'] = ""
+                        concedes_dict['two_dishes_home'] = ""
+                        concedes_dict_rule['two_dishes_guest'] = ""
+                        concedes_dict['two_dishes_guest'] = ""
 
-                # ---------------------------------------------------冠军  滚球是独赢--------------------------------------
-                kemps_dict = {}
-                try:
-                    # 滚球独赢
-                    kemps = result['o']["ml"]["v"]
-                    kemps_dict['ch'] = kemps[1]  # 主队
-                    kemps_dict['cg'] = kemps[3]  # 客队
+                    # ---------------------------------------------------冠军  滚球是独赢--------------------------------------
+                    kemps_dict = {}
+                    try:
+                        # 滚球独赢
+                        kemps = result['o']["ml"]["v"]
+                        kemps_dict['ch'] = kemps[1]  # 主队
+                        kemps_dict['cg'] = kemps[3]  # 客队
 
-                except:
-                    kemps_dict['ch'] = ""
-                    kemps_dict['cg'] = ""
-                # 第一盘 冠军  第一盘独赢 滚球是独赢
-                try:
-                    kemps = result['o']["mls1"]["v"]
-                    kemps_dict['ch_1'] = kemps[1]
-                    kemps_dict['cg_1'] = kemps[3]
+                    except:
+                        kemps_dict['ch'] = ""
+                        kemps_dict['cg'] = ""
+                    # 第一盘 冠军  第一盘独赢 滚球是独赢
+                    try:
+                        kemps = result['o']["mls1"]["v"]
+                        kemps_dict['ch_1'] = kemps[1]
+                        kemps_dict['cg_1'] = kemps[3]
 
-                except:
-                    kemps_dict['ch_1'] = ""
-                    kemps_dict['cg_1'] = ""
+                    except:
+                        kemps_dict['ch_1'] = ""
+                        kemps_dict['cg_1'] = ""
 
-                try:  # 第二盘 独赢
-                    kemps = result['o']["mls2"]["v"]
-                    kemps_dict['ch_2'] = kemps[1]
-                    kemps_dict['cg_2'] = kemps[3]
-                except:
-                    kemps_dict['ch_2'] = ""
-                    kemps_dict["cg_2"] = ""
+                    try:  # 第二盘 独赢
+                        kemps = result['o']["mls2"]["v"]
+                        kemps_dict['ch_2'] = kemps[1]
+                        kemps_dict['cg_2'] = kemps[3]
+                    except:
+                        kemps_dict['ch_2'] = ""
+                        kemps_dict["cg_2"] = ""
 
-                # ---------------------------------------------------让局------------------------------------------------
+                    # ---------------------------------------------------让局------------------------------------------------
 
-                bureaus_dict = {}
-                bureaus_dict_rule = {}
-                try:
-                    bureaus = result['o']["ahfts"]["v"]
-                    bureaus_dict_rule['lbh'] = bureaus[1]  # 主队
-                    bureaus_dict['lbh'] = bureaus[5]
-                    bureaus_dict_rule['lbg'] = bureaus[3]  # 客队
-                    bureaus_dict['lbg'] = bureaus[7]
-                except:
-                    bureaus_dict_rule['lbh'] = ""
-                    bureaus_dict['lbh'] = ""
-                    bureaus_dict_rule['lbg'] = ""
-                    bureaus_dict['lbg'] = ""
-                # -----------------------------------------------------总局数 第一盘:大/小---------------------------------
-                total_number_dict = {}
-                total_number_dict_rule = {}
-                try:  # 总局数 滚球大小
-                    total_numbers = result['o']["oufts"]["v"]
-                    total_number_dict_rule['tnb'] = total_numbers[1]
-                    total_number_dict['tnb'] = total_numbers[5]
-                    total_number_dict_rule['tns'] = total_numbers[3]
-                    total_number_dict['tns'] = total_numbers[7]
-                except:
-                    total_number_dict_rule['tnb'] = ""
-                    total_number_dict['tnb'] = ""
-                    total_number_dict_rule['tns'] = ""
-                    total_number_dict['tns'] = ""
+                    bureaus_dict = {}
+                    bureaus_dict_rule = {}
+                    try:
+                        bureaus = result['o']["ahfts"]["v"]
+                        bureaus_dict_rule['lbh'] = bureaus[1]  # 主队
+                        bureaus_dict['lbh'] = bureaus[5]
+                        bureaus_dict_rule['lbg'] = bureaus[3]  # 客队
+                        bureaus_dict['lbg'] = bureaus[7]
+                    except:
+                        bureaus_dict_rule['lbh'] = ""
+                        bureaus_dict['lbh'] = ""
+                        bureaus_dict_rule['lbg'] = ""
+                        bureaus_dict['lbg'] = ""
+                    # -----------------------------------------------------总局数 第一盘:大/小---------------------------------
+                    total_number_dict = {}
+                    total_number_dict_rule = {}
+                    try:  # 总局数 滚球大小
+                        total_numbers = result['o']["oufts"]["v"]
+                        total_number_dict_rule['tnb'] = total_numbers[1]
+                        total_number_dict['tnb'] = total_numbers[5]
+                        total_number_dict_rule['tns'] = total_numbers[3]
+                        total_number_dict['tns'] = total_numbers[7]
+                    except:
+                        total_number_dict_rule['tnb'] = ""
+                        total_number_dict['tnb'] = ""
+                        total_number_dict_rule['tns'] = ""
+                        total_number_dict['tns'] = ""
 
-                # 第一节盘
-                try:
-                    one_total_sizes = result['o']["ous1"]["v"]
-                    total_number_dict_rule["tnb_1"] = one_total_sizes[1]
-                    total_number_dict["tnb_1"] = one_total_sizes[5]
-                    total_number_dict_rule["tns_1"] = one_total_sizes[3]
-                    total_number_dict["tns_1"] = one_total_sizes[7]
-                except:
-                    total_number_dict_rule["tnb_1"] = ""
-                    total_number_dict["tnb_1"] = ""
-                    total_number_dict_rule["tns_1"] = ""
-                    total_number_dict["tns_1"] = ""
+                    # 第一节盘
+                    try:
+                        one_total_sizes = result['o']["ous1"]["v"]
+                        total_number_dict_rule["tnb_1"] = one_total_sizes[1]
+                        total_number_dict["tnb_1"] = one_total_sizes[5]
+                        total_number_dict_rule["tns_1"] = one_total_sizes[3]
+                        total_number_dict["tns_1"] = one_total_sizes[7]
+                    except:
+                        total_number_dict_rule["tnb_1"] = ""
+                        total_number_dict["tnb_1"] = ""
+                        total_number_dict_rule["tns_1"] = ""
+                        total_number_dict["tns_1"] = ""
 
-                # 第二节盘
-                try:
-                    two_total_sizes = result['o']["ous2"]["v"]
-                    total_number_dict_rule["tnb_2"] = two_total_sizes[1]
-                    total_number_dict["tnb_2"] = two_total_sizes[5]
-                    total_number_dict_rule["tns_2"] = two_total_sizes[3]
-                    total_number_dict["tns_2"] = two_total_sizes[7]
-                except:
-                    total_number_dict_rule["tnb_2"] = ""
-                    total_number_dict["tnb_2"] = ""
-                    total_number_dict_rule["tns_2"] = ""
-                    total_number_dict["tns_2"] = ""
+                    # 第二节盘
+                    try:
+                        two_total_sizes = result['o']["ous2"]["v"]
+                        total_number_dict_rule["tnb_2"] = two_total_sizes[1]
+                        total_number_dict["tnb_2"] = two_total_sizes[5]
+                        total_number_dict_rule["tns_2"] = two_total_sizes[3]
+                        total_number_dict["tns_2"] = two_total_sizes[7]
+                    except:
+                        total_number_dict_rule["tnb_2"] = ""
+                        total_number_dict["tnb_2"] = ""
+                        total_number_dict_rule["tns_2"] = ""
+                        total_number_dict["tns_2"] = ""
 
-                # 第三节盘
-                try:
-                    three_total_sizes = result['o']["ous3"]["v"]
-                    total_number_dict_rule["tnb_3"] = three_total_sizes[1]
-                    total_number_dict["tnb_3"] = three_total_sizes[5]
-                    total_number_dict_rule["tns_3"] = three_total_sizes[3]
-                    total_number_dict["tns_3"] = three_total_sizes[7]
-                except:
-                    total_number_dict_rule["tnb_3"] = ""
-                    total_number_dict["tnb_3"] = ""
-                    total_number_dict_rule["tns_3"] = ""
-                    total_number_dict["tns_3"] = ""
+                    # 第三节盘
+                    try:
+                        three_total_sizes = result['o']["ous3"]["v"]
+                        total_number_dict_rule["tnb_3"] = three_total_sizes[1]
+                        total_number_dict["tnb_3"] = three_total_sizes[5]
+                        total_number_dict_rule["tns_3"] = three_total_sizes[3]
+                        total_number_dict["tns_3"] = three_total_sizes[7]
+                    except:
+                        total_number_dict_rule["tnb_3"] = ""
+                        total_number_dict["tnb_3"] = ""
+                        total_number_dict_rule["tns_3"] = ""
+                        total_number_dict["tns_3"] = ""
 
-                # ------------------------------------------------------总局数:单/双--------------------------------------
-                odd_evens_dict = {}
-                odd_evens_dict_rule = {}
-                try:
-                    odd_evens = result['o']["oefts"]["v"]
-                    # 上半场 主队让球条件
-                    odd_evens_dict['tss'] = odd_evens[1]  # 之前是odd_even_odd
-                    odd_evens_dict_rule['tss'] = "单"
-                    odd_evens_dict['tsd'] = odd_evens[3]
-                    odd_evens_dict_rule['tsd'] = "双"
+                    # ------------------------------------------------------总局数:单/双--------------------------------------
+                    odd_evens_dict = {}
+                    odd_evens_dict_rule = {}
+                    try:
+                        odd_evens = result['o']["oefts"]["v"]
+                        # 上半场 主队让球条件
+                        odd_evens_dict['tss'] = odd_evens[1]  # 之前是odd_even_odd
+                        odd_evens_dict_rule['tss'] = "单"
+                        odd_evens_dict['tsd'] = odd_evens[3]
+                        odd_evens_dict_rule['tsd'] = "双"
 
-                except:
-                    odd_evens_dict['tss'] = ""
-                    odd_evens_dict['tsd'] = ""
-                    odd_evens_dict_rule['tsd'] = ""
-                    odd_evens_dict_rule['tss'] = ""
+                    except:
+                        odd_evens_dict['tss'] = ""
+                        odd_evens_dict['tsd'] = ""
+                        odd_evens_dict_rule['tsd'] = ""
+                        odd_evens_dict_rule['tss'] = ""
 
-                # 盘，局，点
-                sq_dict = {}
-                # 每局比分
-                score_dict = {}
-                try:
-                    saiqing = []
-                    # h为第一个队伍，a为第二个队伍
-                    s = result['sb']['cp']  # 当前比赛是第几节
-                    cps = result['sb']['ps']
-                    # 队伍1 当前的大比分
-                    h = result['sb']['h']
-                    # 队伍2 当前的大比分
-                    a = result['sb']['a']
-                    score_dict['schedule'] = s
-                    score_dict['sc_1th_H'] = cps[1]['h']
-                    score_dict['sc_1th_C'] = cps[1]['a']
-                    score_dict['sc_2th_H'] = cps[2]['h']
-                    score_dict['sc_2th_C'] = cps[2]['a']
-                    score_dict['sc_3th_H'] = cps[3]['h']
-                    score_dict['sc_3th_C'] = cps[3]['a']
-                    score_dict['sc_4th_H'] = cps[4]['h']
-                    score_dict['sc_4th_C'] = cps[4]['a']
-                    score_dict['sc_5th_H'] = cps[7]['h']
-                    score_dict['sc_5th_C'] = cps[7]['a']
-                    score_dict['disc_H'] = cps[0]['h']
-                    score_dict['disc_C'] = cps[0]['a']
-                    score_dict['spot_H'] = cps[6]['h']
-                    score_dict['spot_C'] = cps[6]['a']
-                    score_dict['game_num_H'] = cps[5]['h']
-                    score_dict['game_num_C'] = cps[5]['a']
-                    score_dict["showdelay"] = ''
-                    score_dict['best'] = rule
-                except:
-                    h = ""
-                    a = ""
-                    s = ""
-                # 联赛id
-                item['league_id'] = league_id
-                # 联赛名
-                item['league_name'] = league_name
-                # 比赛id
-                item['game_id'] = game_id
-                # 球队1
-                item['team_home'] = team_home
-                # 球队2
-                item['team_guest'] = team_guest
-                # 数量(97>)
-                item['number'] = number
-                # 比赛状态
-                item['zhuangtai'] = zhuangtai
-                # 日期
-                item['data_game'] = data_game
-                # 开赛时间
-                item['time_game'] = time_game
-                # 队1分数
-                item['score_home'] = h
-                # 队2分数
-                item['score_guest'] = a
-                # 当前第几节
-                item['jijie'] = s
-                # 每局比分
-                item['score_dict'] = score_dict
-                # 球队得分
-                # item['qiudui'] = qiudui
-                # 让盘
-                item['concedes_dict'] = concedes_dict
-                item['concedes_dict_rule'] = concedes_dict_rule
-                # 冠军
-                item['kemps_dict'] = kemps_dict
-                # 让局
-                item['bureaus_dict'] = bureaus_dict
-                item['bureaus_dict_rule'] = bureaus_dict_rule
-                # 总局数大小
-                item['total_number_dict'] = total_number_dict
-                item['total_number_dict_rule'] = total_number_dict_rule
-                # 总局数单双
-                item['odd_evens_dict'] = odd_evens_dict
-                item['odd_evens_dict_rule'] = odd_evens_dict_rule
-                item['sq_dict'] = sq_dict
-                item['rule'] = rule
-                yield item
+                    # 盘，局，点
+                    sq_dict = {}
+                    # 每局比分
+                    score_dict = {}
+                    try:
+                        saiqing = []
+                        # h为第一个队伍，a为第二个队伍
+                        s = result['sb']['cp']  # 当前比赛是第几节
+                        cps = result['sb']['ps']
+                        # 队伍1 当前的大比分
+                        h = result['sb']['h']
+                        # 队伍2 当前的大比分
+                        a = result['sb']['a']
+                        score_dict['schedule'] = s
+                        score_dict['sc_1th_H'] = cps[1]['h']
+                        score_dict['sc_1th_C'] = cps[1]['a']
+                        score_dict['sc_2th_H'] = cps[2]['h']
+                        score_dict['sc_2th_C'] = cps[2]['a']
+                        score_dict['sc_3th_H'] = cps[3]['h']
+                        score_dict['sc_3th_C'] = cps[3]['a']
+                        score_dict['sc_4th_H'] = cps[4]['h']
+                        score_dict['sc_4th_C'] = cps[4]['a']
+                        score_dict['sc_5th_H'] = cps[7]['h']
+                        score_dict['sc_5th_C'] = cps[7]['a']
+                        score_dict['disc_H'] = cps[0]['h']
+                        score_dict['disc_C'] = cps[0]['a']
+                        score_dict['spot_H'] = cps[6]['h']
+                        score_dict['spot_C'] = cps[6]['a']
+                        score_dict['game_num_H'] = cps[5]['h']
+                        score_dict['game_num_C'] = cps[5]['a']
+                        score_dict["showdelay"] = ''
+                        score_dict['best'] = rule
+                    except:
+                        h = ""
+                        a = ""
+                        s = ""
+                    # 联赛id
+                    item['league_id'] = league_id
+                    # 联赛名
+                    item['league_name'] = league_name
+                    # 比赛id
+                    item['game_id'] = game_id
+                    # 球队1
+                    item['team_home'] = team_home
+                    # 球队2
+                    item['team_guest'] = team_guest
+                    # 数量(97>)
+                    item['number'] = number
+                    # 比赛状态
+                    item['zhuangtai'] = zhuangtai
+                    # 日期
+                    item['data_game'] = data_game
+                    # 开赛时间
+                    item['time_game'] = time_game
+                    # 队1分数
+                    item['score_home'] = h
+                    # 队2分数
+                    item['score_guest'] = a
+                    # 当前第几节
+                    item['jijie'] = s
+                    # 每局比分
+                    item['score_dict'] = score_dict
+                    # 球队得分
+                    # item['qiudui'] = qiudui
+                    # 让盘
+                    item['concedes_dict'] = concedes_dict
+                    item['concedes_dict_rule'] = concedes_dict_rule
+                    # 冠军
+                    item['kemps_dict'] = kemps_dict
+                    # 让局
+                    item['bureaus_dict'] = bureaus_dict
+                    item['bureaus_dict_rule'] = bureaus_dict_rule
+                    # 总局数大小
+                    item['total_number_dict'] = total_number_dict
+                    item['total_number_dict_rule'] = total_number_dict_rule
+                    # 总局数单双
+                    item['odd_evens_dict'] = odd_evens_dict
+                    item['odd_evens_dict_rule'] = odd_evens_dict_rule
+                    item['sq_dict'] = sq_dict
+                    item['rule'] = rule
+                    yield item