jinql
/
12306
mirror of https://github.com/testerSunshine/12306
1
0
Fork 0
Code Issues Releases Wiki Activity

fix

gui_0.0.1
wenxianping 2019-01-16 11:19:32 +08:00
parent 524c48a496
commit e736b0fd23
7 changed files with 409 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

509
.idea/workspace.xml
View File

@ -1,16 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4ff88715-dd0d-4e26-8ea7-b7b28038ca10" name="Default" comment=""> <list default="true" id="b0ca309c-231f-43f8-ba9d-0c954a15bfa7" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/12306.iml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/12306.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/markdown-exported-files.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/markdown-navigator.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/markdown-navigator/profiles_settings.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/UnitTest/TestAll.py" beforeDir="false" afterPath="$PROJECT_DIR$/UnitTest/TestAll.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/agency/cdn_utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/agency/cdn_utils.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/emailConf.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/emailConf.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/pushbearConf.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/pushbearConf.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/ticket_config.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/config/ticket_config.yaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/urlConf.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/urlConf.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/init/select_ticket_info.py" beforeDir="false" afterPath="$PROJECT_DIR$/init/select_ticket_info.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/inter/GetPassengerDTOs.py" beforeDir="false" afterPath="$PROJECT_DIR$/inter/GetPassengerDTOs.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/myUrllib/httpUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/myUrllib/httpUtils.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
@ -20,7 +25,10 @@
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="CoverageDataManager"> <component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/12306$select_ticket_info.coverage" NAME="select_ticket_info Coverage Results" MODIFIED="1538459782462" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/init" /> <SUITE FILE_PATH="coverage/12306$Nosetests_for_TestAll_testAll_testLogin.coverage" NAME="Nosetests for TestAll.testAll.testLogin Coverage Results" MODIFIED="1547517351085" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/UnitTest" />
<SUITE FILE_PATH="coverage/12306$pushbearConf.coverage" NAME="pushbearConf Coverage Results" MODIFIED="1547607924184" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/config" />
<SUITE FILE_PATH="coverage/12306$cdn_utils.coverage" NAME="cdn_utils Coverage Results" MODIFIED="1547546064988" 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$select_ticket_info.coverage" NAME="select_ticket_info Coverage Results" MODIFIED="1547545588185" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/init" />
<SUITE FILE_PATH="coverage/12306$run.coverage" NAME="run Coverage Results" MODIFIED="1540282009794" 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.coverage" NAME="run Coverage Results" MODIFIED="1540282009794" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
@ -28,35 +36,35 @@
<file leaf-file-name="select_ticket_info.py" pinned="false" current-in-tab="false"> <file leaf-file-name="select_ticket_info.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/init/select_ticket_info.py"> <entry file="file://$PROJECT_DIR$/init/select_ticket_info.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1184"> <state relative-caret-position="247">
<caret line="104" column="36" selection-start-line="104" selection-start-column="36" selection-end-line="104" selection-end-column="36" /> <caret line="142" selection-start-line="142" selection-end-line="142" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="QueryOrderWaitTime.py" pinned="false" current-in-tab="false"> <file leaf-file-name="cdn_utils.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/inter/QueryOrderWaitTime.py"> <entry file="file://$PROJECT_DIR$/agency/cdn_utils.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="48"> <state relative-caret-position="-564">
<caret line="34" column="122" selection-start-line="34" selection-start-column="122" selection-end-line="34" selection-end-column="122" /> <caret line="16" selection-start-line="16" selection-end-line="16" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="true"> <file leaf-file-name="emailConf.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/config/emailConf.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64"> <state relative-caret-position="442">
<caret line="4" column="1" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" /> <caret line="36" column="22" lean-forward="true" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="TicketEnmu.py" pinned="false" current-in-tab="false"> <file leaf-file-name="smtplib.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/TicketEnmu.py"> <entry file="file:///Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/smtplib.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="416"> <state relative-caret-position="274">
<caret line="26" column="4" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" /> <caret line="1065" column="40" lean-forward="true" selection-start-line="1065" selection-start-column="40" selection-end-line="1065" selection-end-column="40" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -64,17 +72,17 @@
<file leaf-file-name="ticket_config.yaml" pinned="false" current-in-tab="false"> <file leaf-file-name="ticket_config.yaml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/ticket_config.yaml"> <entry file="file://$PROJECT_DIR$/config/ticket_config.yaml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192"> <state relative-caret-position="-499">
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" /> <caret line="64" lean-forward="true" selection-start-line="64" selection-end-line="64" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="requirements.txt" pinned="false" current-in-tab="false"> <file leaf-file-name="GetPassengerDTOs.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/requirements.txt"> <entry file="file://$PROJECT_DIR$/inter/GetPassengerDTOs.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="459">
<caret line="6" column="16" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="16" /> <caret line="87" column="44" selection-start-line="87" selection-start-column="44" selection-end-line="87" selection-end-column="44" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -83,8 +91,8 @@
<entry file="file://$PROJECT_DIR$/README.md"> <entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]"> <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
<state split_layout="SPLIT"> <state split_layout="SPLIT">
<first_editor relative-caret-position="848"> <first_editor relative-caret-position="-952">
<caret line="53" column="4" selection-start-line="53" selection-start-column="4" selection-end-line="56" selection-end-column="23" /> <caret line="14" column="69" selection-start-line="14" selection-start-column="69" selection-end-line="14" selection-end-column="69" />
</first_editor> </first_editor>
<second_editor> <second_editor>
<js_state /> <js_state />
@ -93,18 +101,63 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="QueryOrderWaitTime.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/inter/QueryOrderWaitTime.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="157">
<caret line="45" column="32" selection-start-line="45" selection-start-column="32" selection-end-line="45" selection-end-column="32" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="pushbearConf.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/pushbearConf.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="492">
<caret line="38" column="26" lean-forward="true" selection-start-line="38" selection-start-column="26" selection-end-line="38" selection-end-column="26" />
<folding>
<element signature="e#23#34#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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">
<state relative-caret-position="332">
<caret line="351" column="13" selection-start-line="351" selection-start-column="5" selection-end-line="351" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FindInProjectRecents">
<option name="RECENT_TEMPLATES"> <findStrings>
<list> <find>pushbear_conf</find>
<option value="Python Script" /> <find>5群: 948526733</find>
</list> </findStrings>
</option>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/myUrllib/httpUtils.py" />
<option value="$PROJECT_DIR$/UnitTest/TestAll.py" />
<option value="$PROJECT_DIR$/agency/cdn_utils.py" />
<option value="$PROJECT_DIR$/config/emailConf.py" />
<option value="$PROJECT_DIR$/config/ticket_config.yaml" />
<option value="$PROJECT_DIR$/init/select_ticket_info.py" />
<option value="$PROJECT_DIR$/inter/GetPassengerDTOs.py" />
<option value="$PROJECT_DIR$/config/pushbearConf.py" />
<option value="$PROJECT_DIR$/config/urlConf.py" />
<option value="$PROJECT_DIR$/README.md" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" /> <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" /> <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager"> <component name="JsGulpfileManager">
@ -131,6 +184,11 @@
<item name="12306" type="b2602c69:ProjectViewProjectNode" /> <item name="12306" type="b2602c69:ProjectViewProjectNode" />
<item name="12306" type="462c0819:PsiDirectoryNode" /> <item name="12306" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="12306" type="b2602c69:ProjectViewProjectNode" />
<item name="12306" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
@ -139,6 +197,7 @@
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="SearchEverywhereHistoryKey" value="waittime&#9;FILE&#9;file:///usr/local/py_work/12306/inter/QueryOrderWaitTime.py&#10;url&#9;FILE&#9;file:///usr/local/py_work/12306/config/urlConf.py&#10;dto&#9;FILE&#9;file:///usr/local/py_work/12306/inter/GetPassengerDTOs.py&#10;wa&#9;FILE&#9;file:///usr/local/py_work/12306/inter/QueryOrderWaitTime.py&#10;email&#9;FILE&#9;file:///usr/local/py_work/12306/config/emailConf.py" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
</component> </component>
@ -154,23 +213,111 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="Python.pushbearConf">
<configuration name="cdn_utils" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="12306" />
<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$/agency" />
<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$/agency/cdn_utils.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
</configuration>
<configuration name="pushbearConf" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="12306" />
<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$/config" />
<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$/config/pushbearConf.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
</configuration>
<configuration name="select_ticket_info" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="12306" />
<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$/init" />
<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$/init/select_ticket_info.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
</configuration>
<configuration name="Nosetests for TestAll.testAll.testLogin" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<module name="12306" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/UnitTest" />
<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="_new_regexPattern" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;TestAll.testAll.testLogin&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" />
</configuration>
<list>
<item itemvalue="Python tests.Nosetests for TestAll.testAll.testLogin" />
<item itemvalue="Python.select_ticket_info" />
<item itemvalue="Python.cdn_utils" />
<item itemvalue="Python.pushbearConf" />
</list>
<recent_temporary>
<list>
<item itemvalue="Python.pushbearConf" />
<item itemvalue="Python.cdn_utils" />
<item itemvalue="Python.select_ticket_info" />
<item itemvalue="Python tests.Nosetests for TestAll.testAll.testLogin" />
</list>
</recent_temporary>
</component>
<component name="SvnConfiguration"> <component name="SvnConfiguration">
<configuration /> <configuration />
</component> </component>
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="Default task"> <task active="true" id="Default" summary="Default task">
<changelist id="4ff88715-dd0d-4e26-8ea7-b7b28038ca10" name="Default" comment="" /> <changelist id="b0ca309c-231f-43f8-ba9d-0c954a15bfa7" name="Default" comment="" />
<created>1535103824843</created> <created>1535103824843</created>
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1535103824843</updated> <updated>1535103824843</updated>
</task> </task>
<task id="LOCAL-00001" summary="优化代码结构&#10;新增双下单方法&#10;修复一直bug"> <task id="LOCAL-00001" summary="rm idea">
<created>1535541553246</created> <created>1547461234453</created>
<option name="number" value="00001" /> <option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" /> <option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1535541553246</updated> <updated>1547461234453</updated>
</task> </task>
<task id="LOCAL-00002" summary="优化代码结构&#10;新增双下单方法&#10;修复一直bug"> <task id="LOCAL-00002" summary="优化代码结构&#10;新增双下单方法&#10;修复一直bug">
<created>1535541598180</created> <created>1535541598180</created>
@ -286,20 +433,50 @@
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TestHistory">
<history-entry file="Nosetests_for_TestAll_testAll_testLogin - 2019.01.15 at 00h 14m 50s.xml">
<configuration name="Nosetests for TestAll.testAll.testLogin" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_for_TestAll_testAll_testLogin - 2019.01.15 at 09h 45m 13s.xml">
<configuration name="Nosetests for TestAll.testAll.testLogin" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_for_TestAll_testAll_testLogin - 2019.01.15 at 09h 46m 00s.xml">
<configuration name="Nosetests for TestAll.testAll.testLogin" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_for_TestAll_testAll_testLogin - 2019.01.15 at 09h 46m 53s.xml">
<configuration name="Nosetests for TestAll.testAll.testLogin" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_for_TestAll_testAll_testLogin - 2019.01.15 at 09h 47m 52s.xml">
<configuration name="Nosetests for TestAll.testAll.testLogin" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_for_TestAll_testAll_testLogin - 2019.01.15 at 09h 54m 00s.xml">
<configuration name="Nosetests for TestAll.testAll.testLogin" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_for_TestAll_testAll_testLogin - 2019.01.15 at 09h 54m 48s.xml">
<configuration name="Nosetests for TestAll.testAll.testLogin" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_for_TestAll_testAll_testLogin - 2019.01.15 at 09h 55m 19s.xml">
<configuration name="Nosetests for TestAll.testAll.testLogin" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_for_TestAll_testAll_testLogin - 2019.01.15 at 09h 55m 52s.xml">
<configuration name="Nosetests for TestAll.testAll.testLogin" configurationId="tests" />
</history-entry>
</component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="0" /> <frame x="0" y="0" width="1440" height="900" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info anchor="bottom" id="TODO" order="6" weight="0.32969698" /> <window_info anchor="bottom" id="TODO" order="6" weight="0.32969698" />
<window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5007153" side_tool="true" weight="0.32867134" /> <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5007153" side_tool="true" weight="0.32363635" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" weight="0.42303032" /> <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.26909092" />
<window_info anchor="bottom" id="Version Control" order="7" weight="0.32447553" /> <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49928468" weight="0.32363635" />
<window_info anchor="bottom" id="Python Console" order="7" sideWeight="0.49928468" weight="0.32447553" /> <window_info anchor="bottom" id="Python Console" order="7" sideWeight="0.49928468" weight="0.32363635" />
<window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.49928468" weight="0.32484847" /> <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.49785408" weight="0.32363635" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.33547926" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.11802575" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" /> <window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Find" order="1" sideWeight="0.49928468" weight="0.32848486" />
<window_info anchor="right" id="SciView" order="3" /> <window_info anchor="right" id="SciView" order="3" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.406993" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.406993" />
@ -310,12 +487,37 @@
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32848486" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER">
<list>
<option value="0" />
<option value="1" />
<option value="2" />
<option value="3" />
</list>
</option>
</State>
</value>
</entry>
</map>
</option>
</component>
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
@ -333,20 +535,10 @@
<MESSAGE value="update readme" /> <MESSAGE value="update readme" />
<MESSAGE value="1、修改提交订单逻辑问题，感谢群里小伙伴发现&#10;2、查询接口修改" /> <MESSAGE value="1、修改提交订单逻辑问题，感谢群里小伙伴发现&#10;2、查询接口修改" />
<MESSAGE value="更新群号" /> <MESSAGE value="更新群号" />
<option name="LAST_COMMIT_MESSAGE" value="更新群号" /> <MESSAGE value="rm idea" />
<option name="LAST_COMMIT_MESSAGE" value="rm idea" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/tmp/log/2018-08-27.log" />
<entry file="file://$PROJECT_DIR$/tmp/log/2018-08-24.log" />
<entry file="file://$PROJECT_DIR$/init/SelectTicketInfoFast.py" />
<entry file="file://$PROJECT_DIR$/config/emailConf.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="49">
<caret line="8" column="13" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tmp/log/2018-08-31.log" />
<entry file="file://$PROJECT_DIR$/damatuCode/ruokuai.py"> <entry file="file://$PROJECT_DIR$/damatuCode/ruokuai.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27"> <state relative-caret-position="27">
@ -355,22 +547,8 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/agency/CdnPar.py" /> <entry file="file://$PROJECT_DIR$/agency/CdnPar.py" />
<entry file="file://$PROJECT_DIR$/agency/cdn_utils.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="232">
<caret line="34" column="11" lean-forward="true" selection-start-line="34" selection-start-column="11" selection-end-line="34" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tmp/log/2018-09-02.log" /> <entry file="file://$PROJECT_DIR$/tmp/log/2018-09-02.log" />
<entry file="file://$PROJECT_DIR$/tmp/log/2018-09-04.log" /> <entry file="file://$PROJECT_DIR$/tmp/log/2018-09-04.log" />
<entry file="file://$PROJECT_DIR$/init/login.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="117" column="32" selection-start-line="117" selection-start-column="32" selection-end-line="117" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tmp/log/2018-09-18.log" /> <entry file="file://$PROJECT_DIR$/tmp/log/2018-09-18.log" />
<entry file="file://$APPLICATION_HOME_DIR$/helpers/typeshed/stdlib/2/typing.pyi"> <entry file="file://$APPLICATION_HOME_DIR$/helpers/typeshed/stdlib/2/typing.pyi">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -451,18 +629,6 @@
</state> </state>
</provider> </provider>
</entry> </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="848">
<caret line="53" column="4" selection-start-line="53" selection-start-column="4" selection-end-line="56" selection-end-column="23" />
</first_editor>
<second_editor>
<js_state />
</second_editor>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/inter/GetRepeatSubmitToken.py"> <entry file="file://$PROJECT_DIR$/inter/GetRepeatSubmitToken.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112"> <state relative-caret-position="112">
@ -472,20 +638,6 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/tmp/log/2018-09-30.log" /> <entry file="file://$PROJECT_DIR$/tmp/log/2018-09-30.log" />
<entry file="file://$PROJECT_DIR$/tmp/log/2018-10-05.log" /> <entry file="file://$PROJECT_DIR$/tmp/log/2018-10-05.log" />
<entry file="file://$PROJECT_DIR$/myUrllib/httpUtils.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="746">
<caret line="123" column="39" lean-forward="true" selection-start-line="123" selection-start-column="39" selection-end-line="123" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/inter/CheckUser.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="33" column="67" selection-end-line="33" selection-end-column="100" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/inter/CheckRandCodeAnsyn.py"> <entry file="file://$PROJECT_DIR$/inter/CheckRandCodeAnsyn.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="32"> <state relative-caret-position="32">
@ -509,20 +661,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/init/select_ticket_info.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1184">
<caret line="104" column="36" selection-start-line="104" selection-start-column="36" selection-end-line="104" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/urlConf.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="276" column="26" selection-start-line="276" selection-start-column="26" selection-end-line="276" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tmp/log/2018-10-17.log" /> <entry file="file://$PROJECT_DIR$/tmp/log/2018-10-17.log" />
<entry file="file://$PROJECT_DIR$/inter/GetQueueCountAsync.py"> <entry file="file://$PROJECT_DIR$/inter/GetQueueCountAsync.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -538,13 +676,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/inter/GetPassengerDTOs.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="63" column="35" selection-start-line="63" selection-start-column="35" selection-end-line="63" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/inter/GetPassCodeNewOrderAndLogin.py"> <entry file="file://$PROJECT_DIR$/inter/GetPassCodeNewOrderAndLogin.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208"> <state relative-caret-position="208">
@ -573,27 +704,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/ticket_config.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192">
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/TicketEnmu.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="416">
<caret line="26" column="4" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/inter/QueryOrderWaitTime.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="48">
<caret line="34" column="122" selection-start-line="34" selection-start-column="122" selection-end-line="34" selection-end-column="122" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64"> <state relative-caret-position="64">
@ -601,5 +711,124 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/inter/CheckUser.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="339">
<caret line="32" column="47" lean-forward="true" selection-start-line="32" selection-start-column="47" selection-end-line="32" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/utils/timeUtil.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/init/login.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="469">
<caret line="100" column="8" selection-start-line="100" selection-start-column="8" selection-end-line="100" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/UnitTest/TestAll.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="61" column="29" selection-start-line="61" selection-start-column="29" selection-end-line="61" selection-end-column="29" />
<folding>
<element signature="e#15#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/inter/QueryOrderWaitTime.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="157">
<caret line="45" column="32" selection-start-line="45" selection-start-column="32" selection-end-line="45" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file:///Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/smtplib.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="1065" column="40" lean-forward="true" selection-start-line="1065" selection-start-column="40" selection-end-line="1065" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/TicketEnmu.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="26" column="4" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/myUrllib/httpUtils.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="94">
<caret line="139" column="24" lean-forward="true" selection-start-line="136" selection-start-column="16" selection-end-line="139" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/emailConf.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="36" column="22" lean-forward="true" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
</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="247">
<caret line="142" selection-start-line="142" selection-end-line="142" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/ticket_config.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-499">
<caret line="64" lean-forward="true" selection-start-line="64" selection-end-line="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/urlConf.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="332">
<caret line="351" column="13" selection-start-line="351" selection-start-column="5" selection-end-line="351" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/pushbearConf.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="492">
<caret line="38" column="26" lean-forward="true" selection-start-line="38" selection-start-column="26" selection-end-line="38" selection-end-column="26" />
<folding>
<element signature="e#23#34#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="-952">
<caret line="14" column="69" selection-start-line="14" selection-start-column="69" selection-end-line="14" selection-end-column="69" />
</first_editor>
<second_editor>
<js_state />
</second_editor>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/agency/cdn_utils.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-564">
<caret line="16" selection-start-line="16" selection-end-line="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/inter/GetPassengerDTOs.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="87" column="44" selection-start-line="87" selection-start-column="44" selection-end-line="87" selection-end-column="44" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>

