瀏覽代碼

merge branch

faker 6 年之前
父節點
當前提交
2b11508ab9

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+/log

+ 4 - 0
.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

+ 6 - 0
.idea/libraries/R_User_Library.xml

@@ -0,0 +1,6 @@
+<component name="libraryTable">
+  <library name="R User Library">
+    <CLASSES />
+    <SOURCES />
+  </library>
+</component>

+ 7 - 0
.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
+</project>

+ 8 - 0
.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/sports_collect.iml" filepath="$PROJECT_DIR$/.idea/sports_collect.iml" />
+    </modules>
+  </component>
+</project>

+ 14 - 0
.idea/sports_collect.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="R User Library" level="project" />
+    <orderEntry type="library" name="R Skeletons" level="application" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="projectConfiguration" value="Nosetests" />
+    <option name="PROJECT_TEST_RUNNER" value="Nosetests" />
+  </component>
+</module>

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

+ 780 - 0
.idea/workspace.xml

@@ -0,0 +1,780 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="87e036c0-2f0b-4473-b850-18ac24a30c0e" name="Default Changelist" comment="'更新'">
+      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/R_User_Library.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/sports_collect.iml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/collectSports/chromedriver.exe" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/collectSports/geckodriver.log" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/collectSports/mcollect/hg0088/fcache/hg0088.chain.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/collectSports/utils/__init__.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/collectSports/utils/helper.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/collectSports/conf/hg0088.json" beforeDir="false" afterPath="$PROJECT_DIR$/collectSports/conf/hg0088.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/collectSports/items.py" beforeDir="false" afterPath="$PROJECT_DIR$/collectSports/items.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/collectSports/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/collectSports/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/collectSports/mcollect/hg0088/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/collectSports/mcollect/hg0088/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/collectSports/mcollect/hg0088/fcache/hg0088.zaopan.js" beforeDir="false" afterPath="$PROJECT_DIR$/collectSports/mcollect/hg0088/fcache/hg0088.zaopan.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/collectSports/pipelines/sportslst.py" beforeDir="false" afterPath="$PROJECT_DIR$/collectSports/pipelines/sportslst.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/collectSports/spiders/sports.py" beforeDir="false" afterPath="$PROJECT_DIR$/collectSports/spiders/sports.py" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="CoverageDataManager">
+    <SUITE FILE_PATH="coverage/sports_collect$main.coverage" NAME="main Coverage Results" MODIFIED="1560765158051" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/collectSports" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/collectSports/pipelines/sportslst.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-3675">
+              <caret line="20" column="26" lean-forward="true" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
+              <folding>
+                <element signature="e#193#204#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/collectSports/spiders/demo.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="225">
+              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+              <folding>
+                <element signature="e#24#37#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/collectSports/utils/helper.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="125">
+              <caret line="5" column="21" lean-forward="true" selection-start-line="5" selection-start-column="21" selection-end-line="5" selection-end-column="21" />
+              <folding>
+                <element signature="e#0#11#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/collectSports/spiders/sportslst.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1369">
+              <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/collectSports/main.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="220">
+              <caret line="24" column="10" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="10" />
+              <folding>
+                <element signature="e#0#10#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/collectSports/spiders/sports.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-3644">
+              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+              <folding>
+                <element signature="e#24#35#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/collectSports/pipelines/sports.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <folding>
+                <element signature="e#0#11#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Python Script" />
+      </list>
+    </option>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>60313</find>
+      <find>磐田山叶 -角球数</find>
+      <find>ZqLeagueItem</find>
+      <find>match_mode</find>
+      <find>zq_league</find>
+      <find>zq_competitions</find>
+      <find>update</find>
+      <find>insert</find>
+      <find>compe</find>
+      <find>&quot;st_zq_competition&quot;</find>
+      <find>zq_competition</find>
+      <find>guanjun</find>
+      <find>csource</find>
+      <find>CallInterFace</find>
+      <find>Helper</find>
+    </findStrings>
+    <replaceStrings>
+      <replace />
+    </replaceStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/collectSports/models/model.py" />
+        <option value="$PROJECT_DIR$/collectSports/pipelines.py" />
+        <option value="$PROJECT_DIR$/collectSports/mcollect/hg0088/fcache/hg0088.zaopan.js" />
+        <option value="$PROJECT_DIR$/collectSports/spiders/sportslst.py" />
+        <option value="$PROJECT_DIR$/collectSports/items.py" />
+        <option value="$PROJECT_DIR$/collectSports/settings.py" />
+        <option value="$PROJECT_DIR$/collectSports/biz/__init__.py" />
+        <option value="$PROJECT_DIR$/collectSports/conf/settings.json" />
+        <option value="$PROJECT_DIR$/pycomm/mongo.py" />
+        <option value="$PROJECT_DIR$/collectSports/mcollect/hg0088/Storage.py" />
+        <option value="$PROJECT_DIR$/collectSports/mcollect/hg0088/Resolver.py" />
+        <option value="$PROJECT_DIR$/collectSports/mcollect/hg0088/LinkPool.py" />
+        <option value="$PROJECT_DIR$/collectSports/spiders/demo.py" />
+        <option value="$PROJECT_DIR$/collectSports/conf/hg0088.json" />
+        <option value="$PROJECT_DIR$/collectSports/utils/call_interface.py" />
+        <option value="$PROJECT_DIR$/collectSports/mcollect/hg0088/__init__.py" />
+        <option value="$PROJECT_DIR$/collectSports/utils/helper.py" />
+        <option value="$PROJECT_DIR$/collectSports/pipelines/sportslst.py" />
+        <option value="$PROJECT_DIR$/collectSports/spiders/sports.py" />
+        <option value="$PROJECT_DIR$/collectSports/main.py" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-57" />
+    <option name="y" value="108" />
+    <option name="width" value="1938" />
+    <option name="height" value="891" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="sports_collect" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sports_collect" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sports_collect" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sports_collect" type="462c0819:PsiDirectoryNode" />
+              <item name="collectSports" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sports_collect" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sports_collect" type="462c0819:PsiDirectoryNode" />
+              <item name="collectSports" type="462c0819:PsiDirectoryNode" />
+              <item name="pipelines" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sports_collect" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sports_collect" type="462c0819:PsiDirectoryNode" />
+              <item name="collectSports" type="462c0819:PsiDirectoryNode" />
+              <item name="spiders" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sports_collect" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sports_collect" type="462c0819:PsiDirectoryNode" />
+              <item name="collectSports" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="sports_collect" type="b2602c69:ProjectViewProjectNode" />
+              <item name="sports_collect" type="462c0819:PsiDirectoryNode" />
+              <item name="pycomm" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <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" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\admin\Desktop\sports_collect\collectSports" />
+    </key>
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager">
+    <configuration name="main" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="sports_collect" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/collectSports/main.py" />
+      <option name="PARAMETERS" value="0.0.0.0:8888" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python.main" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="87e036c0-2f0b-4473-b850-18ac24a30c0e" name="Default Changelist" comment="" />
+      <created>1560503478733</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1560503478733</updated>
+      <workItem from="1560503481851" duration="8226000" />
+      <workItem from="1560569123509" duration="24000" />
+      <workItem from="1560577738720" duration="12151000" />
+      <workItem from="1560733222825" duration="20421000" />
+      <workItem from="1560848283915" duration="215000" />
+      <workItem from="1560848805159" duration="1220000" />
+      <workItem from="1560906874868" duration="28010000" />
+      <workItem from="1560993078342" duration="15258000" />
+    </task>
+    <task id="LOCAL-00001" summary="'更新'">
+      <created>1560503640918</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1560503640919</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="86715000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-7" y="-7" width="1295" height="695" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18027486" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.3285968" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.5171674" />
+      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.25399646" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="bottom" id="Database Changes" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Terminal" order="11" weight="0.32939914" />
+      <window_info anchor="bottom" id="Python Console" order="12" />
+      <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" visible="true" weight="0.17542441" />
+      <window_info anchor="right" id="SciView" order="3" />
+      <window_info anchor="right" id="R Graphics" order="4" />
+      <window_info anchor="right" id="R Packages" order="5" />
+      <window_info anchor="right" id="Database" order="6" />
+    </layout>
+    <layout-to-restore>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19886823" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.5171674" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.56838363" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="bottom" id="Database Changes" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Terminal" order="11" weight="0.32939914" />
+      <window_info anchor="bottom" id="Python Console" order="12" />
+      <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" />
+      <window_info anchor="right" id="SciView" order="3" />
+      <window_info anchor="right" id="R Graphics" order="4" />
+      <window_info anchor="right" id="R Packages" order="5" />
+      <window_info anchor="right" id="Database" order="6" />
+    </layout-to-restore>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="'更新'" />
+    <option name="LAST_COMMIT_MESSAGE" value="'更新'" />
+  </component>
+  <component name="XDebuggerManager">
+    <watches-manager>
+      <configuration name="PythonConfigurationType">
+        <watch expression="int(match_time.group(1))" language="Python" />
+        <watch expression="current_time - datetime.datetime.strptime(match_date + match_time.group(0), &quot;%Y-%m-%d %H:%M:%S&quot;)" language="Python" />
+        <watch expression="match_date + ' ' + match_time.group(0)" language="Python" />
+        <watch expression="match_date + ' ' + match_time.group(0) + ':00'" language="Python" />
+        <watch expression="current_time - datetime.datetime.strptime(old_time, &quot;%Y-%m-%d %H:%M:%S&quot;)" language="Python" />
+        <watch expression="zq_league.get('uuid')" language="Python" />
+        <watch expression="match_time.group(1)" language="Python" />
+        <watch expression="(datetime.datetime.strptime(match_date, '%Y-%m-%d') + datetime.timedelta(days=1)).strftime('%Y-%m-%d')" language="Python" />
+        <watch expression="CallInterFace.post(url, league_list)" language="Python" />
+        <watch expression="item['guanjun']" language="Python" />
+        <watch expression="item['chain']" language="Python" />
+      </configuration>
+    </watches-manager>
+  </component>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/sports_collect$main.coverage" NAME="main Coverage Results" MODIFIED="1561008631179" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+  </component>
+  <component name="debuggerHistoryManager">
+    <expressions id="watch">
+      <expression>
+        <expression-string>item['chain']</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>item['guanjun']</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>CallInterFace.post(url, league_list)</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>(datetime.datetime.strptime(match_date, '%Y-%m-%d') + datetime.timedelta(days=1)).strftime('%Y-%m-%d')</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>match_time.group(1)</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>zq_league.get('uuid')[0]</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>zq_league.get('uuid')</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>current_time - datetime.datetime.strptime(old_time, &quot;%Y-%m-%d %H:%M:%S&quot;)</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>match_date + ' ' + match_time.group(0) + ':00'</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>atch_date + ' ' + match_time.group(0) + ':00'</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+    </expressions>
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/collectSports/mcollect/hg0088/tmpl/zaopan.tmpl">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/pipelines.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="11" column="21" lean-forward="true" selection-start-line="11" selection-start-column="21" selection-end-line="11" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/models/zqMatch.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/mcollect/hg0088/fcache/hg0088.zaopan.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="77" column="204" selection-start-line="77" selection-start-column="204" selection-end-line="77" selection-end-column="204" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/mcollect/hg0088/fcache/hg0088.today.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/scrapy/item.py" />
+    <entry file="file://$PROJECT_DIR$/collectSports/models/model.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="396">
+          <caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/settings.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="456">
+          <caret line="92" selection-start-line="92" selection-end-line="92" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pycomm/db.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-858">
+          <caret line="15" column="40" lean-forward="true" selection-start-line="15" selection-start-column="40" selection-end-line="15" selection-end-column="40" />
+          <folding>
+            <element signature="e#47#61#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/log/2019-06-15/14.err" />
+    <entry file="file://$PROJECT_DIR$/collectSports/log/2019-06-15/15.err" />
+    <entry file="file://$PROJECT_DIR$/collectSports/spiders/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/models/zqChain.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/models/zqLeague.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/models/zqLeagueOut.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="72">
+          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/pipelines/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/scrapy/http/response/text.py" />
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/twisted/internet/defer.py" />
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/scrapy/http/response/__init__.py" />
+    <entry file="file://$PROJECT_DIR$/collectSports/conf/settings.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="4" column="18" lean-forward="true" selection-start-line="4" selection-start-column="18" selection-end-line="4" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/conf/hg0088.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2076">
+          <caret line="2750" column="28" lean-forward="true" selection-start-line="2750" selection-start-column="28" selection-end-line="2750" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/pymongo/collection.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="116">
+          <caret line="152" selection-start-line="152" selection-end-line="152" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/pymongo/database.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="116">
+          <caret line="298" selection-start-line="298" selection-end-line="298" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/pymongo/mongo_client.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="222">
+          <caret line="511" selection-start-line="511" selection-end-line="511" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/scrapy/item.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="116">
+          <caret line="58" selection-start-line="58" selection-end-line="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.PyCharm2019.1/system/python_stubs/-313451744/builtins.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="133">
+          <caret line="259" column="7" lean-forward="true" selection-start-line="259" selection-start-column="7" selection-end-line="259" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pycomm/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-175">
+          <caret line="23" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="e#47#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/twisted/internet/defer.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="98">
+          <caret line="653" selection-start-line="653" selection-end-line="653" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/json/encoder.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="98">
+          <caret line="178" selection-start-line="178" selection-end-line="178" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/biz/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
+          <folding>
+            <element signature="e#0#13#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/json/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="137">
+          <caret line="230" selection-start-line="230" selection-end-line="230" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/_strptime.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="96">
+          <caret line="576" selection-start-line="576" selection-end-line="576" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/_collections_abc.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="47">
+          <caret line="658" selection-start-line="658" selection-end-line="658" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/items.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="50">
+          <caret line="2" column="11" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/geckodriver.log">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pycomm/mongo.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-390">
+          <caret line="38" lean-forward="true" selection-start-line="38" selection-end-line="38" />
+          <folding>
+            <element signature="e#45#76#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/mcollect/hg0088/LinkPool.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/mcollect/hg0088/Resolver.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-6">
+          <caret line="34" selection-start-line="34" selection-end-line="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/biz/zqleague.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-517">
+          <folding>
+            <element signature="e#0#10#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/biz/zqmatch.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-642">
+          <folding>
+            <element signature="e#0#10#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/biz/zqchain.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-667">
+          <folding>
+            <element signature="e#0#10#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/ProgramData/Anaconda3/Lib/site-packages/scrapy/spiderloader.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <caret line="70" selection-start-line="70" selection-end-line="70" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/mcollect/hg0088/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="133">
+          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/mcollect/hg0088/Storage.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="79" column="33" lean-forward="true" selection-start-line="79" selection-start-column="6" selection-end-line="79" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#33#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/utils/helper.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="5" column="21" lean-forward="true" selection-start-line="5" selection-start-column="21" selection-end-line="5" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/pipelines/sports.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/pipelines/sportslst.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3675">
+          <caret line="20" column="26" lean-forward="true" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
+          <folding>
+            <element signature="e#193#204#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/spiders/demo.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+          <folding>
+            <element signature="e#24#37#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/spiders/sports.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3644">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+          <folding>
+            <element signature="e#24#35#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/spiders/sportslst.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1369">
+          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/collectSports/main.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="24" column="10" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="10" />
+          <folding>
+            <element signature="e#0#10#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>

