'更新'

hg3535/.idea/workspace.xml

@@ -5,8 +5,6 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ball_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/ball_func.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipelines.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipelines.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/spiders/wq_jieshu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/wq_jieshu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/spiders/zuqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/zuqiu.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -44,52 +42,27 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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="630">
-              <caret line="164" column="15" selection-start-line="164" selection-start-column="15" selection-end-line="164" selection-end-column="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <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="954">
-              <caret line="176" column="51" lean-forward="true" selection-start-line="176" selection-start-column="51" selection-end-line="176" selection-end-column="51" />
+            <state relative-caret-position="18034">
+              <caret line="1533" column="12" selection-start-line="1533" selection-start-column="12" selection-end-line="1533" selection-end-column="12" />
               <folding>
                 <element signature="e#0#11#0" expanded="true" />
-                <element signature="e#30311#41163#0" />
-                <element signature="e#34870#37800#0" />
-                <element signature="e#38057#39274#0" />
-                <element signature="e#39313#40448#0" />
-                <element signature="e#40490#41635#0" />
-                <element signature="e#39802#41143#0" />
-                <element signature="e#41319#45407#0" />
-                <element signature="e#45561#56897#0" />
-                <element signature="e#57047#63553#0" />
-                <element signature="e#63704#72423#0" />
-                <element signature="e#72592#89692#0" />
-                <element signature="e#89744#103864#0" />
-                <element signature="e#103918#118459#0" />
-                <element signature="e#118512#132487#0" />
-                <element signature="e#132642#135349#0" />
-                <element signature="e#135505#136903#0" />
-                <element signature="e#137060#138495#0" />
-                <element signature="e#138652#140087#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
+        <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="72">
-              <caret line="489" selection-start-line="489" selection-end-line="489" />
+            <state relative-caret-position="8046">
+              <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>
@@ -98,8 +71,8 @@
       <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="357">
-              <caret line="509" column="29" selection-start-line="509" selection-start-column="29" selection-end-line="509" selection-end-column="29" />
+            <state relative-caret-position="7938">
+              <caret line="443" column="16" selection-start-line="443" selection-start-column="6" selection-end-line="443" selection-end-column="16" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
               </folding>
@@ -118,10 +91,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>half_concede_home</find>
-      <find>conn</find>
-      <find>result</find>
-      <find>score_home</find>
       <find>capots_dict</find>
       <find>half_size_home</find>
       <find>last_number</find>
@@ -143,11 +112,15 @@
       <find>bqone_intodb</find>
       <find>sizes</find>
       <find>wqone_intodb</find>
-      <find>one_intodb</find>
-      <find>two_intodb</find>
-      <find>zqone_intodb</find>
       <find>zqo_intodb</find>
       <find>zqtwo_intodb</find>
+      <find>zqone_intodbs</find>
+      <find>zqone_intodb</find>
+      <find>one_intodb</find>
+      <find>one</find>
+      <find>one_post</find>
+      <find>three_intodb</find>
+      <find>two_intodb</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -249,7 +222,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="9" />
     <option name="y" value="20" />
     <option name="width" value="1936" />
@@ -286,7 +259,7 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../20190528/sports_scrapy" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
@@ -534,7 +507,8 @@
       <workItem from="1558918879384" duration="20712000" />
       <workItem from="1559039245474" duration="433000" />
       <workItem from="1559046451714" duration="22615000" />
-      <workItem from="1559195646143" duration="13959000" />
+      <workItem from="1559195646143" duration="22396000" />
+      <workItem from="1559272619876" duration="1306000" />
     </task>
     <task id="LOCAL-00001" summary="修改后,版本二">
       <created>1555727493584</created>
@@ -687,7 +661,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1596218000" />
+    <option name="totallyTimeSpent" value="1605961000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -699,10 +673,9 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1066" extended-state="7" />
-    <editor active="true" />
+    <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.18496802" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.18710022" />
       <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" />
@@ -1131,18 +1104,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6984">
-          <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$/spiders/wq_jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="360">
@@ -1153,16 +1114,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/ball_func.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="509" column="29" selection-start-line="509" selection-start-column="29" selection-end-line="509" selection-end-column="29" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="72">
@@ -1182,28 +1133,32 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pipelines.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="954">
-          <caret line="176" column="51" lean-forward="true" selection-start-line="176" selection-start-column="51" selection-end-line="176" selection-end-column="51" />
+        <state relative-caret-position="18034">
+          <caret line="1533" column="12" selection-start-line="1533" selection-start-column="12" selection-end-line="1533" selection-end-column="12" />
           <folding>
             <element signature="e#0#11#0" expanded="true" />
-            <element signature="e#30311#41163#0" />
-            <element signature="e#34870#37800#0" />
-            <element signature="e#38057#39274#0" />
-            <element signature="e#39313#40448#0" />
-            <element signature="e#40490#41635#0" />
-            <element signature="e#39802#41143#0" />
-            <element signature="e#41319#45407#0" />
-            <element signature="e#45561#56897#0" />
-            <element signature="e#57047#63553#0" />
-            <element signature="e#63704#72423#0" />
-            <element signature="e#72592#89692#0" />
-            <element signature="e#89744#103864#0" />
-            <element signature="e#103918#118459#0" />
-            <element signature="e#118512#132487#0" />
-            <element signature="e#132642#135349#0" />
-            <element signature="e#135505#136903#0" />
-            <element signature="e#137060#138495#0" />
-            <element signature="e#138652#140087#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="8046">
+          <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$/ball_func.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="7938">
+          <caret line="443" column="16" selection-start-line="443" selection-start-column="6" selection-end-line="443" selection-end-column="16" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>

hg3535/ball_func.py

@@ -512,12 +512,12 @@ def news_times(ctime):
     return match_date, match_time, time3
 
 
-def one_post(data, match_id, odds_code, p_id, league_id, p_code, condition):
+def one_post(data, match_id, odds_code, p_id, league_id, p_code, condition, game_code):
     if data:
         new_hash = hash_func(match_id=match_id, odds_code=odds_code, sort=0, p_id=p_id)
         r_hash = r_func(match_id=match_id, odds_code=odds_code, sort=0, p_id=p_id, odd=data)
         payload = {
-            "game_code": "zq",
+            "game_code": game_code,
             "title": "odds",
             "data": {
                 "match_id": match_id,
@@ -535,4 +535,33 @@ def one_post(data, match_id, odds_code, p_id, league_id, p_code, condition):
                 "team": ""
             }
         }
-        return payload
+        return payload
+
+
+def two_post(data, match_id, odds_code, p_id, league_id, p_code, condition, game_code):
+    if data:
+        for index, value in enumerate(data):
+            if value:
+                s_hash = hash_func(match_id=match_id, odds_code=odds_code, sort=0, p_id=p_id)
+                o_hash = r_func(match_id=match_id, odds_code=odds_code, sort=0, p_id=p_id, odd=value)
+                f1 = fuhao(str(condition[index]))
+                payload = {
+                    "game_code": game_code,
+                    "title": "odds",
+                    "data": {
+                        "match_id": match_id,
+                        "lg_id": league_id,
+                        "odds_code": odds_code,
+                        "status": 0,
+                        "sort": index,
+                        "p_code": p_code,
+                        "odds": value,
+                        "condition": f1,
+                        "odds_only": o_hash,
+                        "sole": s_hash,
+                        "source": "hg3535",
+                        "type": 0,
+                        "team": ""
+                    }
+                }
+                return payload