7
README.md
View File

@ -11,7 +11,8 @@
- 非root用户（避免安装和运行时使用了不同环境）: sudo python2 -m pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt - 非root用户（避免安装和运行时使用了不同环境）: sudo python2 -m pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
- 项目使用说明 - 项目使用说明
- 需要配置邮箱，可以配置可以不配置，配置邮箱的格式在yaml里面可以看到ex - 可以配置邮箱，可以配置可以不配置，配置邮箱的格式在yaml里面可以看到ex
- 可以配置server酱提醒（推荐）， [配置教程] (https://www.jianshu.com/p/8d10b5b9c4e3)
- 提交订单验证码哪里依赖打码兔，所以如果是订票遇到验证码的时候，没有打码兔是过不了的，不推荐手动，手动太慢 - 提交订单验证码哪里依赖打码兔，所以如果是订票遇到验证码的时候，没有打码兔是过不了的，不推荐手动，手动太慢
- 配置yaml文件的时候，需注意空格和遵循yaml语法格式 - 配置yaml文件的时候，需注意空格和遵循yaml语法格式
@ -52,7 +53,7 @@
- 2群：649992274(已满) - 2群：649992274(已满)
- 3群：632501142(已满) - 3群：632501142(已满)
- 4群: 606340519(已满) - 4群: 606340519(已满)
- 5群: 948526733(未满) - 5群: 948526733(已满)
- 6群: 444101020(未满) - 6群: 444101020(未满)
- 7群: 660689659(未满) - 7群: 660689659(未满)
- 请不要重复加群，一个群就可以了，把机会留给更多人 - 请不要重复加群，一个群就可以了，把机会留给更多人
@ -87,7 +88,7 @@
- 测试下单接口是否可用，有两个下单接口，随便用哪个都ok - 测试下单接口是否可用，有两个下单接口，随便用哪个都ok
- 如果下载验证码过期或者下载失败的问题，应该是12306封ip的策略，多重试几次，12306现在封服务器(阿里云和腾讯云)ip比较严重，尽量不要放在服务器里面 - 如果下载验证码过期或者下载失败的问题，应该是12306封ip的策略，多重试几次，12306现在封服务器(阿里云和腾讯云)ip比较严重，尽量不要放在服务器里面
- 目前12306对服务器ip比较敏感，大家还是在自己家里挂着吧 - 目前12306对服务器ip比较敏感，大家还是在自己家里挂着吧
- 如果想使用此项目的gui版本，请加群，目前只有mac版本 - 如果想使用此项目的gui版本，请加群，windows的没问题，mac还有兼容问题
- 感谢一下小伙伴对本项目提供的帮助 - 感谢一下小伙伴对本项目提供的帮助
- @sun7127@126.com - @sun7127@126.com
- @ 才 - @ 才

6
Update.md
View File

@ -137,3 +137,9 @@
- 2019.01.12更新 - 2019.01.12更新
- 增加对python3语法的支持 - 增加对python3语法的支持
- 删除校验时间很多机器不兼容的问题（win10会阻拦对时功能，导致大面积报错），如果是预售，为了不耽误宝贵的时间，请手动对时 - 删除校验时间很多机器不兼容的问题（win10会阻拦对时功能，导致大面积报错），如果是预售，为了不耽误宝贵的时间，请手动对时
- 2019.01.15更新
- 删除敏感信息打印
- 增加server酱推送购票成功通知
- 修改11点都登录消耗快豆问题
-

9
config/emailConf.py
View File

@ -1,4 +1,6 @@
# -*- coding: utf8 -*- # -*- coding: utf8 -*-
import socket
__author__ = 'MR.wen' __author__ = 'MR.wen'
from email.header import Header from email.header import Header
from email.mime.text import MIMEText from email.mime.text import MIMEText
@ -29,7 +31,12 @@ def sendEmail(msg):
msg['From'] = sender msg['From'] = sender
msg['To'] = receiver msg['To'] = receiver
smtp = smtplib.SMTP_SSL() try:
smtp = smtplib.SMTP_SSL()
smtp.connect(host)
except socket.error:
smtp = smtplib.SMTP()
smtp.connect(host)
smtp.connect(host) smtp.connect(host)
smtp.login(username, password) smtp.login(username, password)
smtp.sendmail(sender, receiver.split(","), msg.as_string()) smtp.sendmail(sender, receiver.split(","), msg.as_string())

20
config/pushbearConf.py
View File

@ -1,10 +1,14 @@
# -*- coding: utf8 -*- # -*- coding: utf8 -*-
__author__ = 'kongkongyzt' import time
import requests import requests
from config.ticketConf import _get_yaml from config.ticketConf import _get_yaml
from config.urlConf import urls
from myUrllib.httpUtils import HTTPClient
PUSH_BEAR_API_PATH = "https://pushbear.ftqq.com/sub" PUSH_BEAR_API_PATH = "https://pushbear.ftqq.com/sub"
def sendPushBear(msg): def sendPushBear(msg):
""" """
pushBear微信通知 pushBear微信通知
@ -14,8 +18,18 @@ def sendPushBear(msg):
conf = _get_yaml() conf = _get_yaml()
if conf["pushbear_conf"]["is_pushbear"] and conf["pushbear_conf"]["send_key"].strip() != "": if conf["pushbear_conf"]["is_pushbear"] and conf["pushbear_conf"]["send_key"].strip() != "":
try: try:
requests.get("{}?sendkey={}&text=来自12306抢票助手的通知&desp={}".format(PUSH_BEAR_API_PATH, conf["pushbear_conf"]["send_key"].strip(), msg)) sendPushBearUrls = urls.get("Pushbear")
print(u"已下发 pushbear 微信通知, 请查收") data = {
"sendkey": conf["pushbear_conf"]["send_key"].strip(),
"text": "易行购票成功通知-{}".format(time.strftime("%F %T")),
"desp": msg
}
httpClint = HTTPClient(0)
sendPushBeaRsp = httpClint.send(sendPushBearUrls, data=data)
if sendPushBeaRsp.get("code") is 0:
print(u"已下发 pushbear 微信通知, 请查收")
else:
print(sendPushBeaRsp)
except Exception as e: except Exception as e:
print(u"pushbear 配置有误 {}".format(e)) print(u"pushbear 配置有误 {}".format(e))
else: else:

6
init/select_ticket_info.py
View File

@ -100,7 +100,7 @@ class select:
u" 2群：649992274(已满)\n" u" 2群：649992274(已满)\n"
u" 3群：632501142(已满)\n" u" 3群：632501142(已满)\n"
u" 4群: 606340519(已满)\n" u" 4群: 606340519(已满)\n"
u" 5群: 948526733(未满)\n" u" 5群: 948526733(已满)\n"
u" 6群: 444101020(未满)\n" u" 6群: 444101020(未满)\n"
u" 7群: 660689659(未满)\n" u" 7群: 660689659(未满)\n"
) )
@ -160,6 +160,7 @@ class select:
if auth: if auth:
return self.login.auth() return self.login.auth()
else: else:
configCommon.checkSleepTime(self) # 防止网上启动晚上到点休眠
self.login.go_login() self.login.go_login()
def cdn_req(self, cdn): def cdn_req(self, cdn):
@ -326,5 +327,4 @@ class select:
if __name__ == '__main__': if __name__ == '__main__':
s = select() s = select()
cdn = CDNProxy().open_cdn_file() cdn = s.station_table("长沙", "深圳")
s.cdn_req(cdn)

2
myUrllib/httpUtils.py
View File

@ -11,7 +11,7 @@ from config import logger
def _set_header_default(): def _set_header_default():
header_dict = OrderedDict() header_dict = OrderedDict()
header_dict["Accept"] = "application/json, text/plain, */*" # header_dict["Accept"] = "application/json, text/plain, */*"
header_dict["Accept-Encoding"] = "gzip, deflate" header_dict["Accept-Encoding"] = "gzip, deflate"
header_dict[ header_dict[
"User-Agent"] = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) 12306-electron/1.0.1 Chrome/59.0.3071.115 Electron/1.8.4 Safari/537.36" "User-Agent"] = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) 12306-electron/1.0.1 Chrome/59.0.3071.115 Electron/1.8.4 Safari/537.36"