合并dev
parent
24f3cf564d
commit
0db5c26040
|
@ -2,6 +2,7 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="79a86edc-721f-4aad-920d-b595d0348b7f" name="Default" comment="test version">
|
||||
<<<<<<< Updated upstream
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tkcode" afterPath="$PROJECT_DIR$/tkcode" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/agency/cdn_list" afterPath="$PROJECT_DIR$/agency/cdn_list" />
|
||||
|
@ -9,6 +10,13 @@
|
|||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cdn_list" afterPath="$PROJECT_DIR$/cdn_list" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/ticket_config.yaml" afterPath="$PROJECT_DIR$/config/ticket_config.yaml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/urlConf.py" afterPath="$PROJECT_DIR$/config/urlConf.py" />
|
||||
=======
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/agency/cdn_utils.py" afterPath="$PROJECT_DIR$/agency/cdn_utils.py" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/ticket_config.yaml" afterPath="$PROJECT_DIR$/config/ticket_config.yaml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/urlConf.py" afterPath="$PROJECT_DIR$/config/urlConf.py" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/init/login.py" afterPath="$PROJECT_DIR$/init/login.py" />
|
||||
>>>>>>> Stashed changes
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/init/select_ticket_info.py" afterPath="$PROJECT_DIR$/init/select_ticket_info.py" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/myUrllib/httpUtils.py" afterPath="$PROJECT_DIR$/myUrllib/httpUtils.py" />
|
||||
</list>
|
||||
|
@ -24,7 +32,11 @@
|
|||
<SUITE FILE_PATH="coverage/12306$12306__2_.coverage" NAME="12306 (2) Coverage Results" MODIFIED="1495725009419" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/login" />
|
||||
<SUITE FILE_PATH="coverage/12306$run.coverage" NAME="run Coverage Results" MODIFIED="1515392744396" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/yixing" />
|
||||
<SUITE FILE_PATH="coverage/12306$12306__1_.coverage" NAME="12306 (1) Coverage Results" MODIFIED="1495724916012" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/12306login" />
|
||||
<<<<<<< Updated upstream
|
||||
<SUITE FILE_PATH="coverage/12306$cdn_utils.coverage" NAME="cdn_utils Coverage Results" MODIFIED="1517195928620" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/agency" />
|
||||
=======
|
||||
<SUITE FILE_PATH="coverage/12306$cdn_utils.coverage" NAME="cdn_utils Coverage Results" MODIFIED="1517200798613" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/agency" />
|
||||
>>>>>>> Stashed changes
|
||||
<SUITE FILE_PATH="coverage/12306$12306test.coverage" NAME="12306test Coverage Results" MODIFIED="1502779393809" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/yixing/myUrllib" />
|
||||
<SUITE FILE_PATH="coverage/12306$select_ticket_info.coverage" NAME="select_ticket_info Coverage Results" MODIFIED="1515251193898" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/yixing/init" />
|
||||
<SUITE FILE_PATH="coverage/12306$test.coverage" NAME="test Coverage Results" MODIFIED="1495722875742" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/12306login" />
|
||||
|
@ -33,7 +45,11 @@
|
|||
<SUITE FILE_PATH="coverage/12306$ticketConf.coverage" NAME="ticketConf Coverage Results" MODIFIED="1515140061195" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/yixing/config" />
|
||||
<SUITE FILE_PATH="coverage/12306$login.coverage" NAME="login Coverage Results" MODIFIED="1501571219088" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/yixing/init" />
|
||||
<SUITE FILE_PATH="coverage/12306$tiket.coverage" NAME="tiket Coverage Results" MODIFIED="1495973122962" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/yixing" />
|
||||
<<<<<<< Updated upstream
|
||||
<SUITE FILE_PATH="coverage/12306$run__1_.coverage" NAME="run (1) Coverage Results" MODIFIED="1517123442292" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
=======
|
||||
<SUITE FILE_PATH="coverage/12306$run__1_.coverage" NAME="run (1) Coverage Results" MODIFIED="1517233736048" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
>>>>>>> Stashed changes
|
||||
<SUITE FILE_PATH="coverage/12306$haha.coverage" NAME="haha Coverage Results" MODIFIED="1515250987704" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/yixing" />
|
||||
<SUITE FILE_PATH="coverage/12306$12306.coverage" NAME="12306 Coverage Results" MODIFIED="1495722251078" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
</component>
|
||||
|
@ -48,8 +64,13 @@
|
|||
<file leaf-file-name="login.py" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/init/login.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<<<<<<< Updated upstream
|
||||
<state relative-caret-position="-1994">
|
||||
<caret line="75" column="38" lean-forward="false" selection-start-line="75" selection-start-column="33" selection-end-line="75" selection-end-column="38" />
|
||||
=======
|
||||
<state relative-caret-position="226">
|
||||
<caret line="240" column="20" lean-forward="false" selection-start-line="240" selection-start-column="20" selection-end-line="240" selection-end-column="20" />
|
||||
>>>>>>> Stashed changes
|
||||
<folding>
|
||||
<element signature="e#41#54#0" expanded="true" />
|
||||
</folding>
|
||||
|
@ -57,21 +78,19 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<<<<<<< Updated upstream
|
||||
<file leaf-file-name="cdn_list" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/cdn_list">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="296">
|
||||
<caret line="566" column="12" lean-forward="true" selection-start-line="566" selection-start-column="12" selection-end-line="566" selection-end-column="12" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="httpUtils.py" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/myUrllib/httpUtils.py">
|
||||
=======
|
||||
<file leaf-file-name="select_ticket_info.py" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/init/select_ticket_info.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="120">
|
||||
<caret line="120" column="42" lean-forward="false" selection-start-line="120" selection-start-column="42" selection-end-line="120" selection-end-column="42" />
|
||||
<state relative-caret-position="1226">
|
||||
<caret line="743" column="23" lean-forward="false" selection-start-line="743" selection-start-column="23" selection-end-line="743" selection-end-column="23" />
|
||||
<folding>
|
||||
<element signature="e#23#38#0" expanded="true" />
|
||||
</folding>
|
||||
|
@ -79,6 +98,35 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="2018-01-29.log" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/tmp/log/2018-01-29.log">
|
||||
<provider selected="true" editor-type-id="LogFileEditorProvider">
|
||||
<state relative-caret-position="303">
|
||||
<caret line="387" column="45" lean-forward="true" selection-start-line="387" selection-start-column="45" selection-end-line="387" selection-end-column="63" />
|
||||
>>>>>>> Stashed changes
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="httpUtils.py" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/myUrllib/httpUtils.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<<<<<<< Updated upstream
|
||||
<state relative-caret-position="120">
|
||||
<caret line="120" column="42" lean-forward="false" selection-start-line="120" selection-start-column="42" selection-end-line="120" selection-end-column="42" />
|
||||
<folding>
|
||||
<element signature="e#23#38#0" expanded="true" />
|
||||
</folding>
|
||||
=======
|
||||
<state relative-caret-position="246">
|
||||
<caret line="92" column="49" lean-forward="false" selection-start-line="92" selection-start-column="49" selection-end-line="92" selection-end-column="49" />
|
||||
<folding />
|
||||
>>>>>>> Stashed changes
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<<<<<<< Updated upstream
|
||||
<file leaf-file-name="select_ticket_info.py" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/init/select_ticket_info.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
|
@ -87,16 +135,38 @@
|
|||
<folding>
|
||||
<element signature="e#23#34#0" expanded="true" />
|
||||
</folding>
|
||||
=======
|
||||
<file leaf-file-name="myurllib2.py" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/myUrllib/myurllib2.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
>>>>>>> Stashed changes
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<<<<<<< Updated upstream
|
||||
<file leaf-file-name="cdn_list" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/agency/cdn_list">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-10">
|
||||
<caret line="554" column="14" lean-forward="true" selection-start-line="554" selection-start-column="14" selection-end-line="554" selection-end-column="14" />
|
||||
<folding />
|
||||
=======
|
||||
<file leaf-file-name="README.md" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/README.md">
|
||||
<provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
|
||||
<state split_layout="SPLIT">
|
||||
<first_editor relative-caret-position="278">
|
||||
<caret line="191" column="0" lean-forward="false" selection-start-line="191" selection-start-column="0" selection-end-line="191" selection-end-column="0" />
|
||||
<folding />
|
||||
</first_editor>
|
||||
<second_editor>
|
||||
<js_state />
|
||||
</second_editor>
|
||||
>>>>>>> Stashed changes
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
@ -104,8 +174,13 @@
|
|||
<file leaf-file-name="ticket_config.yaml" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/config/ticket_config.yaml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<<<<<<< Updated upstream
|
||||
<state relative-caret-position="302">
|
||||
<caret line="97" column="9" lean-forward="false" selection-start-line="97" selection-start-column="9" selection-end-line="97" selection-end-column="9" />
|
||||
=======
|
||||
<state relative-caret-position="912">
|
||||
<caret line="75" column="9" lean-forward="false" selection-start-line="75" selection-start-column="9" selection-end-line="75" selection-end-column="9" />
|
||||
>>>>>>> Stashed changes
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
@ -114,11 +189,17 @@
|
|||
<file leaf-file-name="cdn_utils.py" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/agency/cdn_utils.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<<<<<<< Updated upstream
|
||||
<state relative-caret-position="302">
|
||||
<caret line="110" column="22" lean-forward="true" selection-start-line="110" selection-start-column="22" selection-end-line="110" selection-end-column="22" />
|
||||
<folding>
|
||||
<element signature="e#16#27#0" expanded="true" />
|
||||
</folding>
|
||||
=======
|
||||
<state relative-caret-position="-320">
|
||||
<caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
|
||||
<folding />
|
||||
>>>>>>> Stashed changes
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
@ -126,8 +207,13 @@
|
|||
<file leaf-file-name="urlConf.py" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/config/urlConf.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<<<<<<< Updated upstream
|
||||
<state relative-caret-position="213">
|
||||
<caret line="51" column="19" lean-forward="false" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="19" />
|
||||
=======
|
||||
<state relative-caret-position="1483">
|
||||
<caret line="106" column="15" lean-forward="false" selection-start-line="106" selection-start-column="5" selection-end-line="106" selection-end-column="15" />
|
||||
>>>>>>> Stashed changes
|
||||
<folding>
|
||||
<element signature="e#0#13#0" expanded="true" />
|
||||
</folding>
|
||||
|
@ -139,7 +225,11 @@
|
|||
<entry file="file://$PROJECT_DIR$/run.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="84">
|
||||
<<<<<<< Updated upstream
|
||||
<caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
|
||||
=======
|
||||
<caret line="6" column="34" lean-forward="false" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
|
||||
>>>>>>> Stashed changes
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
@ -156,6 +246,7 @@
|
|||
</component>
|
||||
<component name="FindInProjectRecents">
|
||||
<findStrings>
|
||||
<<<<<<< Updated upstream
|
||||
<find>该车次小于上次提交时间</find>
|
||||
<find>学生票</find>
|
||||
<find>checkRandCodeAnsyn</find>
|
||||
|
@ -186,6 +277,38 @@
|
|||
<find>checku</find>
|
||||
<find>{u'status': True, u'validateMessagesShowId': u'_validatorMessage', u'messages': [], u'httpstatus': 200, u'validateMessages': {}, u'data': {u'flag': False}}</find>
|
||||
<find>init</find>
|
||||
=======
|
||||
<find>expect_refresh_interval</find>
|
||||
<find>validateMessages</find>
|
||||
<find>submitOrderRequest</find>
|
||||
<find>initdc_url</find>
|
||||
<find>confirmSingleForQueue</find>
|
||||
<find>initDc</find>
|
||||
<find>secretStr</find>
|
||||
<find>time</find>
|
||||
<find>state</find>
|
||||
<find>autoSubmitOrderRequest</find>
|
||||
<find>checkQueueOrderUrl</find>
|
||||
<find>map</find>
|
||||
<find>cdn_list</find>
|
||||
<find>req_url</find>
|
||||
<find>func</find>
|
||||
<find>is_logger</find>
|
||||
<find>is_logg</find>
|
||||
<find>超时</find>
|
||||
<find>118.180.15.113</find>
|
||||
<find>checku</find>
|
||||
<find>{u'status': True, u'validateMessagesShowId': u'_validatorMessage', u'messages': [], u'httpstatus': 200, u'validateMessages': {}, u'data': {u'flag': False}}</find>
|
||||
<find>threading</find>
|
||||
<find>init</find>
|
||||
<find>下载验证码成功</find>
|
||||
<find>正在获取cookie</find>
|
||||
<find>获取</find>
|
||||
<find>loginInit</find>
|
||||
<find>check</find>
|
||||
<find>checkRandCodeAnsyn</find>
|
||||
<find>select_url</find>
|
||||
>>>>>>> Stashed changes
|
||||
</findStrings>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
|
@ -234,6 +357,7 @@
|
|||
<option value="$PROJECT_DIR$/config/configCommon.py" />
|
||||
<option value="$PROJECT_DIR$/tmp/log/2018-01-24.log" />
|
||||
<option value="$PROJECT_DIR$/.gitignore" />
|
||||
<<<<<<< Updated upstream
|
||||
<option value="$PROJECT_DIR$/README.md" />
|
||||
<option value="$PROJECT_DIR$/damatuCode/ruokuai.py" />
|
||||
<option value="$PROJECT_DIR$/tmp/log/2018-01-25.log" />
|
||||
|
@ -245,6 +369,19 @@
|
|||
<option value="$PROJECT_DIR$/config/urlConf.py" />
|
||||
<option value="$PROJECT_DIR$/myUrllib/httpUtils.py" />
|
||||
<option value="$PROJECT_DIR$/agency/cdn_utils.py" />
|
||||
=======
|
||||
<option value="$PROJECT_DIR$/damatuCode/ruokuai.py" />
|
||||
<option value="$PROJECT_DIR$/tmp/log/2018-01-25.log" />
|
||||
<option value="$PROJECT_DIR$/agency/cdn_list" />
|
||||
<option value="$PROJECT_DIR$/cdn_list" />
|
||||
<option value="$PROJECT_DIR$/config/urlConf.py" />
|
||||
<option value="$PROJECT_DIR$/init/select_ticket_info.py" />
|
||||
<option value="$PROJECT_DIR$/init/login.py" />
|
||||
<option value="$PROJECT_DIR$/myUrllib/httpUtils.py" />
|
||||
<option value="$PROJECT_DIR$/agency/cdn_utils.py" />
|
||||
<option value="$PROJECT_DIR$/config/ticket_config.yaml" />
|
||||
<option value="$PROJECT_DIR$/README.md" />
|
||||
>>>>>>> Stashed changes
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
@ -254,7 +391,7 @@
|
|||
<detection-done>true</detection-done>
|
||||
<sorting>DEFINITION_ORDER</sorting>
|
||||
</component>
|
||||
<component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
|
||||
<component name="ProjectFrameBounds" fullScreen="true">
|
||||
<option name="x" value="-8" />
|
||||
<option name="y" value="-8" />
|
||||
<option name="width" value="2572" />
|
||||
|
@ -280,6 +417,7 @@
|
|||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="Scratches" />
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
|
@ -295,7 +433,11 @@
|
|||
<path>
|
||||
<item name="12306" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="12306" type="462c0819:PsiDirectoryNode" />
|
||||
<<<<<<< Updated upstream
|
||||
<item name="config" type="462c0819:PsiDirectoryNode" />
|
||||
=======
|
||||
<item name="init" type="462c0819:PsiDirectoryNode" />
|
||||
>>>>>>> Stashed changes
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
|
@ -313,16 +455,26 @@
|
|||
<property name="SearchEverywhereHistoryKey" value="	FILE	file://D:/my_work/12306/yixing/12306.py" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
<<<<<<< Updated upstream
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$" />
|
||||
<recent name="$PROJECT_DIR$/yixing/config" />
|
||||
</key>
|
||||
=======
|
||||
>>>>>>> Stashed changes
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$" />
|
||||
<recent name="$PROJECT_DIR$/tmp/log" />
|
||||
<recent name="$PROJECT_DIR$/config" />
|
||||
<recent name="$PROJECT_DIR$/myException" />
|
||||
<recent name="$PROJECT_DIR$/yixing/myUrllib" />
|
||||
<<<<<<< Updated upstream
|
||||
=======
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$" />
|
||||
<recent name="$PROJECT_DIR$/yixing/config" />
|
||||
>>>>>>> Stashed changes
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
|
@ -337,7 +489,11 @@
|
|||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<<<<<<< Updated upstream
|
||||
<component name="RunManager" selected="Python.cdn_utils">
|
||||
=======
|
||||
<component name="RunManager" selected="Python.run (1)">
|
||||
>>>>>>> Stashed changes
|
||||
<configuration name="12306 (3)" type="PythonConfigurationType" factoryName="Python">
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
|
@ -669,8 +825,13 @@
|
|||
</list>
|
||||
<recent_temporary>
|
||||
<list size="5">
|
||||
<<<<<<< Updated upstream
|
||||
<item index="0" class="java.lang.String" itemvalue="Python.cdn_utils" />
|
||||
<item index="1" class="java.lang.String" itemvalue="Python.run (1)" />
|
||||
=======
|
||||
<item index="0" class="java.lang.String" itemvalue="Python.run (1)" />
|
||||
<item index="1" class="java.lang.String" itemvalue="Python.cdn_utils" />
|
||||
>>>>>>> Stashed changes
|
||||
<item index="2" class="java.lang.String" itemvalue="Python.select_ticket_info (1)" />
|
||||
<item index="3" class="java.lang.String" itemvalue="Python.run" />
|
||||
<item index="4" class="java.lang.String" itemvalue="Python.select_ticket_info" />
|
||||
|
@ -926,6 +1087,7 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1516887559529</updated>
|
||||
</task>
|
||||
<<<<<<< Updated upstream
|
||||
<option name="localTasksCounter" value="35" />
|
||||
<servers />
|
||||
</component>
|
||||
|
@ -942,7 +1104,34 @@
|
|||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32889965" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39661428" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
=======
|
||||
<task id="LOCAL-00035" summary="1、增加cdn轮训功能 2、兼容Windows cmd命令乱码问题 3、规范接口提交参数 4、修改已知bug">
|
||||
<created>1517234341941</created>
|
||||
<option name="number" value="00035" />
|
||||
<option name="presentableId" value="LOCAL-00035" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1517234341941</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="36" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5465538" sideWeight="0.50429183" order="14" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32889965" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48004836" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48367593" sideWeight="0.49570817" order="4" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32889965" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18669528" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32889965" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
>>>>>>> Stashed changes
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297568" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39661428" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297568" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
|
@ -950,7 +1139,10 @@
|
|||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||
<<<<<<< Updated upstream
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32889965" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
=======
|
||||
>>>>>>> Stashed changes
|
||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
</layout>
|
||||
<layout-to-restore>
|
||||
|
@ -1009,7 +1201,6 @@
|
|||
<option name="myLimit" value="2678400000" />
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="增加过滤车次配置" />
|
||||
<MESSAGE value="增加配置" />
|
||||
<MESSAGE value="增加预售车次订票休眠时间配置" />
|
||||
<MESSAGE value="修改不能提交订票的bug" />
|
||||
|
@ -1034,17 +1225,29 @@
|
|||
<MESSAGE value="更新" />
|
||||
<MESSAGE value="加速需要验证码订票的速度" />
|
||||
<MESSAGE value="修正下载验证码失败问题" />
|
||||
<<<<<<< Updated upstream
|
||||
<option name="LAST_COMMIT_MESSAGE" value="修正下载验证码失败问题" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<option name="time" value="34" />
|
||||
=======
|
||||
<MESSAGE value="1、增加cdn轮训功能 2、兼容Windows cmd命令乱码问题 3、规范接口提交参数 4、修改已知bug" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="1、增加cdn轮训功能 2、兼容Windows cmd命令乱码问题 3、规范接口提交参数 4、修改已知bug" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<option name="time" value="35" />
|
||||
>>>>>>> Stashed changes
|
||||
</breakpoint-manager>
|
||||
<watches-manager />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<<<<<<< Updated upstream
|
||||
<entry file="file://$PROJECT_DIR$/yixing/damatuCode/damatuWeb.py" />
|
||||
<entry file="file://$PROJECT_DIR$/yixing/station_name.txt" />
|
||||
=======
|
||||
>>>>>>> Stashed changes
|
||||
<entry file="file:///System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/urllib2.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="159">
|
||||
|
@ -1092,6 +1295,7 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<<<<<<< Updated upstream
|
||||
<entry file="file://$PROJECT_DIR$/myUrllib/myurllib2.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-262">
|
||||
|
@ -1117,6 +1321,25 @@
|
|||
</entry>
|
||||
<entry file="file:///Library/Python/2.7/site-packages/requests/exceptions.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
=======
|
||||
<entry file="file:///Library/Python/2.7/site-packages/requests/adapters.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="198">
|
||||
<caret line="520" column="0" lean-forward="false" selection-start-line="520" selection-start-column="0" selection-end-line="520" selection-end-column="0" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file:///Library/Python/2.7/site-packages/requests/sessions.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="117">
|
||||
<caret line="617" column="0" lean-forward="false" selection-start-line="617" selection-start-column="0" selection-end-line="617" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file:///Library/Python/2.7/site-packages/requests/exceptions.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
>>>>>>> Stashed changes
|
||||
<state relative-caret-position="-1444">
|
||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
|
@ -1215,6 +1438,7 @@
|
|||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="210">
|
||||
<caret line="49" column="16" lean-forward="false" selection-start-line="49" selection-start-column="16" selection-end-line="49" selection-end-column="17" />
|
||||
<<<<<<< Updated upstream
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
@ -1234,6 +1458,8 @@
|
|||
<state relative-caret-position="126">
|
||||
<caret line="9" column="38" lean-forward="false" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
|
||||
<folding />
|
||||
=======
|
||||
>>>>>>> Stashed changes
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
@ -1253,6 +1479,7 @@
|
|||
</provider>
|
||||
</entry>
|
||||
<entry file="file:///Library/Python/2.7/site-packages/urllib3/connection.py">
|
||||
<<<<<<< Updated upstream
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="220">
|
||||
<caret line="343" column="0" lean-forward="false" selection-start-line="343" selection-start-column="0" selection-end-line="343" selection-end-column="0" />
|
||||
|
@ -1261,6 +1488,16 @@
|
|||
</entry>
|
||||
<entry file="file://$USER_HOME$/Library/Caches/PyCharm2017.2/python_stubs/-2125986627/__builtin__.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
=======
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="220">
|
||||
<caret line="343" column="0" lean-forward="false" selection-start-line="343" selection-start-column="0" selection-end-line="343" selection-end-column="0" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$USER_HOME$/Library/Caches/PyCharm2017.2/python_stubs/-2125986627/__builtin__.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
>>>>>>> Stashed changes
|
||||
<state relative-caret-position="154">
|
||||
<caret line="1858" column="8" lean-forward="false" selection-start-line="1858" selection-start-column="8" selection-end-line="1858" selection-end-column="8" />
|
||||
</state>
|
||||
|
@ -1281,24 +1518,61 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<<<<<<< Updated upstream
|
||||
<entry file="file://$PROJECT_DIR$/config/ticket_config.yaml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="302">
|
||||
<caret line="97" column="9" lean-forward="false" selection-start-line="97" selection-start-column="9" selection-end-line="97" selection-end-column="9" />
|
||||
<folding />
|
||||
=======
|
||||
<entry file="file://$PROJECT_DIR$/cdn_list">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="499">
|
||||
<caret line="914" column="15" lean-forward="false" selection-start-line="914" selection-start-column="15" selection-end-line="914" selection-end-column="15" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/proxy_list">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/agency/cdn_list">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="210">
|
||||
<caret line="568" column="13" lean-forward="true" selection-start-line="568" selection-start-column="13" selection-end-line="568" selection-end-column="13" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/tmp/log/2018-01-29.log">
|
||||
<provider selected="true" editor-type-id="LogFileEditorProvider">
|
||||
<state relative-caret-position="303">
|
||||
<caret line="387" column="45" lean-forward="true" selection-start-line="387" selection-start-column="45" selection-end-line="387" selection-end-column="63" />
|
||||
>>>>>>> Stashed changes
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/urlConf.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<<<<<<< Updated upstream
|
||||
<state relative-caret-position="213">
|
||||
<caret line="51" column="19" lean-forward="false" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="19" />
|
||||
=======
|
||||
<state relative-caret-position="226">
|
||||
<caret line="240" column="20" lean-forward="false" selection-start-line="240" selection-start-column="20" selection-end-line="240" selection-end-column="20" />
|
||||
>>>>>>> Stashed changes
|
||||
<folding>
|
||||
<element signature="e#0#13#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<<<<<<< Updated upstream
|
||||
<entry file="file://$PROJECT_DIR$/agency/cdn_list">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-10">
|
||||
|
@ -1321,10 +1595,27 @@
|
|||
<caret line="120" column="42" lean-forward="false" selection-start-line="120" selection-start-column="42" selection-end-line="120" selection-end-column="42" />
|
||||
<folding>
|
||||
<element signature="e#23#38#0" expanded="true" />
|
||||
=======
|
||||
<entry file="file://$PROJECT_DIR$/myUrllib/httpUtils.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="246">
|
||||
<caret line="92" column="49" lean-forward="false" selection-start-line="92" selection-start-column="49" selection-end-line="92" selection-end-column="49" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/config/urlConf.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1483">
|
||||
<caret line="106" column="15" lean-forward="false" selection-start-line="106" selection-start-column="5" selection-end-line="106" selection-end-column="15" />
|
||||
<folding>
|
||||
<element signature="e#0#13#0" expanded="true" />
|
||||
>>>>>>> Stashed changes
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<<<<<<< Updated upstream
|
||||
<entry file="file://$PROJECT_DIR$/init/login.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-1994">
|
||||
|
@ -1332,23 +1623,78 @@
|
|||
<folding>
|
||||
<element signature="e#41#54#0" expanded="true" />
|
||||
</folding>
|
||||
=======
|
||||
<entry file="file://$PROJECT_DIR$/run.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="84">
|
||||
<caret line="6" column="34" lean-forward="false" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
|
||||
<folding />
|
||||
>>>>>>> Stashed changes
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/agency/cdn_utils.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<<<<<<< Updated upstream
|
||||
<state relative-caret-position="302">
|
||||
<caret line="110" column="22" lean-forward="true" selection-start-line="110" selection-start-column="22" selection-end-line="110" selection-end-column="22" />
|
||||
<folding>
|
||||
<element signature="e#16#27#0" expanded="true" />
|
||||
</folding>
|
||||
=======
|
||||
<state relative-caret-position="-320">
|
||||
<caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
|
||||
<folding />
|
||||
>>>>>>> Stashed changes
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/run.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<<<<<<< Updated upstream
|
||||
<state relative-caret-position="84">
|
||||
<caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
|
||||
=======
|
||||
<state relative-caret-position="912">
|
||||
<caret line="75" column="9" lean-forward="false" selection-start-line="75" selection-start-column="9" selection-end-line="75" selection-end-column="9" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/myUrllib/myurllib2.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/init/select_ticket_info.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1226">
|
||||
<caret line="743" column="23" lean-forward="false" selection-start-line="743" selection-start-column="23" selection-end-line="743" selection-end-column="23" />
|
||||
<folding>
|
||||
<element signature="e#23#38#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/README.md">
|
||||
<provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
|
||||
<state split_layout="SPLIT">
|
||||
<first_editor relative-caret-position="278">
|
||||
<caret line="191" column="0" lean-forward="false" selection-start-line="191" selection-start-column="0" selection-end-line="191" selection-end-column="0" />
|
||||
<folding />
|
||||
</first_editor>
|
||||
<second_editor>
|
||||
<js_state />
|
||||
</second_editor>
|
||||
</state>
|
||||
</provider>
|
||||
<provider editor-type-id="text-editor">
|
||||
<state relative-caret-position="126">
|
||||
<caret line="9" column="38" lean-forward="false" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
|
||||
>>>>>>> Stashed changes
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
11
README.md
11
README.md
|
@ -193,4 +193,15 @@
|
|||
- 2018.1.25更新
|
||||
- 删除 expect_refresh_interval 无用字段,优化代码
|
||||
|
||||
- 2018.1.29更新
|
||||
- 增加cdn轮训功能,优势, is_cdn=1为开启cdn,2为普通查询
|
||||
- 能够一定程度躲避封ip
|
||||
- 查询余票快人一步
|
||||
- 提交订单快人一步
|
||||
- 僵尸票可能会少很多
|
||||
- 兼容Windows cmd命令乱码问题
|
||||
- 规范12306接口提交参数
|
||||
- 修改已知bug
|
||||
- 最后感谢群里提供测试和代码的小伙伴,能为你们买到一张回家的票真的感到灰常开心
|
||||
|
||||
|
||||
|
|
611
agency/cdn_list
611
agency/cdn_list
|
@ -1,611 +0,0 @@
|
|||
150.138.169.233
|
||||
183.131.192.83
|
||||
117.27.241.176
|
||||
115.231.22.33
|
||||
115.231.84.169
|
||||
115.231.22.80
|
||||
58.216.21.23
|
||||
123.138.60.143
|
||||
117.27.245.89
|
||||
61.188.191.26
|
||||
61.188.191.84
|
||||
175.43.124.142
|
||||
60.222.221.62
|
||||
222.243.110.146
|
||||
222.243.110.149
|
||||
117.21.168.87
|
||||
182.132.33.24
|
||||
182.132.33.26
|
||||
112.25.35.53
|
||||
61.188.191.30
|
||||
220.162.97.245
|
||||
61.90.241.26
|
||||
61.188.191.215
|
||||
220.162.97.241
|
||||
222.245.77.22
|
||||
222.163.201.28
|
||||
113.5.80.100
|
||||
182.140.147.63
|
||||
182.132.33.22
|
||||
221.229.167.32
|
||||
61.188.191.20
|
||||
220.165.142.37
|
||||
218.58.222.19
|
||||
211.142.22.26
|
||||
113.207.72.19
|
||||
220.194.200.180
|
||||
60.174.241.25
|
||||
61.188.191.27
|
||||
220.162.97.243
|
||||
61.54.219.34
|
||||
113.5.80.93
|
||||
114.80.143.144
|
||||
120.192.199.13
|
||||
175.43.20.60
|
||||
121.18.230.86
|
||||
59.56.26.36
|
||||
182.140.147.58
|
||||
61.54.219.8
|
||||
182.140.147.106
|
||||
122.70.142.160
|
||||
120.192.199.26
|
||||
219.243.47.166
|
||||
162.105.28.232
|
||||
120.192.199.12
|
||||
120.192.199.4
|
||||
120.192.199.13
|
||||
120.192.199.3
|
||||
115.231.82.101
|
||||
106.3.62.198
|
||||
115.231.82.59
|
||||
115.231.82.62
|
||||
115.231.82.58
|
||||
115.231.82.60
|
||||
112.253.19.162
|
||||
112.253.19.161
|
||||
122.70.142.142
|
||||
122.70.142.144
|
||||
175.43.124.143
|
||||
112.253.19.159
|
||||
175.43.124.145
|
||||
122.70.142.145
|
||||
175.43.124.146
|
||||
101.227.66.152
|
||||
121.18.230.43
|
||||
121.18.230.42
|
||||
121.18.230.44
|
||||
121.18.230.45
|
||||
122.70.142.143
|
||||
222.243.110.147
|
||||
222.243.110.149
|
||||
222.243.110.146
|
||||
222.243.110.148
|
||||
110.18.244.138
|
||||
110.18.244.140
|
||||
110.18.244.141
|
||||
112.253.19.163
|
||||
115.231.84.62
|
||||
115.231.84.64
|
||||
218.60.106.91
|
||||
61.188.191.27
|
||||
175.43.124.141
|
||||
61.188.191.26
|
||||
61.188.191.28
|
||||
115.156.188.138
|
||||
112.253.19.164
|
||||
106.3.62.194
|
||||
220.165.142.37
|
||||
220.165.142.38
|
||||
220.165.142.35
|
||||
220.165.142.39
|
||||
220.165.142.40
|
||||
219.146.68.84
|
||||
219.146.68.78
|
||||
219.146.68.79
|
||||
61.138.219.8
|
||||
61.138.219.7
|
||||
182.132.33.24
|
||||
182.132.33.22
|
||||
182.132.33.21
|
||||
182.132.33.23
|
||||
61.138.219.10
|
||||
61.138.219.6
|
||||
58.216.21.23
|
||||
220.165.142.36
|
||||
58.216.21.24
|
||||
58.216.21.25
|
||||
61.138.219.9
|
||||
58.216.21.22
|
||||
60.174.241.31
|
||||
211.142.22.26
|
||||
60.174.241.29
|
||||
60.174.241.30
|
||||
115.156.188.137
|
||||
123.138.60.143
|
||||
222.243.110.150
|
||||
115.231.84.65
|
||||
123.138.60.145
|
||||
123.138.60.144
|
||||
211.142.22.24
|
||||
61.54.219.39
|
||||
61.54.219.75
|
||||
61.54.219.38
|
||||
119.84.111.83
|
||||
175.43.20.56
|
||||
202.122.145.86
|
||||
175.43.20.58
|
||||
175.43.20.57
|
||||
211.142.22.25
|
||||
101.227.66.151
|
||||
112.25.35.52
|
||||
112.25.35.53
|
||||
112.25.35.54
|
||||
202.122.145.214
|
||||
112.25.35.56
|
||||
112.25.35.55
|
||||
119.84.111.44
|
||||
119.84.111.45
|
||||
119.84.111.47
|
||||
175.43.20.60
|
||||
61.54.219.43
|
||||
60.174.241.28
|
||||
175.43.124.144
|
||||
121.18.230.46
|
||||
121.18.230.47
|
||||
114.80.143.158
|
||||
182.140.147.59
|
||||
182.140.147.62
|
||||
182.140.147.79
|
||||
182.140.147.76
|
||||
182.140.147.77
|
||||
180.180.248.185
|
||||
182.140.147.78
|
||||
182.140.147.61
|
||||
182.140.147.58
|
||||
123.138.60.146
|
||||
111.161.22.27
|
||||
101.227.66.150
|
||||
175.154.189.30
|
||||
221.229.167.47
|
||||
36.250.74.83
|
||||
115.231.22.80
|
||||
113.200.235.30
|
||||
119.84.111.43
|
||||
119.84.111.41
|
||||
119.84.111.42
|
||||
116.55.236.36
|
||||
115.231.171.17
|
||||
115.231.171.13
|
||||
116.55.236.38
|
||||
115.231.171.16
|
||||
115.231.171.14
|
||||
220.165.142.51
|
||||
116.55.236.37
|
||||
116.55.236.45
|
||||
221.235.187.76
|
||||
220.162.97.245
|
||||
220.162.97.209
|
||||
220.162.97.241
|
||||
220.162.97.246
|
||||
115.231.84.169
|
||||
116.55.236.39
|
||||
117.27.245.62
|
||||
202.118.10.115
|
||||
118.180.15.110
|
||||
61.188.191.20
|
||||
61.188.191.22
|
||||
61.188.191.21
|
||||
61.167.54.239
|
||||
61.188.191.19
|
||||
61.167.54.238
|
||||
61.167.54.237
|
||||
61.167.54.236
|
||||
61.167.54.109
|
||||
111.26.136.223
|
||||
119.84.111.38
|
||||
113.207.72.17
|
||||
123.138.60.147
|
||||
113.207.72.20
|
||||
113.207.72.19
|
||||
202.118.10.117
|
||||
111.161.22.17
|
||||
111.161.22.16
|
||||
110.18.244.142
|
||||
59.56.26.49
|
||||
59.56.26.35
|
||||
59.56.26.36
|
||||
59.56.26.37
|
||||
118.180.15.74
|
||||
118.180.15.73
|
||||
118.180.15.69
|
||||
118.180.15.71
|
||||
110.18.244.137
|
||||
118.180.15.72
|
||||
59.56.26.34
|
||||
112.253.19.160
|
||||
113.200.235.18
|
||||
113.200.235.17
|
||||
118.180.15.94
|
||||
113.200.235.15
|
||||
36.250.87.94
|
||||
113.200.235.16
|
||||
59.56.26.33
|
||||
183.136.217.73
|
||||
183.136.217.75
|
||||
60.207.246.98
|
||||
117.27.245.89
|
||||
113.207.72.67
|
||||
113.207.69.72
|
||||
220.162.97.243
|
||||
183.136.217.74
|
||||
117.27.245.87
|
||||
117.27.245.85
|
||||
220.162.97.242
|
||||
112.90.246.87
|
||||
61.90.241.26
|
||||
117.27.245.88
|
||||
183.250.179.36
|
||||
61.167.54.108
|
||||
210.66.46.19
|
||||
115.231.171.15
|
||||
182.140.147.81
|
||||
183.250.179.23
|
||||
183.250.179.24
|
||||
183.250.179.12
|
||||
183.250.179.25
|
||||
221.235.187.132
|
||||
183.250.179.11
|
||||
36.250.87.26
|
||||
175.43.20.81
|
||||
60.222.221.65
|
||||
60.222.221.62
|
||||
60.222.221.61
|
||||
36.250.87.30
|
||||
36.250.87.27
|
||||
113.107.112.214
|
||||
113.107.112.168
|
||||
113.107.112.167
|
||||
218.92.220.15
|
||||
61.188.191.30
|
||||
218.92.220.17
|
||||
221.229.167.32
|
||||
61.188.191.29
|
||||
221.229.167.31
|
||||
221.229.167.36
|
||||
60.222.221.66
|
||||
125.90.204.34
|
||||
125.90.204.33
|
||||
58.222.19.59
|
||||
61.188.191.85
|
||||
125.90.204.32
|
||||
58.222.19.51
|
||||
58.222.19.52
|
||||
58.222.19.54
|
||||
61.188.191.215
|
||||
58.222.19.53
|
||||
182.140.147.80
|
||||
61.188.191.217
|
||||
61.188.191.216
|
||||
58.222.19.50
|
||||
222.163.201.24
|
||||
222.163.201.29
|
||||
113.107.112.164
|
||||
182.140.147.104
|
||||
113.207.69.18
|
||||
113.207.69.16
|
||||
222.163.201.27
|
||||
222.163.201.30
|
||||
125.90.204.31
|
||||
222.23.55.208
|
||||
222.245.77.19
|
||||
222.245.77.21
|
||||
121.18.230.86
|
||||
182.132.33.26
|
||||
58.216.21.21
|
||||
61.188.191.84
|
||||
222.245.77.22
|
||||
218.92.220.55
|
||||
182.132.33.25
|
||||
222.245.77.17
|
||||
61.174.63.232
|
||||
60.222.221.59
|
||||
221.235.187.64
|
||||
58.221.78.105
|
||||
61.138.219.85
|
||||
218.58.222.99
|
||||
113.5.80.100
|
||||
218.58.222.19
|
||||
113.5.80.90
|
||||
61.167.54.240
|
||||
180.97.180.44
|
||||
113.5.80.93
|
||||
61.174.63.203
|
||||
61.174.63.205
|
||||
61.174.63.200
|
||||
61.174.63.204
|
||||
180.97.180.47
|
||||
60.223.235.139
|
||||
180.97.180.45
|
||||
180.97.180.46
|
||||
113.5.80.91
|
||||
60.223.235.142
|
||||
118.180.15.113
|
||||
175.43.124.195
|
||||
220.194.200.177
|
||||
220.194.200.179
|
||||
220.194.200.180
|
||||
42.81.5.76
|
||||
42.81.5.79
|
||||
61.156.243.247
|
||||
222.186.17.100
|
||||
60.174.241.88
|
||||
182.34.127.94
|
||||
220.194.200.178
|
||||
218.29.50.48
|
||||
113.5.80.125
|
||||
218.76.105.75
|
||||
218.60.109.74
|
||||
182.140.236.27
|
||||
122.143.27.169
|
||||
211.162.39.113
|
||||
61.138.219.87
|
||||
115.231.22.33
|
||||
121.192.176.198
|
||||
115.231.22.31
|
||||
115.231.22.34
|
||||
115.231.22.32
|
||||
58.216.21.93
|
||||
125.90.204.122
|
||||
180.97.178.210
|
||||
117.27.245.75
|
||||
122.136.46.107
|
||||
222.163.201.28
|
||||
220.194.200.232
|
||||
61.54.219.34
|
||||
119.84.111.46
|
||||
116.211.79.31
|
||||
58.222.19.61
|
||||
222.243.110.164
|
||||
117.27.241.176
|
||||
222.132.5.100
|
||||
121.192.176.196
|
||||
175.43.124.142
|
||||
115.231.84.61
|
||||
61.188.191.218
|
||||
112.65.220.39
|
||||
218.58.222.20
|
||||
60.5.254.10
|
||||
118.122.87.99
|
||||
221.179.172.161
|
||||
60.174.241.25
|
||||
113.207.72.15
|
||||
218.60.106.25
|
||||
183.250.179.32
|
||||
117.21.168.87
|
||||
182.140.147.63
|
||||
112.25.35.79
|
||||
60.174.241.26
|
||||
125.39.1.138
|
||||
221.179.172.204
|
||||
119.84.111.126
|
||||
61.167.54.62
|
||||
111.11.152.225
|
||||
114.80.143.144
|
||||
112.65.220.18
|
||||
113.207.69.17
|
||||
119.84.111.49
|
||||
222.211.64.92
|
||||
222.211.64.89
|
||||
111.11.228.69
|
||||
111.26.136.216
|
||||
202.201.14.181
|
||||
111.26.136.222
|
||||
111.1.59.190
|
||||
218.26.75.208
|
||||
36.250.76.204
|
||||
60.5.255.230
|
||||
101.70.152.37
|
||||
162.105.28.233
|
||||
58.20.164.51
|
||||
121.251.255.226
|
||||
202.98.156.62
|
||||
182.140.236.28
|
||||
182.132.33.43
|
||||
110.18.247.41
|
||||
110.18.247.40
|
||||
175.25.168.40
|
||||
111.1.59.93
|
||||
111.40.195.169
|
||||
121.251.255.227
|
||||
111.44.244.52
|
||||
222.211.64.51
|
||||
36.42.32.68
|
||||
119.84.111.113
|
||||
119.84.86.112
|
||||
218.58.222.15
|
||||
218.76.94.67
|
||||
111.20.250.62
|
||||
218.92.220.78
|
||||
218.202.111.106
|
||||
218.197.116.214
|
||||
124.164.8.65
|
||||
113.107.57.43
|
||||
117.187.19.45
|
||||
117.187.19.19
|
||||
117.187.19.17
|
||||
117.187.19.16
|
||||
117.187.19.18
|
||||
211.142.22.114
|
||||
117.169.17.8
|
||||
117.169.17.7
|
||||
117.169.17.6
|
||||
211.138.60.136
|
||||
125.90.204.117
|
||||
211.138.60.135
|
||||
202.120.1.32
|
||||
221.180.151.118
|
||||
58.20.197.62
|
||||
183.131.168.145
|
||||
122.228.233.206
|
||||
221.180.151.119
|
||||
122.228.233.209
|
||||
58.223.164.87
|
||||
202.194.19.4
|
||||
202.194.19.5
|
||||
36.250.248.66
|
||||
112.84.104.48
|
||||
111.26.17.169
|
||||
121.251.255.237
|
||||
124.165.216.64
|
||||
222.89.68.50
|
||||
117.131.213.238
|
||||
222.184.34.54
|
||||
112.25.35.61
|
||||
111.26.17.170
|
||||
117.156.21.51
|
||||
117.187.19.164
|
||||
60.215.125.71
|
||||
117.187.19.46
|
||||
36.250.248.68
|
||||
60.13.41.74
|
||||
36.250.76.37
|
||||
36.250.76.36
|
||||
36.250.76.35
|
||||
36.250.76.34
|
||||
222.89.68.51
|
||||
117.169.17.45
|
||||
218.199.110.85
|
||||
220.162.97.136
|
||||
42.58.243.157
|
||||
124.228.90.88
|
||||
14.215.100.94
|
||||
113.107.57.41
|
||||
14.215.9.85
|
||||
218.199.110.84
|
||||
58.63.233.35
|
||||
221.230.141.78
|
||||
117.21.204.77
|
||||
218.92.227.121
|
||||
116.211.79.27
|
||||
59.45.42.44
|
||||
122.228.233.208
|
||||
122.225.28.145
|
||||
111.11.228.70
|
||||
58.218.208.199
|
||||
183.134.11.90
|
||||
171.217.254.68
|
||||
61.184.117.53
|
||||
183.134.28.63
|
||||
116.57.77.35
|
||||
60.174.241.23
|
||||
183.134.12.69
|
||||
182.140.218.63
|
||||
182.140.218.64
|
||||
60.211.208.49
|
||||
218.86.111.69
|
||||
218.77.2.32
|
||||
61.163.117.65
|
||||
115.231.20.39
|
||||
117.169.17.46
|
||||
221.182.135.179
|
||||
121.14.117.145
|
||||
218.92.209.74
|
||||
182.106.194.107
|
||||
183.131.119.86
|
||||
183.224.12.87
|
||||
123.183.164.143
|
||||
106.3.62.213
|
||||
36.250.76.65
|
||||
106.3.62.211
|
||||
106.3.62.212
|
||||
183.131.168.154
|
||||
115.156.188.183
|
||||
115.156.188.182
|
||||
117.145.179.96
|
||||
222.186.132.68
|
||||
218.29.49.71
|
||||
112.25.55.143
|
||||
150.138.214.95
|
||||
218.7.220.14
|
||||
59.56.30.221
|
||||
150.138.214.86
|
||||
150.138.214.85
|
||||
183.6.245.178
|
||||
150.138.214.83
|
||||
150.138.214.84
|
||||
122.13.74.252
|
||||
183.134.9.59
|
||||
124.116.133.50
|
||||
112.90.212.126
|
||||
218.60.132.160
|
||||
183.6.245.191
|
||||
14.215.100.95
|
||||
111.23.11.52
|
||||
115.153.176.80
|
||||
112.17.26.100
|
||||
117.23.2.85
|
||||
183.134.11.91
|
||||
221.182.135.156
|
||||
222.186.132.123
|
||||
125.90.206.144
|
||||
42.58.243.34
|
||||
183.61.26.199
|
||||
60.8.123.158
|
||||
150.138.169.233
|
||||
60.220.194.210
|
||||
36.42.32.254
|
||||
222.218.45.216
|
||||
117.27.241.99
|
||||
211.142.22.2
|
||||
59.56.30.207
|
||||
220.194.203.66
|
||||
218.5.238.215
|
||||
123.183.164.136
|
||||
112.65.220.227
|
||||
59.56.30.206
|
||||
111.47.201.207
|
||||
113.5.170.35
|
||||
112.25.82.12
|
||||
49.79.232.225
|
||||
110.157.233.34
|
||||
221.180.137.59
|
||||
60.13.41.78
|
||||
183.131.119.87
|
||||
110.157.233.35
|
||||
183.134.16.86
|
||||
110.157.233.30
|
||||
110.157.233.33
|
||||
58.50.31.33
|
||||
123.138.60.192
|
||||
150.138.168.115
|
||||
61.147.211.20
|
||||
218.12.228.212
|
||||
119.90.19.39
|
||||
221.229.202.154
|
||||
123.138.157.109
|
||||
122.70.142.182
|
||||
60.223.208.78
|
||||
101.66.224.145
|
||||
180.97.247.157
|
||||
116.224.87.45
|
||||
180.97.180.16
|
||||
59.50.75.195
|
||||
211.91.165.175
|
||||
183.222.100.112
|
||||
183.131.192.83
|
||||
59.47.79.43
|
||||
211.91.168.40
|
||||
60.217.22.146
|
||||
183.214.140.236
|
||||
60.213.21.211
|
||||
218.60.51.253
|
||||
125.64.134.78
|
||||
222.163.202.216
|
||||
101.227.102.198
|
||||
223.111.13.62
|
||||
59.47.0.189
|
||||
117.23.2.86
|
||||
111.11.31.114
|
||||
123.172.120.115
|
||||
219.147.141.176
|
||||
120.221.24.123
|
|
@ -41,11 +41,8 @@
|
|||
|
||||
set:
|
||||
station_dates:
|
||||
# - "2018-01-27"
|
||||
# - "2018-01-28"
|
||||
- "2018-02-09"
|
||||
- "2018-02-10"
|
||||
# - "2018-02-09"
|
||||
- "2018-01-27"
|
||||
|
||||
station_trains:
|
||||
- "G4741"
|
||||
- "G2365"
|
||||
|
@ -53,18 +50,7 @@ set:
|
|||
- "G1337"
|
||||
- "G1377"
|
||||
- "G1329"
|
||||
# - "G1302"
|
||||
# - "G1372"
|
||||
# - "G1326"
|
||||
# - "K4300"
|
||||
# - "K5226"
|
||||
# - "K7772"
|
||||
# - "G1329"
|
||||
# - "G1359"
|
||||
# - "G1361"
|
||||
# - "G1373"
|
||||
# - "G1363"
|
||||
# - "G4933"
|
||||
|
||||
from_station: "上海"
|
||||
to_station: "邵阳"
|
||||
set_type:
|
||||
|
@ -76,7 +62,7 @@ set:
|
|||
12306count:
|
||||
# - uesr: ""
|
||||
# - pwd: "apple1995"
|
||||
- uesr: "931128603@qq.com"
|
||||
- uesr: "@qq.com"
|
||||
- pwd: "QWERTY"
|
||||
|
||||
select_refresh_interval: 1
|
||||
|
@ -86,18 +72,18 @@ aotu_code_type: 2
|
|||
#enable_proxy: False
|
||||
|
||||
damatu:
|
||||
uesr: "931128603"
|
||||
uesr: ""
|
||||
pwd: "qazWSX1995"
|
||||
|
||||
email_conf:
|
||||
is_email: True
|
||||
email: "931128603@qq.com "
|
||||
email: "@qq.com "
|
||||
notice_email_list: "61995120@qq.com"
|
||||
username: "931128603"
|
||||
username: ""
|
||||
password: "xwopwxbkupbqbfgb"
|
||||
host: "smtp.qq.com"
|
||||
|
||||
is_cdn: 2
|
||||
is_cdn: 1
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -670,8 +670,9 @@ class select:
|
|||
start_time = datetime.datetime.now()
|
||||
http.cdn = cdn[i].replace("\n", "")
|
||||
rep = http.send(urls)
|
||||
if rep and "message" not in rep and (datetime.datetime.now() - start_time).microseconds / 1000 < 400:
|
||||
if rep and "message" not in rep and (datetime.datetime.now() - start_time).microseconds / 1000 < 300:
|
||||
self.cdn_list.append(cdn[i].replace("\n", ""))
|
||||
print(u"所有cdn解析完成...")
|
||||
|
||||
def cdn_certification(self):
|
||||
"""
|
||||
|
|
400
proxy_list
400
proxy_list
|
@ -1,400 +0,0 @@
|
|||
121.31.151.68:8123
|
||||
175.8.28.27:8118
|
||||
183.52.150.152:61234
|
||||
219.138.58.187:3128
|
||||
115.215.49.154:33862
|
||||
120.35.201.66:38183
|
||||
171.37.170.92:8123
|
||||
42.176.133.180:42136
|
||||
123.161.153.101:32463
|
||||
110.72.255.170:8123
|
||||
122.114.31.177:808
|
||||
61.135.217.7:80
|
||||
183.52.150.97:61234
|
||||
171.39.31.180:8123
|
||||
182.112.203.41:8118
|
||||
49.72.4.203:37377
|
||||
140.237.114.223:47717
|
||||
123.128.197.192:8118
|
||||
119.29.18.239:8888
|
||||
1.195.9.13:22993
|
||||
115.203.206.247:23939
|
||||
223.241.78.39:8010
|
||||
39.88.41.99:8118
|
||||
120.33.247.212:33339
|
||||
49.70.64.225:37007
|
||||
116.62.217.206:80
|
||||
115.46.98.23:8123
|
||||
183.52.150.145:61234
|
||||
123.185.129.49:8118
|
||||
110.73.51.40:8123
|
||||
221.233.85.65:3128
|
||||
110.73.32.25:8123
|
||||
118.114.77.47:8080
|
||||
114.95.112.144:8118
|
||||
110.73.29.53:8123
|
||||
144.123.71.160:49690
|
||||
183.52.150.156:61234
|
||||
49.87.177.35:46386
|
||||
182.91.227.42:8118
|
||||
221.7.175.143:8123
|
||||
114.229.36.235:40733
|
||||
125.109.198.176:36437
|
||||
110.73.50.39:8123
|
||||
123.163.160.143:808
|
||||
115.193.58.95:8118
|
||||
221.7.175.176:8123
|
||||
59.56.46.87:808
|
||||
115.202.55.75:3128
|
||||
222.183.208.239:8118
|
||||
59.51.120.238:3128
|
||||
27.40.158.33:61234
|
||||
110.73.41.128:8123
|
||||
219.138.58.67:3128
|
||||
175.171.186.176:53281
|
||||
60.214.118.170:63000
|
||||
110.73.51.76:8123
|
||||
27.40.158.166:61234
|
||||
223.241.78.214:8010
|
||||
110.73.42.147:8123
|
||||
110.72.29.86:8123
|
||||
121.206.70.166:49632
|
||||
114.230.218.193:39939
|
||||
49.85.11.114:20560
|
||||
171.11.229.202:22319
|
||||
59.51.122.30:3128
|
||||
223.247.242.173:29364
|
||||
60.169.220.107:29481
|
||||
110.73.5.224:8123
|
||||
114.235.22.143:20422
|
||||
113.121.242.121:38709
|
||||
49.87.181.72:41724
|
||||
182.96.194.239:8118
|
||||
27.40.137.19:61234
|
||||
121.31.155.135:8123
|
||||
36.25.26.136:41425
|
||||
121.205.254.203:21985
|
||||
125.126.165.172:23574
|
||||
110.73.7.35:8123
|
||||
49.85.13.4:27569
|
||||
60.214.155.243:53281
|
||||
121.31.101.40:8123
|
||||
121.31.155.243:8123
|
||||
223.241.118.66:8010
|
||||
121.31.148.127:8123
|
||||
110.73.52.173:8123
|
||||
123.55.98.69:808
|
||||
110.73.5.198:8123
|
||||
115.202.95.185:28660
|
||||
182.34.52.132:31355
|
||||
123.55.188.56:37051
|
||||
223.245.176.244:47795
|
||||
110.73.3.21:8123
|
||||
219.138.58.112:3128
|
||||
219.138.58.194:3128
|
||||
49.88.168.78:40688
|
||||
27.158.127.137:24873
|
||||
171.12.182.227:20651
|
||||
115.203.194.175:42575
|
||||
182.88.179.195:8123
|
||||
182.88.91.141:8123
|
||||
110.73.6.227:8123
|
||||
114.231.68.85:42209
|
||||
222.78.96.108:29860
|
||||
183.48.91.229:8118
|
||||
219.138.58.246:3128
|
||||
49.85.9.115:45206
|
||||
49.85.13.169:21333
|
||||
123.53.133.71:45445
|
||||
220.162.155.89:32376
|
||||
115.221.123.221:37201
|
||||
223.241.79.150:8010
|
||||
121.31.103.152:8123
|
||||
221.233.85.68:3128
|
||||
219.138.58.30:3128
|
||||
59.58.241.149:48192
|
||||
49.84.217.238:44957
|
||||
60.175.213.230:45256
|
||||
120.24.183.96:8118
|
||||
110.73.48.198:8123
|
||||
118.254.153.20:3128
|
||||
183.52.150.225:61234
|
||||
223.241.116.81:8010
|
||||
123.160.52.55:43649
|
||||
123.163.20.212:47094
|
||||
125.78.7.120:31875
|
||||
121.31.153.251:8123
|
||||
222.71.122.146:31108
|
||||
121.31.156.150:8123
|
||||
115.55.177.196:8118
|
||||
119.114.19.138:9999
|
||||
114.230.124.53:46837
|
||||
123.163.163.60:808
|
||||
180.118.241.94:61234
|
||||
223.241.119.34:8010
|
||||
180.118.240.198:808
|
||||
183.144.209.30:3128
|
||||
27.40.156.66:61234
|
||||
110.166.254.82:808
|
||||
180.118.242.50:61234
|
||||
27.40.150.111:61234
|
||||
27.40.130.134:61234
|
||||
118.254.148.50:3128
|
||||
121.31.138.222:8123
|
||||
114.230.218.62:35797
|
||||
49.85.12.186:32381
|
||||
182.88.135.96:8123
|
||||
111.200.14.205:8123
|
||||
171.39.113.250:8123
|
||||
183.158.21.152:20007
|
||||
183.135.253.45:24119
|
||||
110.73.30.20:8123
|
||||
111.155.124.84:8123
|
||||
121.205.74.183:49065
|
||||
110.85.89.180:27914
|
||||
115.203.199.74:42657
|
||||
118.254.148.64:3128
|
||||
110.73.55.53:8123
|
||||
183.158.5.46:25265
|
||||
110.217.134.54:8123
|
||||
121.226.155.66:808
|
||||
121.31.158.27:8123
|
||||
121.31.199.177:8123
|
||||
180.118.242.220:61234
|
||||
27.40.137.17:61234
|
||||
110.73.11.226:8123
|
||||
222.93.241.26:30477
|
||||
118.254.146.148:3128
|
||||
222.76.187.130:8118
|
||||
175.8.227.80:8118
|
||||
180.118.242.70:808
|
||||
115.217.252.102:47989
|
||||
115.203.210.236:45967
|
||||
182.39.2.166:30145
|
||||
49.85.13.81:43995
|
||||
111.73.147.197:8118
|
||||
171.12.181.60:21174
|
||||
223.241.118.229:8010
|
||||
115.46.88.164:8123
|
||||
118.254.147.6:3128
|
||||
182.88.167.163:8123
|
||||
180.122.148.100:25454
|
||||
115.221.113.194:41715
|
||||
115.230.79.32:49442
|
||||
120.33.247.85:24886
|
||||
183.52.150.219:61234
|
||||
117.34.70.200:808
|
||||
59.58.64.76:9999
|
||||
111.230.247.240:808
|
||||
219.138.58.230:3128
|
||||
220.164.163.243:63000
|
||||
222.76.187.50:8118
|
||||
114.215.30.108:8118
|
||||
175.171.171.87:80
|
||||
183.52.150.254:61234
|
||||
114.230.122.152:23864
|
||||
49.85.9.68:30759
|
||||
113.121.183.238:43939
|
||||
123.161.153.244:42606
|
||||
125.79.71.89:45539
|
||||
123.55.189.173:32152
|
||||
123.163.160.71:36548
|
||||
171.14.210.82:45510
|
||||
113.121.241.127:808
|
||||
171.37.165.220:8123
|
||||
49.87.146.221:44131
|
||||
180.104.63.209:28631
|
||||
183.144.201.222:3128
|
||||
223.241.118.75:8010
|
||||
222.76.144.172:26787
|
||||
183.144.211.208:37357
|
||||
110.73.48.21:8123
|
||||
49.85.6.8:31993
|
||||
124.237.130.8:9999
|
||||
122.241.200.209:34519
|
||||
114.218.249.126:26948
|
||||
125.79.71.21:28468
|
||||
110.189.207.128:31268
|
||||
222.76.187.205:8118
|
||||
125.109.197.201:33410
|
||||
180.155.133.95:27902
|
||||
125.116.173.10:3128
|
||||
118.254.144.210:3128
|
||||
182.88.184.159:8123
|
||||
123.53.135.16:33710
|
||||
118.254.147.67:3128
|
||||
180.121.163.184:34472
|
||||
114.226.165.214:37307
|
||||
121.31.147.123:8123
|
||||
121.31.177.220:8123
|
||||
27.40.155.110:61234
|
||||
121.231.146.179:6666
|
||||
117.71.111.47:22453
|
||||
59.51.121.76:3128
|
||||
183.157.186.22:8118
|
||||
61.178.238.122:63000
|
||||
110.73.8.180:8123
|
||||
118.254.152.202:3128
|
||||
115.213.248.191:37506
|
||||
183.52.150.209:61234
|
||||
223.241.116.149:8010
|
||||
110.90.130.69:25387
|
||||
123.161.154.61:40820
|
||||
223.241.116.147:8010
|
||||
118.254.155.66:3128
|
||||
27.39.240.37:8123
|
||||
110.73.3.16:8123
|
||||
113.128.25.83:44009
|
||||
115.217.255.132:48223
|
||||
117.24.35.141:37688
|
||||
223.241.116.244:8010
|
||||
114.230.126.19:45928
|
||||
114.235.252.161:36177
|
||||
110.72.21.175:8123
|
||||
113.221.47.167:8888
|
||||
125.122.95.141:808
|
||||
114.235.83.151:8118
|
||||
222.77.50.221:45917
|
||||
114.230.106.48:28789
|
||||
223.241.119.12:8010
|
||||
122.4.44.27:23472
|
||||
115.46.72.171:8123
|
||||
112.114.93.61:8118
|
||||
223.241.116.238:8010
|
||||
125.126.171.23:28378
|
||||
113.121.242.236:49944
|
||||
59.58.240.209:27367
|
||||
49.85.0.223:21125
|
||||
113.121.176.67:28711
|
||||
117.27.114.75:34532
|
||||
171.13.37.71:808
|
||||
223.241.78.154:8010
|
||||
223.241.119.159:8010
|
||||
110.73.11.124:8123
|
||||
120.32.139.4:43264
|
||||
115.217.253.211:46710
|
||||
125.126.164.87:40197
|
||||
110.73.32.10:8123
|
||||
119.186.249.12:8118
|
||||
110.72.25.24:8123
|
||||
110.72.37.150:8123
|
||||
118.254.149.40:3128
|
||||
110.73.5.227:8123
|
||||
171.39.31.47:8123
|
||||
110.73.48.219:8123
|
||||
117.86.166.204:35061
|
||||
123.185.129.225:8118
|
||||
171.39.30.58:8123
|
||||
182.254.227.50:8888
|
||||
180.118.240.49:808
|
||||
124.228.239.22:3128
|
||||
121.31.153.238:8123
|
||||
117.86.200.113:45240
|
||||
223.214.212.57:26420
|
||||
110.73.7.152:8123
|
||||
117.71.106.75:28316
|
||||
182.99.247.93:808
|
||||
113.121.37.206:25863
|
||||
119.39.72.147:8118
|
||||
117.26.186.221:23637
|
||||
223.241.117.54:8010
|
||||
110.83.173.225:31956
|
||||
180.104.63.33:33382
|
||||
180.155.131.147:23728
|
||||
110.73.4.184:8123
|
||||
182.112.203.230:8118
|
||||
110.73.9.88:8123
|
||||
223.241.118.112:8010
|
||||
110.73.5.50:8123
|
||||
175.8.1.213:8118
|
||||
180.122.150.206:32994
|
||||
117.92.88.35:45810
|
||||
118.254.142.42:53281
|
||||
222.94.11.176:8118
|
||||
111.76.141.221:808
|
||||
115.46.67.164:8123
|
||||
110.73.40.22:8123
|
||||
180.110.150.235:8118
|
||||
223.241.79.43:8010
|
||||
115.215.51.194:22596
|
||||
1.195.11.186:48361
|
||||
60.169.216.159:25285
|
||||
110.73.7.27:8123
|
||||
49.81.98.85:8118
|
||||
27.151.171.19:29994
|
||||
222.191.171.190:35827
|
||||
117.87.120.182:8123
|
||||
110.73.28.24:8123
|
||||
49.86.239.45:8123
|
||||
36.25.59.87:38511
|
||||
110.90.133.162:20412
|
||||
113.87.122.248:8118
|
||||
182.88.4.136:8123
|
||||
183.150.238.47:3128
|
||||
117.69.97.47:34095
|
||||
113.121.171.132:21543
|
||||
171.39.40.120:8123
|
||||
223.241.117.222:8010
|
||||
182.88.166.112:8123
|
||||
122.4.40.131:24274
|
||||
125.109.199.116:23453
|
||||
121.31.103.144:8123
|
||||
121.31.102.18:8123
|
||||
110.73.5.36:8123
|
||||
123.161.154.153:36870
|
||||
222.89.74.30:40552
|
||||
49.85.13.198:21638
|
||||
115.221.123.116:25129
|
||||
110.73.8.51:8123
|
||||
49.85.2.75:42637
|
||||
115.217.253.59:34373
|
||||
121.207.76.91:44333
|
||||
110.73.28.213:8123
|
||||
121.31.103.222:8123
|
||||
121.31.102.33:8123
|
||||
222.246.243.33:3128
|
||||
118.254.154.196:3128
|
||||
113.67.164.207:8118
|
||||
222.216.200.59:8080
|
||||
49.85.3.95:21778
|
||||
125.104.243.185:21538
|
||||
110.73.51.191:8123
|
||||
60.167.22.121:43681
|
||||
125.109.199.129:31350
|
||||
123.162.199.156:27279
|
||||
123.55.3.113:44009
|
||||
115.230.65.215:33303
|
||||
110.73.42.111:8123
|
||||
121.31.101.121:8123
|
||||
101.68.73.54:53281
|
||||
49.85.6.105:32384
|
||||
49.87.181.71:31565
|
||||
220.162.155.119:32335
|
||||
121.31.139.47:8123
|
||||
183.148.82.184:38661
|
||||
121.31.138.238:8123
|
||||
27.150.85.53:41690
|
||||
171.38.10.212:8123
|
||||
49.85.8.215:41510
|
||||
218.73.133.168:40785
|
||||
222.85.19.92:20698
|
||||
121.31.147.139:8123
|
||||
124.237.131.167:9999
|
||||
110.88.127.17:36741
|
||||
183.148.69.138:23252
|
||||
110.73.11.192:8123
|
||||
114.232.105.76:22866
|
||||
171.39.2.134:8123
|
||||
180.118.243.10:61234
|
||||
110.73.15.90:8123
|
||||
115.202.60.122:3128
|
||||
171.13.37.85:808
|
||||
183.148.74.202:28543
|
||||
122.241.204.92:26383
|
||||
183.148.94.73:40098
|
||||
180.114.175.171:25341
|
||||
222.76.187.58:8118
|
||||
221.10.159.234:1337
|
||||
59.51.121.151:3128
|
||||
49.70.64.45:22487
|
||||
59.59.214.15:44130
|
Loading…
Reference in New Issue