|
|
@@ -2,7 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="7fa42e97-ddea-4404-91db-5a9ccc162649" name="Default Changelist" comment="Merge http://git.meme100.com:10180/aqm/sports_scrapy # Conflicts: #	hg3535/settings.py">
|
|
|
- <change beforePath="$PROJECT_DIR$/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/settings.py" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/main_time.py" beforeDir="false" afterPath="$PROJECT_DIR$/main_time.py" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
@@ -42,7 +42,7 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/items.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="342">
|
|
|
+ <state relative-caret-position="4914">
|
|
|
<caret line="316" column="17" selection-start-line="316" selection-start-column="6" selection-end-line="316" selection-end-column="17" />
|
|
|
<folding>
|
|
|
<element signature="e#320#1230#0" />
|
|
|
@@ -55,7 +55,7 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-3402">
|
|
|
+ <state relative-caret-position="2214">
|
|
|
<caret line="129" column="14" selection-start-line="129" selection-start-column="14" selection-end-line="129" selection-end-column="14" />
|
|
|
<folding>
|
|
|
<element signature="e#24#35#0" expanded="true" />
|
|
|
@@ -67,7 +67,7 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="3366">
|
|
|
+ <state relative-caret-position="3258">
|
|
|
<caret line="187" column="45" selection-start-line="187" selection-start-column="45" selection-end-line="187" selection-end-column="45" />
|
|
|
<folding>
|
|
|
<element signature="e#24#35#0" expanded="true" />
|
|
|
@@ -79,8 +79,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="342">
|
|
|
- <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
|
|
|
+ <state relative-caret-position="36">
|
|
|
+ <caret line="19" selection-start-line="19" selection-end-line="19" />
|
|
|
<folding>
|
|
|
<element signature="e#24#35#0" expanded="true" />
|
|
|
</folding>
|
|
|
@@ -91,8 +91,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status_up.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="342">
|
|
|
- <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
|
|
|
+ <state relative-caret-position="54">
|
|
|
+ <caret line="19" selection-start-line="19" selection-end-line="19" />
|
|
|
<folding>
|
|
|
<element signature="e#25#40#0" expanded="true" />
|
|
|
</folding>
|
|
|
@@ -103,7 +103,7 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/main.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="72">
|
|
|
+ <state relative-caret-position="36">
|
|
|
<caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
|
|
|
<folding>
|
|
|
<element signature="e#0#10#0" expanded="true" />
|
|
|
@@ -112,11 +112,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/main_time.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="400">
|
|
|
- <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
|
|
|
+ <state relative-caret-position="310">
|
|
|
+ <caret line="34" column="21" lean-forward="true" selection-start-line="34" selection-start-column="21" selection-end-line="34" selection-end-column="21" />
|
|
|
<folding>
|
|
|
<element signature="e#0#11#0" expanded="true" />
|
|
|
</folding>
|
|
|
@@ -132,8 +132,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/pipelines.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="162">
|
|
|
- <caret line="45" column="30" lean-forward="true" selection-start-line="45" selection-start-column="30" selection-end-line="45" selection-end-column="30" />
|
|
|
+ <state relative-caret-position="810">
|
|
|
+ <caret line="45" column="30" selection-start-line="45" selection-start-column="30" selection-end-line="45" selection-end-column="30" />
|
|
|
<folding>
|
|
|
<element signature="e#0#15#0" expanded="true" />
|
|
|
</folding>
|
|
|
@@ -141,11 +141,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/settings.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="22">
|
|
|
- <caret line="135" column="24" lean-forward="true" selection-start-line="135" selection-start-column="24" selection-end-line="135" selection-end-column="24" />
|
|
|
+ <state relative-caret-position="23">
|
|
|
+ <caret line="135" column="24" selection-start-line="135" selection-start-column="24" selection-end-line="135" selection-end-column="24" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -243,8 +243,8 @@
|
|
|
<option value="$PROJECT_DIR$/spiders/wqbodan.py" />
|
|
|
<option value="$PROJECT_DIR$/pipelines.py" />
|
|
|
<option value="$PROJECT_DIR$/main.py" />
|
|
|
- <option value="$PROJECT_DIR$/main_time.py" />
|
|
|
<option value="$PROJECT_DIR$/settings.py" />
|
|
|
+ <option value="$PROJECT_DIR$/main_time.py" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -260,6 +260,7 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
+ <pane id="Scope" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
|
|
@@ -280,12 +281,11 @@
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
- <pane id="Scope" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../../sports_scrapy-2/sports_scrapy-1/hg3535" />
|
|
|
+ <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" />
|
|
|
@@ -500,6 +500,7 @@
|
|
|
<workItem from="1557018228723" duration="19258000" />
|
|
|
<workItem from="1557293774618" duration="7402000" />
|
|
|
<workItem from="1557364694196" duration="10610000" />
|
|
|
+ <workItem from="1557379397322" duration="33000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="修改后,版本二">
|
|
|
<created>1555727493584</created>
|
|
|
@@ -617,7 +618,7 @@
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="1344623000" />
|
|
|
+ <option name="totallyTimeSpent" value="1344656000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
|
|
@@ -631,7 +632,7 @@
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
|
|
|
<layout>
|
|
|
- <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.13113007" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.13219616" />
|
|
|
<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" />
|
|
|
@@ -644,7 +645,7 @@
|
|
|
<window_info anchor="bottom" id="Version Control" order="7" weight="0.2918455" />
|
|
|
<window_info anchor="bottom" id="Database Changes" order="8" />
|
|
|
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5053305" side_tool="true" weight="0.40128756" />
|
|
|
- <window_info active="true" anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.4946695" visible="true" weight="0.40128756" />
|
|
|
+ <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.4946695" visible="true" weight="0.40128756" />
|
|
|
<window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" weight="0.41309014" />
|
|
|
<window_info anchor="bottom" id="Run" order="12" sideWeight="0.4946695" weight="0.44206008" />
|
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
@@ -983,60 +984,60 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
|
|
|
+ <entry file="file://$PROJECT_DIR$/items.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-3402">
|
|
|
- <caret line="129" column="14" selection-start-line="129" selection-start-column="14" selection-end-line="129" selection-end-column="14" />
|
|
|
+ <state relative-caret-position="4914">
|
|
|
+ <caret line="316" column="17" selection-start-line="316" selection-start-column="6" selection-end-line="316" selection-end-column="17" />
|
|
|
<folding>
|
|
|
- <element signature="e#24#35#0" expanded="true" />
|
|
|
+ <element signature="e#320#1230#0" />
|
|
|
+ <element signature="e#1382#1528#0" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status_up.py">
|
|
|
+ <entry file="file://$PROJECT_DIR$/spiders/zuqiu.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="342">
|
|
|
- <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
|
|
|
+ <state relative-caret-position="2214">
|
|
|
+ <caret line="129" column="14" selection-start-line="129" selection-start-column="14" selection-end-line="129" selection-end-column="14" />
|
|
|
<folding>
|
|
|
- <element signature="e#25#40#0" expanded="true" />
|
|
|
+ <element signature="e#24#35#0" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status.py">
|
|
|
+ <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="342">
|
|
|
- <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
|
|
|
+ <state relative-caret-position="3258">
|
|
|
+ <caret line="187" column="45" selection-start-line="187" selection-start-column="45" selection-end-line="187" selection-end-column="45" />
|
|
|
<folding>
|
|
|
<element signature="e#24#35#0" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/items.py">
|
|
|
+ <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="342">
|
|
|
- <caret line="316" column="17" selection-start-line="316" selection-start-column="6" selection-end-line="316" selection-end-column="17" />
|
|
|
+ <state relative-caret-position="36">
|
|
|
+ <caret line="19" selection-start-line="19" selection-end-line="19" />
|
|
|
<folding>
|
|
|
- <element signature="e#320#1230#0" />
|
|
|
- <element signature="e#1382#1528#0" />
|
|
|
+ <element signature="e#24#35#0" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/pipelines.py">
|
|
|
+ <entry file="file://$PROJECT_DIR$/spiders/hg3535_zq_status_up.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="162">
|
|
|
- <caret line="45" column="30" lean-forward="true" selection-start-line="45" selection-start-column="30" selection-end-line="45" selection-end-column="30" />
|
|
|
+ <state relative-caret-position="54">
|
|
|
+ <caret line="19" selection-start-line="19" selection-end-line="19" />
|
|
|
<folding>
|
|
|
- <element signature="e#0#15#0" expanded="true" />
|
|
|
+ <element signature="e#25#40#0" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/main.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="72">
|
|
|
+ <state relative-caret-position="36">
|
|
|
<caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
|
|
|
<folding>
|
|
|
<element signature="e#0#10#0" expanded="true" />
|
|
|
@@ -1047,30 +1048,30 @@
|
|
|
<entry file="file://$PROJECT_DIR$/spiders/hg3535_zuqiu.py">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/spiders/bangqiu.py">
|
|
|
+ <entry file="file://$PROJECT_DIR$/pipelines.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="3366">
|
|
|
- <caret line="187" column="45" selection-start-line="187" selection-start-column="45" selection-end-line="187" selection-end-column="45" />
|
|
|
+ <state relative-caret-position="810">
|
|
|
+ <caret line="45" column="30" selection-start-line="45" selection-start-column="30" selection-end-line="45" selection-end-column="30" />
|
|
|
<folding>
|
|
|
- <element signature="e#24#35#0" expanded="true" />
|
|
|
+ <element signature="e#0#15#0" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/main_time.py">
|
|
|
+ <entry file="file://$PROJECT_DIR$/settings.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="400">
|
|
|
- <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
|
|
|
- <folding>
|
|
|
- <element signature="e#0#11#0" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="23">
|
|
|
+ <caret line="135" column="24" selection-start-line="135" selection-start-column="24" selection-end-line="135" selection-end-column="24" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/settings.py">
|
|
|
+ <entry file="file://$PROJECT_DIR$/main_time.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="22">
|
|
|
- <caret line="135" column="24" lean-forward="true" selection-start-line="135" selection-start-column="24" selection-end-line="135" selection-end-column="24" />
|
|
|
+ <state relative-caret-position="310">
|
|
|
+ <caret line="34" column="21" lean-forward="true" selection-start-line="34" selection-start-column="21" selection-end-line="34" selection-end-column="21" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#0#11#0" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|