二進制
collectSports/chromedriver.exe


File diff suppressed because it is too large
+ 382 - 0
collectSports/conf/hg0088.json


+ 0 - 0
collectSports/geckodriver.log


+ 4 - 2
collectSports/items.py

@@ -81,5 +81,7 @@ class Odds(scrapy.Item):
     uuid = scrapy.Field()
     source = scrapy.Field()
     updata = scrapy.Field()
-    content = scrapy.Field() #足球详细玩法赔率
-    gidm = scrapy.Field()
+    content = scrapy.Field()  # 足球详细玩法赔率
+    gidm = scrapy.Field()
+
+    content = scrapy.Field()  # 足球详细玩法赔率

+ 2 - 0
collectSports/main.py

@@ -6,6 +6,8 @@ from scrapy.cmdline import execute
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 # execute(["scrapy", "crawl", "sportslst"])
 execute(["scrapy", "crawl", "sports"])
+execute(["scrapy", "crawl", "sportslst"])
+# execute(["scrapy", "crawl", "sports"])
 # execute(["scrapy", "crawl", "lanqiu"])
 # execute(["scrapy", "crawl", "guanjun"])
 # execute(["scrapy", "crawl", "wangqiu"])

+ 12 - 0
collectSports/mcollect/hg0088/__init__.py

@@ -1,15 +1,27 @@
 
 links = []
+<<<<<<< HEAD
 uid = "jjdpzpc07m21627573l376834"
+=======
+uid = "wpujoac10m21627573l385760"
+>>>>>>> 10086c841b19cfd1d5be440a13d286eee4e48373
 
 # links.append({'url':'http://baidu.com','cb':'zaopan'})
 
 # 直播信息
+<<<<<<< HEAD
 # links.append({'url':"https://205.201.4.177/app/member/live/game_list.php?uid={uid}&langx=zh-cn&gtype=All&gdate=All",'cb':'zhibo'})
 # # 冠军杯
 # links.append({'url':"https://199.26.100.178/app/member/browse_FS/reloadgame_R.php?mid=21680472&uid={uid}&langx=zh-cn&choice=ALL&LegGame=ALL&pages=1&records=40&FStype=FT&area_id=&league_id=&rtype=fs&hot_game=",'cb':'chain'})
 # 早盘
 links.append({'url':"https://205.201.4.177/app/member/FT_future/body_var.php?uid={uid}&rtype=r&langx=zh-cn&mtype=4&page_no={page}&league_id=&hot_game=&g_date=ALL&isie11=%27N%27",'cb':'zaopan'})
+=======
+# links.append({'url':"https://199.26.100.178/app/member/live/game_list.php?uid={uid}&langx=zh-cn&gtype=All&gdate=All",'cb':'zhibo'})
+# # 冠军杯
+links.append({'url':"https://205.201.4.177/app/member/browse_FS/reloadgame_R.php?mid=21680472&uid={uid}&langx=zh-cn&choice=ALL&LegGame=ALL&pages=1&records=40&FStype=FT&area_id=&league_id=&rtype=fs&hot_game=",'cb':'chain'})
+# 早盘
+# links.append({'url':"https://205.201.4.177/app/member/FT_future/body_var.php?uid={uid}&rtype=r&langx=zh-cn&mtype=4&page_no={page}&league_id=&hot_game=&g_date=ALL&isie11=%27N%27",'cb':'zaopan'})
+>>>>>>> 10086c841b19cfd1d5be440a13d286eee4e48373
 
 #今日
 # links.append({'url':"https://199.26.100.178/app/member/FT_browse/body_var.php?uid={uid}&rtype=r&langx=zh-cn&mtype=4&page_no=1&league_id=&hot_game=&isie11=27N%27",'cb':'today'})

File diff suppressed because it is too large
+ 161 - 0
collectSports/mcollect/hg0088/fcache/hg0088.chain.js


+ 70 - 0
collectSports/mcollect/hg0088/fcache/hg0088.zaopan.js

@@ -61,7 +61,11 @@ _.flash_ior_set='Y';
 _.rtype='r';
 _.sel_lid='';
 top.today_gmt = '2019-06-19';
+<<<<<<< HEAD
 top.now_gmt = '07:35:41';
+=======
+top.now_gmt = '23:30:38';
+>>>>>>> 10086c841b19cfd1d5be440a13d286eee4e48373
 G=_.GameFT=[];
 g=function(_){G.push(_);}
 top.SortType='';
@@ -73,6 +77,7 @@ _.clean_data_sw='N';
 _.GameHead = ['gid','datetime','league','gnum_h','gnum_c','team_h','team_c','strong','ratio','ior_RH','ior_RC','ratio_o','ratio_u','ior_OUH','ior_OUC','ior_MH','ior_MC','ior_MN','str_odd','str_even','ior_EOO','ior_EOE','hgid','hstrong','hratio','ior_HRH','ior_HRC','hratio_o','hratio_u','ior_HOUH','ior_HOUC','ior_HMH','ior_HMC','ior_HMN','more','eventid','hot','center_tv','play','gidm','isMaster','hide_N','obt_type','ptype_map','ptype','important'];
 _.retime=180;
 _.game_more=1;
+<<<<<<< HEAD
 _.t_page=3;
 _.gamount=60;
 g(['3726954','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J1联赛','60428','60427','大阪樱花','磐田山叶','H','0.5','1.060','0.840','O2','U2','1.030','0.850','2.05','3.90','3.25','单','双','1.95','1.94','3726955','H','0 / 0.5','1.200','0.700','O0.5 / 1','U0.5 / 1','1.070','0.810','2.81','4.50','1.92','62','87CCB9BCBCBCBABCBEBCB6CCB6CCB38ECCC9C9CEC9CDCBA9B3','','p双rf单rm','N','2616631','Y','N','0','0','','N']);
@@ -136,6 +141,71 @@ g(['3724102','06-23<br>03:00p<br><font color=red>Running Ball</font>','美洲国
 g(['3724122','06-23<br>04:00p<br><font color=red>Running Ball</font>','非洲国家杯2019(在埃及)','70246','70245','阿尔及利亚','肯尼亚','H','1','0.780','1.060','O2.5','U2.5','0.760','1.060','1.40','6.80','3.90','单','双','1.96','1.93','3724123','H','0.5','1.070','0.770','O1','U1','0.790','1.030','2.06','6.60','2.07','37','','','','N','2613561','Y','N','0','0','','N']);
 g(['3727482','06-23<br>05:30p<br><font color=red>Running Ball</font>','美国职业大联盟','70490','70489','哥伦布机员','堪萨斯城体育会','H','0 / 0.5','1.070','0.830','O2.5 / 3','U2.5 / 3','0.900','0.980','2.35','2.99','3.45','单','双','1.96','1.93','3727483','H','0','0.770','1.130','O1','U1','1.130','0.750','2.94','3.55','2.10','63','8DBCB7CCBABCBABCB9BCBDBCB38EC8CDC8CEC9CDCBA9B3','','img','N','2617271','Y','N','0','0','','N']);
 _.gameCount='FT|RB|22,FT|FT|117,FT|FU|111,FT|P3|198,FT|HOT_RB|10,FT|HOT_FT|20,FT|HOT_FU|20,FT|HOT_P3|26,FT|SP_RB|0,FT|SP_FT|0,FT|SP_FU|0,FT|SP_P3|0,BK|RB|3,BK|FT|3,BK|FU|3,BK|P3|6,BK|HOT_RB|0,BK|HOT_FT|0,BK|HOT_FU|0,BK|HOT_P3|0,BK|SP_RB|0,BK|SP_FT|0,BK|SP_FU|0,BK|SP_P3|0,BS|RB|8,BS|FT|12,BS|FU|0,BS|P3|12,BS|HOT_RB|0,BS|HOT_FT|0,BS|HOT_FU|0,BS|HOT_P3|0,BS|SP_RB|0,BS|SP_FT|0,BS|SP_FU|0,BS|SP_P3|0,TN|RB|11,TN|FT|42,TN|FU|12,TN|P3|54,TN|HOT_RB|0,TN|HOT_FT|0,TN|HOT_FU|0,TN|HOT_P3|0,TN|SP_RB|0,TN|SP_FT|0,TN|SP_FU|0,TN|SP_P3|0,VB|RB|2,VB|FT|3,VB|FU|0,VB|P3|3,VB|HOT_RB|0,VB|HOT_FT|0,VB|HOT_FU|0,VB|HOT_P3|0,VB|SP_RB|0,VB|SP_FT|0,VB|SP_FU|0,VB|SP_P3|0,BM|RB|0,BM|FT|0,BM|FU|0,BM|P3|0,BM|HOT_RB|0,BM|HOT_FT|0,BM|HOT_FU|0,BM|HOT_P3|0,BM|SP_RB|0,BM|SP_FT|0,BM|SP_FU|0,BM|SP_P3|0,TT|RB|0,TT|FT|0,TT|FU|0,TT|P3|0,TT|HOT_RB|0,TT|HOT_FT|0,TT|HOT_FU|0,TT|HOT_P3|0,TT|SP_RB|0,TT|SP_FT|0,TT|SP_FU|0,TT|SP_P3|0,OP|RB|1,OP|FT|23,OP|FU|0,OP|P3|21,OP|HOT_RB|0,OP|HOT_FT|0,OP|HOT_FU|0,OP|HOT_P3|0,OP|SP_RB|0,OP|SP_FT|0,OP|SP_FU|0,OP|SP_P3|0,SK|RB|0,SK|FT|0,SK|FU|0,SK|P3|0,SK|HOT_RB|0,SK|HOT_FT|0,SK|HOT_FU|0,SK|HOT_P3|0,SK|SP_RB|0,SK|SP_FT|0,SK|SP_FU|0,SK|SP_P3|0,FS|HOT_FT|23,FS|HOT_BK|0,FS|HOT_BS|0,FS|HOT_TN|0,FS|HOT_VB|0,FS|HOT_BM|0,FS|HOT_TT|0,FS|HOT_OP|0,FS|HOT_SK|0,FS|SP_FT|0,FS|SP_BK|0,FS|SP_BS|0,FS|SP_TN|0,FS|SP_VB|0,FS|SP_BM|0,FS|SP_TT|0,FS|SP_OP|0,FS|SP_SK|0,FS|FT|128,FS|BK|6,FS|BS|3,FS|TN|4,FS|VB|1,FS|BM|0,FS|TT|0,FS|OP|0,FS|SK|1';
+=======
+_.t_page=4;
+_.gamount=60;
+g(['3733268','06-20<br>07:00p<br><font color=red>Running Ball</font>','美洲金杯2019','40300','40299','尼加拉瓜 -角球数 [中]','海地 -角球数','C','1.5 / 2','0.970','0.870','O10','U10','0.910','0.910','3.65','1.43','6.90','单','双','1.95','1.94','3733269','C','0.5 / 1','0.960','0.880','O4.5','U4.5','0.990','0.830','3.25','1.66','4.75','9','','','','N','2611484','Y','N','0','900',' -角球数','Y']);
+g(['3734812','06-20<br>07:00p','美洲金杯2019特别投注','40860','40859','主场 -星期四-2场赛事','客场 -星期四-2场赛事','H','2 / 2.5','0.910','0.970','O6.5','U6.5','0.880','0.980','1.23','6.00','7.00','单','双','1.95','1.94','3734813','H','1','0.970','0.910','O2.5 / 3','U2.5 / 3','0.990','0.870','1.51','4.75','4.05','9','','','','N','2624101','Y','N','0','0',' -星期四-2场赛事','N']);
+g(['3722540','06-20<br>09:30p<br><font color=red>Running Ball</font>','美洲金杯2019','40332','40331','哥斯达黎加','百慕达','H','3','0.840','1.000','O3.5 / 4','U3.5 / 4','0.860','0.960','1.02','20.00','11.00','单','双','1.95','1.94','3722541','H','1 / 1.5','0.870','0.970','O1.5','U1.5','0.990','0.830','1.25','15.50','3.90','68','','','','N','2611500','Y','N','0','0','','N']);
+g(['3722542','06-20<br>09:30p<br><font color=red>Running Ball</font>','美洲金杯2019','40334','40333','哥斯达黎加','百慕达','H','3 / 3.5','1.110','0.730','O3.5','U3.5','1.040','0.780','','','','','','','','3722543','H','1.5','1.160','0.680','O1.5 / 2','U1.5 / 2','0.700','1.120','','','','0','','','','N','2611500','N','N','0','0','','N']);
+g(['3733276','06-20<br>09:30p<br><font color=red>Running Ball</font>','美洲金杯2019','40342','40341','哥斯达黎加 -角球数','百慕达 -角球数','H','2.5 / 3','0.740','1.100','O10.5','U10.5','0.960','0.860','1.21','5.60','8.60','单','双','1.95','1.94','3733277','H','1 / 1.5','0.790','1.050','O4.5 / 5','U4.5 / 5','0.990','0.830','1.43','4.30','5.20','9','','','','N','2611505','Y','N','0','900',' -角球数','Y']);
+g(['3735656','06-20<br>10:30p<br><font color=red>Running Ball</font>','美国公开赛冠军杯','40948','40947','洛杉矶','圣荷西地震','H','1.5','0.920','0.980','O3.5','U3.5','0.910','0.970','1.31','6.60','5.30','单','双','1.95','1.94','3735657','H','0.5','0.800','1.100','O1.5','U1.5','0.830','1.050','1.79','5.40','2.65','69','','','','N','2625017','Y','N','0','0','','N']);
+g(['3735658','06-20<br>10:30p<br><font color=red>Running Ball</font>','美国公开赛冠军杯','40950','40949','洛杉矶','圣荷西地震','H','1.5 / 2','1.140','0.760','O3 / 3.5','U3 / 3.5','1.120','0.760','','','','','','','','3735659','H','0.5 / 1','1.140','0.760','O1 / 1.5','U1 / 1.5','1.150','0.730','','','','0','','','','N','2625017','N','N','0','0','','N']);
+g(['3723970','06-21<br>12:30p<br><font color=red>Running Ball</font>','欧洲U21青年锦标赛2019(在意大利和圣马利诺)','50002','50001','英格兰U21','罗马尼亚U21','H','1','0.930','0.970','O2.5 / 3','U2.5 / 3','0.930','0.950','1.51','5.00','4.15','单','双','1.95','1.94','3723971','H','0.5','1.130','0.770','O1','U1','1.140','0.740','2.13','5.00','2.22','71','','','','N','2587626','Y','N','0','0','','N']);
+g(['3723972','06-21<br>12:30p<br><font color=red>Running Ball</font>','欧洲U21青年锦标赛2019(在意大利和圣马利诺)','50004','50003','英格兰U21','罗马尼亚U21','H','1 / 1.5','1.190','0.710','O2.5','U2.5','1.130','0.750','','','','','','','','3723973','H','0 / 0.5','0.730','1.170','O1 / 1.5','U1 / 1.5','0.710','1.170','','','','0','','','','N','2587626','N','N','0','0','','N']);
+g(['3723980','06-21<br>03:00p<br><font color=red>Running Ball</font>','欧洲U21青年锦标赛2019(在意大利和圣马利诺)','50018','50017','法国U21','克罗地亚U21','H','1 / 1.5','0.980','0.920','O2.5 / 3','U2.5 / 3','1.030','0.850','1.40','6.00','4.50','单','双','1.95','1.94','3723981','H','0.5','0.940','0.960','O1 / 1.5','U1 / 1.5','0.770','1.110','1.93','5.80','2.32','71','','','','N','2587634','Y','N','0','0','','N']);
+g(['3723982','06-21<br>03:00p<br><font color=red>Running Ball</font>','欧洲U21青年锦标赛2019(在意大利和圣马利诺)','50020','50019','法国U21','克罗地亚U21','H','1.5','1.210','0.690','O3','U3','0.750','1.130','','','','','','','','3723983','H','0.5 / 1','1.260','0.640','O1','U1','1.200','0.680','','','','0','','','','N','2587634','N','N','0','0','','N']);
+g(['3724010','06-21<br>04:00p<br><font color=red>Running Ball</font>','非洲国家杯2019(在埃及)','50206','50205','埃及','辛巴威','H','1.5 / 2','0.850','0.990','O2 / 2.5','U2 / 2.5','1.020','0.800','1.12','19.00','5.70','单','双','1.96','1.93','3724011','H','0.5 / 1','0.980','0.860','O0.5 / 1','U0.5 / 1','1.210','0.610','1.63','14.00','2.30','65','8EBCBCBCBABCBABCBEBCB7CCBEBCB38CC6CBCCCEC9CDCBA9B3','','p双rf单rm','N','2613493','Y','N','0','0','','N']);
+g(['3723990','06-21<br>07:00p<br><font color=red>Running Ball</font>','美洲国家杯2019(在巴西)','50082','50081','厄瓜多尔','智利','C','0.5','1.040','0.880','O2.5','U2.5','0.810','1.090','4.45','1.87','3.45','单','双','1.97','1.92','3723991','C','0 / 0.5','0.910','0.990','O1','U1','0.790','1.090','5.00','2.47','2.02','85','87CCBDBCBEBCBABCBEBCB8CCB6CCB38FC6CCCFCFC9CDCBA9B3','','unas','N','2600390','Y','N','0','0','','N']);
+g(['3723992','06-21<br>07:00p<br><font color=red>Running Ball</font>','美洲国家杯2019(在巴西)','50084','50083','厄瓜多尔','智利','C','0.5 / 1','0.780','1.140','O2 / 2.5','U2 / 2.5','1.060','0.840','','','','','','','','3723993','C','0.5','0.570','1.330','O0.5 / 1','U0.5 / 1','1.200','0.680','','','','0','','','','N','2600390','N','N','0','0','','N']);
+g(['3723994','06-21<br>07:00p<br><font color=red>Running Ball</font>','美洲国家杯2019(在巴西)','50086','50085','厄瓜多尔','智利','C','0 / 0.5','1.310','0.610','O2.5 / 3','U2.5 / 3','0.610','1.290','','','','','','','','','','','','','','','','','','','','0','','','','N','2600390','N','N','0','0','','N']);
+g(['3723998','06-21<br>07:00p<br><font color=red>Running Ball</font>','美洲金杯2019','50122','50121','萨尔瓦多 [中]','牙买加','C','0.5','0.850','0.990','O2','U2','0.820','1.000','4.20','1.98','2.65','单','双','2.01','1.88','3723999','C','0 / 0.5','0.760','1.080','O0.5 / 1','U0.5 / 1','0.940','0.880','5.00','2.70','1.81','66','','','','N','2611521','Y','N','0','0','','N']);
+g(['3724004','06-21<br>09:30p<br><font color=red>Running Ball</font>','美洲金杯2019','50164','50163','洪都拉斯 [中]','库拉索','H','0.5','0.810','1.030','O2 / 2.5','U2 / 2.5','0.910','0.910','1.80','3.90','3.25','单','双','1.96','1.93','3724005','H','0 / 0.5','1.020','0.820','O1','U1','0.730','1.090','2.53','4.25','2.04','66','','','','N','2611542','Y','N','0','0','','N']);
+g(['3726914','06-22<br>01:00a<br><font color=red>Running Ball</font>','日本J1联赛','60348','60347','北海道札幌冈萨多','鸟栖沙岩','H','0.5','1.020','0.880','O2 / 2.5','U2 / 2.5','0.860','1.020','2.01','3.95','3.35','单','双','1.94','1.95','3726915','H','0 / 0.5','1.200','0.700','O0.5 / 1','U0.5 / 1','1.120','0.760','2.82','4.40','1.93','70','8EBCB8CCB7CCBABCBEBCB7CCBEBCB38EC6CAC9CEC9CDCBA9B3','','p双rf单rm','N','2616591','Y','N','0','0','','N']);
+g(['3726916','06-22<br>01:00a<br><font color=red>Running Ball</font>','日本J1联赛','60350','60349','北海道札幌冈萨多','鸟栖沙岩','H','0 / 0.5','0.750','1.150','O2','U2','1.100','0.780','','','','','','','','3726917','H','0','0.570','1.330','O1','U1','0.730','1.150','','','','0','','','','N','2616591','N','N','0','0','','N']);
+g(['3726922','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J1联赛','60364','60363','横滨水手','松本山雅','H','0.5 / 1','0.850','1.050','O2.5','U2.5','1.040','0.840','1.66','5.00','4.05','单','双','1.94','1.95','3726923','H','0 / 0.5','0.910','0.990','O1','U1','1.050','0.830','2.33','4.85','2.15','70','86CCB9CCB9CCBABCBEBCB6CCB6CCB386C6CAC9CEC9CDCBA9B3','','p双rf单rm','N','2616599','Y','N','0','0','','N']);
+g(['3726924','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J1联赛','60366','60365','横滨水手','松本山雅','H','1','1.150','0.750','O2.5 / 3','U2.5 / 3','0.820','1.060','','','','','','','','3726925','H','0.5','1.260','0.640','O1 / 1.5','U1 / 1.5','0.650','1.230','','','','0','','','','N','2616599','N','N','0','0','','N']);
+g(['3726930','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J1联赛','60380','60379','神户胜利船','大分三神 ','H','0 / 0.5','1.010','0.890','O2.5','U2.5','0.990','0.890','2.29','3.00','3.55','单','双','1.93','1.96','3726931','H','0','0.790','1.110','O1','U1','1.020','0.860','2.90','3.50','2.11','70','8DBCB7CCB7CCBABCBEBCB7CCBEBCB388CFC9C9CEC9CDCBA9B3','','p双rf单rm','N','2616607','Y','N','0','0','','N']);
+g(['3726932','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J1联赛','60382','60381','神户胜利船','大分三神 ','H','0','0.690','1.210','O2.5 / 3','U2.5 / 3','0.780','1.100','','','','','','','','3726933','H','0 / 0.5','1.300','0.600','O1 / 1.5','U1 / 1.5','0.630','1.250','','','','0','','','','N','2616607','N','N','0','0','','N']);
+g(['3726972','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J2联赛','60446','60445','水户蜀葵','横滨','H','0 / 0.5','1.090','0.810','O2','U2','1.070','0.810','2.46','3.15','3.05','单','双','1.93','1.96','3726973','H','0','0.790','1.110','O0.5 / 1','U0.5 / 1','1.020','0.860','3.35','3.95','1.82','70','8CBCBABCBEBCBABCBEBCB7CCBEBCB387CBC9C9CEC9CDCBA9B3','','p双rf单rm','N','2616648','Y','N','0','0','','N']);
+g(['3726974','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J2联赛','60448','60447','水户蜀葵','横滨','H','0','0.710','1.190','O2 / 2.5','U2 / 2.5','0.790','1.090','','','','','','','','3726975','H','0 / 0.5','1.360','0.540','O1','U1','0.590','1.290','','','','0','','','','N','2616648','N','N','0','0','','N']);
+g(['3726980','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J2联赛','60458','60457','金泽萨维根','新泻天鹅','H','0 / 0.5','1.050','0.850','O2 / 2.5','U2 / 2.5','0.880','1.000','2.39','3.20','3.15','单','双','1.97','1.92','3726981','H','0','0.710','1.190','O0.5 / 1','U0.5 / 1','1.120','0.760','3.20','3.95','1.86','70','8CBCBABCB9CCBABCBEBCB7CCBEBCB38BCAC9C9CEC9CDCBA9B3','','p双rf单rm','N','2616654','Y','N','0','0','','N']);
+g(['3726982','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J2联赛','60460','60459','金泽萨维根','新泻天鹅','H','0','0.680','1.220','O2','U2','1.150','0.730','','','','','','','','3726983','H','0 / 0.5','1.300','0.600','O1','U1','0.680','1.200','','','','0','','','','N','2616654','N','N','0','0','','N']);
+g(['3726988','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J2联赛','60470','60469','德岛漩涡','福冈黄蜂','H','0.5','1.090','0.810','O2 / 2.5','U2 / 2.5','0.990','0.890','2.08','3.75','3.30','单','双','1.94','1.95','3726989','H','0 / 0.5','1.230','0.670','O0.5 / 1','U0.5 / 1','1.170','0.710','2.94','4.20','1.92','70','8CBCBABCB7CCBABCBEBCB7CCBEBCB38FC9C9C9CEC9CDCBA9B3','','p双rf单rm','N','2616660','Y','N','0','0','','N']);
+g(['3726990','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J2联赛','60472','60471','德岛漩涡','福冈黄蜂','H','0 / 0.5','0.810','1.090','O2.5','U2.5','0.760','1.120','','','','','','','','3726991','H','0','0.590','1.310','O1','U1','0.760','1.120','','','','0','','','','N','2616660','N','N','0','0','','N']);
+g(['3726996','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J2联赛','60482','60481','长崎成功丸','山形山神','C','0','1.090','0.810','O2 / 2.5','U2 / 2.5','0.930','0.950','2.93','2.52','3.20','单','双','1.95','1.94','3726997','C','0','1.030','0.870','O0.5 / 1','U0.5 / 1','1.130','0.750','3.65','3.35','1.90','70','8CBCBBBCBABCBABCBEBCB7CCBEBCB389C9C9C9CEC9CDCBA9B3','','p双rf单rm','N','2616666','Y','N','0','0','','N']);
+g(['3726998','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J2联赛','60484','60483','长崎成功丸','山形山神','C','0 / 0.5','0.740','1.160','O2.5','U2.5','0.720','1.160','','','','','','','','3726999','C','0 / 0.5','0.510','1.390','O1','U1','0.710','1.170','','','','0','','','','N','2616666','N','N','0','0','','N']);
+g(['3727004','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J2联赛','60494','60493','琉球','甲府风林','C','0.5','0.970','0.930','O2.5','U2.5','0.990','0.890','3.90','1.92','3.65','单','双','1.94','1.95','3727005','C','0 / 0.5','0.810','1.090','O1','U1','0.980','0.900','4.45','2.58','2.05','70','8ABCBEBCBCBCBABCBEBCB7CCBEBCB387C8C9C9CEC9CDCBA9B3','','p双rf单rm','N','2616678','Y','N','0','0','','N']);
+g(['3727006','06-22<br>05:00a<br><font color=red>Running Ball</font>','日本J2联赛','60496','60495','琉球','甲府风林','C','0.5 / 1','0.720','1.180','O2.5 / 3','U2.5 / 3','0.760','1.120','','','','','','','','3727007','C','0.5','0.520','1.380','O0.5 / 1','U0.5 / 1','1.320','0.560','','','','0','','','','N','2616678','N','N','0','0','','N']);
+g(['3726938','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J1联赛','60396','60395','名古屋鲸鱼','清水心跳','H','0.5','0.840','1.060','O3','U3','0.820','1.060','1.83','4.00','3.90','单','双','1.93','1.96','3726939','H','0 / 0.5','1.060','0.840','O1 / 1.5','U1 / 1.5','0.820','1.060','2.49','4.00','2.23','70','','','','N','2616615','Y','N','0','0','','N']);
+g(['3726940','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J1联赛','60398','60397','名古屋鲸鱼','清水心跳','H','0.5 / 1','1.110','0.790','O2.5 / 3','U2.5 / 3','1.090','0.790','','','','','','','','3726941','H','0.5','1.340','0.560','O1','U1','1.220','0.660','','','','0','','','','N','2616615','N','N','0','0','','N']);
+g(['3726946','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J1联赛','60412','60411','大阪飞脚','湘南比马','H','0 / 0.5','0.890','1.010','O2.5','U2.5','0.990','0.890','2.14','3.30','3.55','单','双','1.94','1.95','3726947','H','0','0.710','1.190','O1','U1','0.970','0.910','2.89','3.75','2.06','70','','','','N','2616623','Y','N','0','0','','N']);
+g(['3726948','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J1联赛','60414','60413','大阪飞脚','湘南比马','H','0','0.610','1.290','O2.5 / 3','U2.5 / 3','0.750','1.130','','','','','','','','3726949','H','0 / 0.5','1.290','0.610','O0.5 / 1','U0.5 / 1','1.320','0.560','','','','0','','','','N','2616623','N','N','0','0','','N']);
+g(['3726954','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J1联赛','60428','60427','大阪樱花','磐田山叶','H','0.5','1.060','0.840','O2','U2','1.030','0.850','2.05','3.90','3.25','单','双','1.94','1.95','3726955','H','0 / 0.5','1.200','0.700','O0.5 / 1','U0.5 / 1','1.030','0.850','2.81','4.50','1.92','70','87CCB9BCBCBCBABCBEBCB6CCB6CCB38ECCC9C9CEC9CDCBA9B3','','p双rf单rm','N','2616631','Y','N','0','0','','N']);
+g(['3726956','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J1联赛','60430','60429','大阪樱花','磐田山叶','H','0 / 0.5','0.750','1.150','O2 / 2.5','U2 / 2.5','0.740','1.140','','','','','','','','3726957','H','0','0.560','1.340','O1','U1','0.630','1.250','','','','0','','','','N','2616631','N','N','0','0','','N']);
+g(['3727012','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J2联赛','60506','60505','柏雷素尔','千叶市原','H','0.5 / 1','0.970','0.930','O2.5','U2.5','0.930','0.950','1.73','4.95','3.70','单','双','1.96','1.93','3727013','H','0 / 0.5','0.860','1.040','O1','U1','0.870','1.010','2.38','5.50','2.00','70','87CCBBBCBEBCBABCBEBCB6CCB6CCB38BC7C9C9CEC9CDCBA9B3','','p双rf单rm','N','2616684','Y','N','0','0','','N']);
+g(['3727014','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J2联赛','60508','60507','柏雷素尔','千叶市原','H','1','1.270','0.630','O2 / 2.5','U2 / 2.5','1.170','0.710','','','','','','','','3727015','H','0.5','1.290','0.610','O0.5 / 1','U0.5 / 1','1.260','0.620','','','','0','','','','N','2616684','N','N','0','0','','N']);
+g(['3727020','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J2联赛','60518','60517','东京绿茵','大宫松鼠','C','0 / 0.5','1.090','0.810','O2 / 2.5','U2 / 2.5','0.950','0.930','3.65','2.08','3.40','单','双','1.96','1.93','3727021','C','0 / 0.5','0.710','1.190','O0.5 / 1','U0.5 / 1','1.170','0.710','4.30','2.84','1.94','70','87CCBBBCB9CCBABCBEBCB6CCB6CCB38FC6C9C9CEC9CDCBA9B3','','p双rf单rm','N','2616690','Y','N','0','0','','N']);
+g(['3727022','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J2联赛','60520','60519','东京绿茵','大宫松鼠','C','0.5','0.810','1.090','O2.5','U2.5','0.710','1.170','','','','','','','','3727023','C','0','1.300','0.600','O1','U1','0.710','1.170','','','','0','','','','N','2616690','N','N','0','0','','N']);
+g(['3727028','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J2联赛','60530','60529','山口雷法','岐阜','H','0 / 0.5','0.840','1.060','O2.5 / 3','U2.5 / 3','0.950','0.930','2.09','3.50','3.50','单','双','1.95','1.94','3727029','H','0 / 0.5','1.130','0.770','O1','U1','1.170','0.710','2.60','4.00','2.15','70','8DBCB7CCBEBCBABCBEBCB7CCBEBCB389C6C9C9CEC9CDCBA9B3','','p双rf单rm','N','2616696','Y','N','0','0','','N']);
+g(['3727030','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J2联赛','60532','60531','山口雷法','岐阜','H','0.5','1.100','0.800','O2.5','U2.5','1.130','0.750','','','','','','','','3727031','H','0','0.560','1.340','O1 / 1.5','U1 / 1.5','0.680','1.200','','','','0','','','','N','2616696','N','N','0','0','','N']);
+g(['3727036','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J2联赛','60542','60541','爱媛','京都不死鸟','C','0 / 0.5','1.040','0.860','O2 / 2.5','U2 / 2.5','1.000','0.880','3.55','2.11','3.35','单','双','1.92','1.97','3727037','C','0 / 0.5','0.660','1.240','O0.5 / 1','U0.5 / 1','1.190','0.690','4.20','2.89','1.93','70','87CCBABCB9CCBABCBEBCB6CCB6CCB38DCFC8C9CEC9CDCBA9B3','','p双rf单rm','N','2616702','Y','N','0','0','','N']);
+g(['3727038','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J2联赛','60544','60543','爱媛','京都不死鸟','C','0.5','0.790','1.110','O2.5','U2.5','0.740','1.140','','','','','','','','3727039','C','0','1.270','0.630','O1','U1','0.780','1.100','','','','0','','','','N','2616702','N','N','0','0','','N']);
+g(['3727044','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J2联赛','60554','60553','鹿儿岛联','栃木SC','H','0.5','1.050','0.850','O2 / 2.5','U2 / 2.5','0.860','1.020','2.04','3.85','3.30','单','双','1.92','1.97','3727045','H','0 / 0.5','1.190','0.710','O0.5 / 1','U0.5 / 1','1.100','0.780','2.80','4.75','1.88','70','87CCBBBCBCBCBABCBEBCB6CCB6CCB387CFC8C9CEC9CDCBA9B3','','p双rf单rm','N','2616708','Y','N','0','0','','N']);
+g(['3727046','06-22<br>06:00a<br><font color=red>Running Ball</font>','日本J2联赛','60556','60555','鹿儿岛联','栃木SC','H','0 / 0.5','0.750','1.150','O2','U2','1.180','0.700','','','','','','','','3727047','H','0','0.530','1.370','O1','U1','0.680','1.200','','','','0','','','','N','2616708','N','N','0','0','','N']);
+g(['3724062','06-22<br>10:30a<br><font color=red>Running Ball</font>','非洲国家杯2019(在埃及)','60246','60245','刚果民主共和国','乌干达','H','0 / 0.5','0.800','1.040','O2.5','U2.5','0.690','1.130','2.06','3.25','3.05','单','双','1.97','1.92','3724063','H','0 / 0.5','1.150','0.690','O1','U1','0.860','0.960','2.76','3.85','2.00','45','','','','N','2613510','Y','N','0','0','','N']);
+g(['3727074','06-22<br>12:00p<br><font color=red>Running Ball</font>','挪威超级联赛','60568','60567','史卓加斯特','莫迪','C','0 / 0.5','1.030','0.870','O3','U3','0.830','1.050','3.20','2.14','3.35','单','双','1.96','1.93','3727075','C','0 / 0.5','0.730','1.170','O1 / 1.5','U1 / 1.5','0.790','1.090','3.70','2.72','2.16','70','8ABCB8CCBCBCBABCBEBCB7CCBABCB38BCDC8C9CEC9CDCBA9B3','','p双rf单rm','N','2616724','Y','N','0','0','','N']);
+g(['3727076','06-22<br>12:00p<br><font color=red>Running Ball</font>','挪威超级联赛','60570','60569','史卓加斯特','莫迪','C','0.5','0.760','1.140','O2.5 / 3','U2.5 / 3','1.050','0.830','','','','','','','','3727077','C','0','1.230','0.670','O1','U1','1.180','0.700','','','','0','','','','N','2616724','N','N','0','0','','N']);
+g(['3724066','06-22<br>01:00p<br><font color=red>Running Ball</font>','非洲国家杯2019(在埃及)','60280','60279','尼日利亚','蒲隆地共和国','H','1 / 1.5','0.990','0.850','O2 / 2.5','U2 / 2.5','0.770','1.050','1.35','7.80','4.00','单','双','1.97','1.92','3724067','H','0.5','0.910','0.930','O0.5 / 1','U0.5 / 1','1.090','0.730','1.90','8.20','2.10','45','87CCB7CCB9CCBABCBEBCB7CCBEBCB388CDCACCCEC9CDCBA9B3','','p双rf单rm','N','2613527','Y','N','0','0','','N']);
+g(['3724034','06-22<br>03:00p<br><font color=red>Running Ball</font>','美洲国家杯2019(在巴西)','60082','60081','玻利维亚','委内瑞拉','C','1','1.040','0.860','O2.5','U2.5','0.950','0.930','6.70','1.50','4.20','单','双','1.96','1.93','3724035','C','0.5','0.790','1.110','O1','U1','0.910','0.970','5.80','2.11','2.19','68','87CCB8CCBABCBABCBEBCB8CCB6CCB387C6CBCFCFC9CDCBA9B3','','unas','N','2600498','Y','N','0','0','','N']);
+g(['3724042','06-22<br>03:00p<br><font color=red>Running Ball</font>','美洲国家杯2019(在巴西)','60122','60121','秘鲁','巴西','C','1 / 1.5','1.070','0.830','O2.5 / 3','U2.5 / 3','0.830','1.050','9.00','1.36','4.80','单','双','1.95','1.94','3724043','C','0.5','1.050','0.850','O1','U1','1.090','0.790','6.90','1.84','2.45','68','87CCB8CCB8CCBABCBEBCB8CCB6CCB387CECACFCFC9CDCBA9B3','','unas','N','2600518','Y','N','0','0','','N']);
+g(['3737804','06-22<br>03:00p<br><font color=red>Running Ball</font>','女子世界杯2019(在法国)','62278','62277','挪威(女)','澳大利亚(女)','C','0 / 0.5','0.800','1.040','O2.5 / 3','U2.5 / 3','0.940','0.880','2.63','2.26','3.60','单','双','1.95','1.94','3737805','C','0','1.080','0.760','O1 / 1.5','U1 / 1.5','0.720','1.100','3.10','2.78','2.28','68','','','','N','2627051','Y','N','0','0','','N']);
+g(['3724014','06-22<br>03:00p<br><font color=red>Running Ball</font>','欧洲U21青年锦标赛2019(在意大利和圣马利诺)','60002','60001','西班牙U21','波兰U21','H','1 / 1.5','0.860','1.040','O3','U3','0.990','0.890','1.34','6.90','4.70','单','双','1.95','1.94','3724015','H','0.5','0.930','0.970','O1 / 1.5','U1 / 1.5','0.900','0.980','1.92','5.80','2.33','65','','','','N','2587642','Y','N','0','0','','N']);
+g(['3724024','06-22<br>03:00p<br><font color=red>Running Ball</font>','欧洲U21青年锦标赛2019(在意大利和圣马利诺)','60018','60017','比利时U21','意大利U21','C','1','0.990','0.910','O3','U3','1.020','0.860','4.85','1.50','4.35','单','双','1.95','1.94','3724025','C','0.5','0.810','1.090','O1 / 1.5','U1 / 1.5','0.930','0.950','4.55','2.08','2.38','65','','','','N','2587650','Y','N','0','0','','N']);
+g(['3724070','06-22<br>04:00p<br><font color=red>Running Ball</font>','非洲国家杯2019(在埃及)','60314','60313','几内亚','马达加斯加','H','0.5 / 1','0.770','1.070','O2 / 2.5','U2 / 2.5','0.890','0.930','1.54','5.50','3.45','单','双','1.97','1.92','3724071','H','0 / 0.5','0.750','1.090','O1','U1','0.760','1.060','2.26','5.70','1.99','45','','','','N','2613544','Y','N','0','0','','N']);
+g(['3724050','06-22<br>05:30p<br><font color=red>Running Ball</font>','美洲金杯2019','60162','60161','圭亚那 [中]','巴拿马','C','2','1.080','0.760','O3','U3','0.950','0.870','13.50','1.11','6.80','单','双','1.95','1.94','3724051','C','0.5 / 1','1.070','0.770','O1 / 1.5','U1 / 1.5','0.930','0.890','9.80','1.52','2.77','66','','','','N','2611563','Y','N','0','0','','N']);
+_.gameCount='FT|RB|4,FT|FT|0,FT|FU|141,FT|P3|118,FT|HOT_RB|3,FT|HOT_FT|0,FT|HOT_FU|42,FT|HOT_P3|25,FT|SP_RB|0,FT|SP_FT|0,FT|SP_FU|0,FT|SP_P3|0,BK|RB|0,BK|FT|0,BK|FU|3,BK|P3|3,BK|HOT_RB|0,BK|HOT_FT|0,BK|HOT_FU|0,BK|HOT_P3|0,BK|SP_RB|0,BK|SP_FT|0,BK|SP_FU|0,BK|SP_P3|0,BS|RB|4,BS|FT|0,BS|FU|11,BS|P3|11,BS|HOT_RB|0,BS|HOT_FT|0,BS|HOT_FU|0,BS|HOT_P3|0,BS|SP_RB|0,BS|SP_FT|0,BS|SP_FU|0,BS|SP_P3|0,TN|RB|1,TN|FT|0,TN|FU|65,TN|P3|65,TN|HOT_RB|0,TN|HOT_FT|0,TN|HOT_FU|0,TN|HOT_P3|0,TN|SP_RB|0,TN|SP_FT|0,TN|SP_FU|0,TN|SP_P3|0,VB|RB|0,VB|FT|0,VB|FU|8,VB|P3|8,VB|HOT_RB|0,VB|HOT_FT|0,VB|HOT_FU|0,VB|HOT_P3|0,VB|SP_RB|0,VB|SP_FT|0,VB|SP_FU|0,VB|SP_P3|0,BM|RB|0,BM|FT|0,BM|FU|0,BM|P3|0,BM|HOT_RB|0,BM|HOT_FT|0,BM|HOT_FU|0,BM|HOT_P3|0,BM|SP_RB|0,BM|SP_FT|0,BM|SP_FU|0,BM|SP_P3|0,TT|RB|0,TT|FT|0,TT|FU|0,TT|P3|0,TT|HOT_RB|0,TT|HOT_FT|0,TT|HOT_FU|0,TT|HOT_P3|0,TT|SP_RB|0,TT|SP_FT|0,TT|SP_FU|0,TT|SP_P3|0,OP|RB|0,OP|FT|1,OP|FU|45,OP|P3|43,OP|HOT_RB|0,OP|HOT_FT|0,OP|HOT_FU|0,OP|HOT_P3|0,OP|SP_RB|0,OP|SP_FT|0,OP|SP_FU|0,OP|SP_P3|0,SK|RB|0,SK|FT|0,SK|FU|0,SK|P3|0,SK|HOT_RB|0,SK|HOT_FT|0,SK|HOT_FU|0,SK|HOT_P3|0,SK|SP_RB|0,SK|SP_FT|0,SK|SP_FU|0,SK|SP_P3|0,FS|HOT_FT|7,FS|HOT_BK|0,FS|HOT_BS|0,FS|HOT_TN|0,FS|HOT_VB|0,FS|HOT_BM|0,FS|HOT_TT|0,FS|HOT_OP|0,FS|HOT_SK|0,FS|SP_FT|0,FS|SP_BK|0,FS|SP_BS|0,FS|SP_TN|0,FS|SP_VB|0,FS|SP_BM|0,FS|SP_TT|0,FS|SP_OP|0,FS|SP_SK|0,FS|FT|104,FS|BK|4,FS|BS|0,FS|TN|8,FS|VB|1,FS|BM|0,FS|TT|0,FS|OP|0,FS|SK|1';
+>>>>>>> 10086c841b19cfd1d5be440a13d286eee4e48373
 function onLoad(){
 	_.body_var_onLoad();
 }

+ 105 - 3
collectSports/pipelines/sportslst.py

@@ -5,12 +5,17 @@
 # Don't forget to add your pipeline to the ITEM_PIPELINES setting
 # See: https://doc.scrapy.org/en/latest/topics/item-pipeline.html
 import json
+
+import datetime
+import re
+
 import pymongo
 
 import requests
 
 from collectSports.biz import getMongo
-from pycomm.mongo import DBMongo
+
+from collectSports.utils.helper import Helper
 
 
 class SportslstPipeline(object):
@@ -21,11 +26,12 @@ class SportslstPipeline(object):
         self.client = pymongo.MongoClient(host=self.host, port=self.port)
         self.tdb = self.client[self.dbname]
         self.port = self.tdb['zq_league']  # 表名
-    #     competition
+        #     competition
         self.port2 = self.tdb['zq_competition']  # 表名
+
     def process_item(self, item, spider):
         mongo = getMongo()
-
+        url = 'http://admin.5gogo.com/setSports'
         # print(mongo)
         # zaopan = item['csource']
         # if zaopan == 'zaopan':
@@ -68,5 +74,101 @@ class SportslstPipeline(object):
             r = requests.post(url='http://admin.5gogo.com/setSports', data={"data": json.dumps(list)})
             print(r.text)
 
+        elif zb == 'zaopan':
+            zq_leagues = set(item['zq_league'])
+            zq_matchs = set(item['zq_match'])
+            current_time = datetime.datetime.now()
+            # 联赛
+            for zq_league in zq_leagues:
+                league_list = []
+                payload_key = ['game_code', 'title']
+                payload_value = ['zq', 'league']
+                payload = Helper.get_zip_data(payload_key, payload_value)
+                data_key = ['name_chinese', 'kind', 'match_mode', 'if_stop', 'belong', 'last_time', 'lg_id',
+                            'source', 'uuid']
+                data_value = ['name_chinese', '0', '0', '0', '0', current_time.strftime("%Y-%m-%d %H:%M:%S"),
+                              zq_league.get('league_id'), 'hg0088', str(zq_league.get('uuid'))]
+                data = Helper.get_zip_data(data_key, data_value)
+                payload['data'] = data
+                league_list.append(payload)
+                response_data = Helper.post(url, league_list)
+                print(response_data.text)
+                mongo.changeSet('zq_league').insert(dict(zq_league))
+            # 赛事
+            for zq_match in zq_matchs:
+                match_list = []
+                payload_key = ['game_code', 'title']
+                payload_value = ['zq', 'competition']
+                payload = Helper.get_zip_data(payload_key, payload_value)
+                match_date = zq_match.get('mdate')
+                match_time = re.search(r'(\d{1,2}):(\d{1,2})', zq_match.get('mtime'))
+                # 日期时间地区差异转换
+                if 0 <= int(match_time.group(1)) <= 12:
+                    if int(match_time.group(1)) == 12:
+                        r_match_time = '00:' + match_time.group(2)
+                    else:
+                        r_match_time = str(int(match_time.group(1)) + 12) + ':' + match_time.group(2)
+                else:
+                    m_time = int(match_time.group(1)) + 12 - 24
+                    if m_time < 10:
+                        r_match_time = '0' + str(m_time) + ':' + match_time.group(2)
+                    else:
+                        r_match_time = str(m_time) + ':' + match_time.group(2)
+                if int(match_time.group(1)) + 12 >= 24:
+                    match_date = (datetime.datetime.strptime(match_date, '%Y-%m-%d') + datetime.timedelta(
+                        days=1)).strftime('%Y-%m-%d')
+                old_time = match_date + ' ' + match_time.group(0) + ':00'
+                if current_time - datetime.datetime.strptime(old_time, "%Y-%m-%d %H:%M:%S") >= datetime.timedelta(
+                        hours=12):
+                    status = 1
+                else:
+                    status = 0
+                us_time = match_date + ' ' + r_match_time
+                data_key = ['home_team', 'guest_team', 'lg_id', 'status', 'match_id', 'match_date', 'match_time',
+                            'tag', 'source', 'is_rollball', 'is_today', 'is_morningplate', 'is_stringscene', 'us_time',
+                            'uuid']
+                data_value = [zq_match.get('host_name'), zq_match.get('guest_name'), zq_match.get('league_id'),
+                              status, zq_match.get('match_id'), match_date, r_match_time,
+                              '0', 'hg0088', zq_match.get('is_roll'), '0', '0', '0', us_time, str(zq_match.get('uuid'))]
+                data = Helper.get_zip_data(data_key, data_value)
+                payload['data'] = data
+                match_list.append(payload)
+                response_data = Helper.post(url, match_list)
+                print(response_data.text)
+                mongo.changeSet('zq_competition').insert(dict(zq_match))
+        # 冠军
+        elif zb == 'chain':
+            zq_chains = set(item['zq_chain'])
+            current_time = datetime.datetime.now()
+            for zq_chain in zq_chains:
+                chain_list = []
+                payload_key = ['game_code', 'title']
+                payload_value = ['zq', 'odds']
+                payload = Helper.get_zip_data(payload_key, payload_value)
+                data_key = ['match_id', 'lg_id', 'odds_code', 'status', 'sort', 'p_code', 'odds',
+                            'condition', 'odds_only', 'sole', 'source', 'type', 'team']
+                data_value = [zq_chain.get('league_id'), zq_chain.get('league_id'), zq_chain.get('league_subname'),
+                              zq_chain.get('enabled'), '0', zq_chain.get('game_type'), zq_chain.get('odds'),
+                              '0', '0', '0', 'c22123', '0', zq_chain.get('name')
+                              ]
+                data = Helper.get_zip_data(data_key, data_value)
+                payload['data'] = data
+                chain_list.append(payload)
+                response_data = Helper.post(url, chain_list)
+                print(response_data.text)
+
+                mongo.changeSet('zq_chain').insert(dict(zq_chain))
+        return item
+
     def close_spider(self, spider):
         self.client.close()
+
+    # def open_spider(self, spider):
+    #     self.host = '192.168.2.200'
+    #     self.port = 27017
+    #     self.dbname = 'kaiyou'  # 数据库名
+    #     self.client = pymongo.MongoClient(host=self.host, port=self.port)
+    #     self.tdb = self.client[self.dbname]
+    #     self.port = self.tdb['zq_league']  # 表名
+    # #     competition
+    #     self.port2 = self.tdb['zq_competition']  # 表名

+ 67 - 6
collectSports/spiders/sports.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import copy
+import datetime
+
 import time
 
 import scrapy
@@ -9,6 +11,7 @@ import json
 
 from collectSports.biz import getMongo
 from collectSports.items import Odds
+
 from collectSports.spiders.setdata import hash_func
 
 
@@ -23,13 +26,22 @@ class SportsSpider(scrapy.Spider):
         "Cache-Control": "max-age=0",
         "Connection": "keep-alive",
         # "Cookie": "OddType@21627573=H; protocolstr=http; gamePoint_21627573=2019-05-10%2A0%2A0; _ga=GA1.4.601418716.1557495256; _gid=GA1.4.1118061739.1557495256",
-        "Cookie": "OddType@21627573=H; _ga=GA1.4.773413111.1560825258; _gid=GA1.4.1960743904.1560825258; protocolstr=https; gamePoint_21627573=2019-06-18%2A2%2A0; _gat_UA-75448111-1=1",
+
+        # "Cookie": "OddType@21627573=H; _ga=GA1.4.773413111.1560825258; _gid=GA1.4.1960743904.1560825258; protocolstr=https; gamePoint_21627573=2019-06-18%2A2%2A0; _gat_UA-75448111-1=1",
+        # "Host": "205.201.4.177",
+        # "Origin": "https://205.201.4.177",
+        # "USER_AGENT": "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 UBrowser/6.2.4098.3 Safari/537.36",
+        # "ITEM_PIPELINES": {
+        #     "collectSports.pipelines.sports.SportsPipeline": 200,
+        # }
+
+        "Cookie": "OddType@21627573=H; _ga=GA1.4.773413111.1560825258; _gid=GA1.4.1960743904.1560825258; protocolstr=https; gamePoint_21627573=2019-06-18%2A2%2A",
         "Host": "205.201.4.177",
-        "Origin": "https://205.201.4.177",
         "USER_AGENT": "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 UBrowser/6.2.4098.3 Safari/537.36",
-        "ITEM_PIPELINES": {
-            "collectSports.pipelines.sports.SportsPipeline": 200,
-        }
+        # "ITEM_PIPELINES": {
+        #     "collectSports.pipelines.sports.SportsPipeline": 200,
+        # }
+
     }
 
     start_url = 'https://205.201.4.177/app/member/get_game_allbets.php'
@@ -40,9 +52,19 @@ class SportsSpider(scrapy.Spider):
         zq_competitions = mongo.changeSet('zq_competition').find()
         for zq_competition in zq_competitions:
             match_id = str(zq_competition['match_id'])
+
             # uuid = zq_competition['uuid']
             form_data = {
                 "uid": "jjdpzpc07m21627573l376834",
+            }
+            current_time = datetime.datetime.now()
+            mongo.changeSet('zq_competition').update({}, {'$set': {'current_time': current_time}}, upsert=True)
+            # mongo.collection.update({}, {$set: {update_time: ""}}, {multi: 1})
+            # mongo.changeSet('zq_league').insert(dict(zq_league))
+            # mongo.changeSet({"name":"zhangsan"}, {"$set":{"age":"25"}})
+            uuid = zq_competition['uuid']
+            form_data = {
+                "uid": "iobou83m21627573l357852",
                 "langx": "zh-cn",
                 "gtype": "FT",
                 "showtype": "FT",
@@ -50,20 +72,27 @@ class SportsSpider(scrapy.Spider):
                 "ltype": "4",
                 "date": pycomm.gmdate()
             }
-            request = scrapy.FormRequest(url, formdata=form_data, callback=self.parse, dont_filter=True, meta={'match_id': match_id})
+
+            request = scrapy.FormRequest(url, formdata=form_data, callback=self.parse, dont_filter=True,
+                                         meta={'match_id': match_id, 'uuid': uuid})
             yield request
 
     def parse(self, response):
         game_list = []
         games = response.xpath('/serverresponse/game')
         match_id = response.meta['match_id']
+
         uid_list = []
+
+        uuid = response.meta['uuid']
+
         for game in games:
             game_odds = {}
             game = lxml.etree.fromstring(game.extract())
             for i in game.getchildren():
                 game_odds[i.tag] = i.text
             game_list.append(game_odds)
+
         with open('../collectSports/conf/hg0088.json', 'r', encoding='utf8') as hg:
             hg0088 = json.load(hg)['root']
         odd_list = []
@@ -106,4 +135,36 @@ class SportsSpider(scrapy.Spider):
         item['updata'] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
         item['content'] = odd_list
         item['gidm'] = gidm
+
+        print(game_list)
+        with open('../collectSports/conf/hg0088.json', 'r', encoding='utf8') as hg:
+            hg0088 = json.load(hg)['root']
+            print(111)
+        odd_list = []
+        for x in hg0088:
+            try:
+                x['enabled'] = game_list[0][x['prodds']]
+            except:
+                pass
+            items = x['items']
+            new_items = []
+            for item in items:
+                try:
+                    item['oddsv'] = game_list[0][item['rodds']]
+                except:
+                    item['oddsv'] = 0
+                try:
+                    item['ratio'] = game_list[0][item['ratio_name']]
+                except:
+                    item['ratio'] = ""
+                new_items.append(item)
+            n_i = copy.deepcopy(x)
+            n_i['items'] = new_items
+            odd_list.append(n_i)
+        item = Odds()
+        item['match_id'] = match_id
+        item['uuid'] = uuid
+        item['source'] = "hg0088"
+        item['updata'] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+        item['content'] = odd_list
         yield item

+ 0 - 0
collectSports/utils/__init__.py


+ 19 - 0
collectSports/utils/helper.py

@@ -0,0 +1,19 @@
+import json
+
+import requests
+
+
+class Helper(object):
+    @staticmethod
+    def get(url, params):
+        return requests.get(url, data={"data": json.dumps(params)})
+
+    @staticmethod
+    def post(url, params):
+        return requests.post(url, data={"data": json.dumps(params)})
+
+    @staticmethod
+    def get_zip_data(list1, list2):
+        if list1 and list2:
+            if isinstance(list1, list) and isinstance(list2, list):
+                return dict(zip(list1, list2))

Some files were not shown because too many files changed in this diff