From 192d5652eff84d09458200f67ca53370628c8f4b Mon Sep 17 00:00:00 2001
From: unknown <2521381713@qq.com>
Date: Wed, 17 Jul 2019 14:47:36 +0800
Subject: [PATCH 1/2] first commit

---
 .idea/workspace.xml                           | 223 ++++++------------
 .../__pycache__/check.cpython-36.pyc          | Bin 490 -> 482 bytes
 .../__pycache__/station.cpython-36.pyc        | Bin 97395 -> 97387 bytes
 .../__pycache__/ticketInquiry.cpython-36.pyc  | Bin 2969 -> 2961 bytes
 ticketInquiry/search.py                       |   9 +-
 ticketInquiry/station.py                      |  12 +-
 6 files changed, 86 insertions(+), 158 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 69a324e..8852e6f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="466c32b9-0686-4bc9-97e8-7fa9340f3c3e" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/ticketInquiry/ticketInquiry.py" afterPath="$PROJECT_DIR$/ticketInquiry/ticketInquiry.py" />
+      <change beforePath="$PROJECT_DIR$/ticketInquiry/search.py" beforeDir="false" afterPath="$PROJECT_DIR$/ticketInquiry/search.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ticketInquiry/station.py" beforeDir="false" afterPath="$PROJECT_DIR$/ticketInquiry/station.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -17,11 +17,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="search.py" pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/ticketInquiry/search.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
+            <state relative-caret-position="76">
+              <caret line="4" column="9" lean-forward="true" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
               <folding>
                 <element signature="e#141#167#0" expanded="true" />
               </folding>
@@ -29,11 +29,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ticketInquiry.py" pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/ticketInquiry/ticketInquiry.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="280">
-              <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+            <state relative-caret-position="190">
+              <caret line="14" selection-start-line="14" selection-end-line="14" />
               <folding>
                 <element signature="e#154#169#0" expanded="true" />
               </folding>
@@ -41,11 +41,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="check.py" pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/ticketInquiry/check.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="400">
-              <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
+            <state relative-caret-position="361">
+              <caret line="21" selection-start-line="21" selection-end-line="21" />
               <folding>
                 <element signature="e#146#161#0" expanded="true" />
               </folding>
@@ -53,12 +53,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="station.py" pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/ticketInquiry/station.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2240">
-              <caret line="30" column="19" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" />
-              <folding />
+            <state relative-caret-position="437">
+              <caret line="23" column="37" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" />
             </state>
           </provider>
         </entry>
@@ -81,18 +80,12 @@
         <option value="$PROJECT_DIR$/search/search.py" />
         <option value="$PROJECT_DIR$/ticketInquiry/city.py" />
         <option value="$PROJECT_DIR$/ticketInquiry/check.py" />
-        <option value="$PROJECT_DIR$/ticketInquiry/station.py" />
-        <option value="$PROJECT_DIR$/ticketInquiry/search.py" />
         <option value="$PROJECT_DIR$/ticketInquiry/ticketInquiry.py" />
+        <option value="$PROJECT_DIR$/ticketInquiry/search.py" />
+        <option value="$PROJECT_DIR$/ticketInquiry/station.py" />
       </list>
     </option>
   </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="250" />
     <option name="y" value="67" />
@@ -101,20 +94,11 @@
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
+    <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -131,13 +115,12 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -153,6 +136,7 @@
   </component>
   <component name="RunManager" selected="Python.search">
     <configuration name="search" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="py12306" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -163,15 +147,18 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="py12306" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/ticketInquiry/search.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
     </configuration>
     <configuration name="station" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="py12306" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
@@ -182,28 +169,27 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="py12306" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/ticketInquiry/station.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
     </configuration>
-    <list size="2">
-      <item index="0" class="java.lang.String" itemvalue="Python.station" />
-      <item index="1" class="java.lang.String" itemvalue="Python.search" />
+    <list>
+      <item itemvalue="Python.station" />
+      <item itemvalue="Python.search" />
     </list>
     <recent_temporary>
-      <list size="2">
-        <item index="0" class="java.lang.String" itemvalue="Python.search" />
-        <item index="1" class="java.lang.String" itemvalue="Python.station" />
+      <list>
+        <item itemvalue="Python.search" />
+        <item itemvalue="Python.station" />
       </list>
     </recent_temporary>
   </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -214,111 +200,63 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1562119668202</updated>
+      <workItem from="1563344838851" duration="1134000" />
     </task>
     <servers />
   </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="1134000" />
+  </component>
   <component name="ToolWindowManager">
-    <frame x="67" y="27" width="1853" height="1053" extended-state="6" />
-    <editor active="true" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <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="6" 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.33" sideWeight="0.5" order="7" 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.33" sideWeight="0.5" order="7" 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.33" sideWeight="0.5" order="7" 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.2857143" sideWeight="0.5" order="2" 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.33" sideWeight="0.5" order="7" 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.2252352" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <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="SciView" 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="Structure" active="false" anchor="left" 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" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" 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.3990025" 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="4" 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" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <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="5" side_tool="false" 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" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917705" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <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" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22761194" />
+      <window_info id="Structure" order="1" weight="0.25" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Database Changes" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32917705" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.28524947" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3990025" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Python Console" order="11" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="SciView" order="3" />
+      <window_info anchor="right" id="Database" order="4" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="4" />
-    </breakpoint-manager>
-    <watches-manager />
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/py12306$search.coverage" NAME="search Coverage Results" MODIFIED="1563345927151" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/ticketInquiry" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/ticketInquiry/search.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>
-            <element signature="e#141#167#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file:///usr/lib/python3.6/re.py" />
+    <entry file="file://$USER_HOME$/.virtualenvs/py12306/lib/python3.6/site-packages/urllib3/response.py" />
+    <entry file="file:///usr/lib/python3.6/sre_compile.py" />
     <entry file="file://$PROJECT_DIR$/ticketInquiry/ticketInquiry.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1680">
-          <caret line="88" column="50" lean-forward="false" selection-start-line="88" selection-start-column="50" selection-end-line="88" selection-end-column="50" />
+        <state relative-caret-position="190">
+          <caret line="14" selection-start-line="14" selection-end-line="14" />
           <folding>
             <element signature="e#154#169#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/ticketInquiry/station.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2240">
-          <caret line="30" column="19" lean-forward="true" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/ticketInquiry/check.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
-          <folding>
-            <element signature="e#146#161#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/lib/python3.6/re.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="181" column="0" lean-forward="false" selection-start-line="181" selection-start-column="0" selection-end-line="181" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.virtualenvs/py12306/lib/python3.6/site-packages/urllib3/response.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="586" column="0" lean-forward="false" selection-start-line="586" selection-start-column="0" selection-end-line="586" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/lib/python3.6/sre_compile.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="559" column="0" lean-forward="false" selection-start-line="559" selection-start-column="0" selection-end-line="559" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/ticketInquiry/check.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
+        <state relative-caret-position="361">
+          <caret line="21" selection-start-line="21" selection-end-line="21" />
           <folding>
             <element signature="e#146#161#0" expanded="true" />
           </folding>
@@ -327,26 +265,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/ticketInquiry/station.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2240">
-          <caret line="30" column="19" lean-forward="false" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="19" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/ticketInquiry/ticketInquiry.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
-          <folding>
-            <element signature="e#154#169#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="437">
+          <caret line="23" column="37" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/ticketInquiry/search.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
+        <state relative-caret-position="76">
+          <caret line="4" column="9" lean-forward="true" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
           <folding>
             <element signature="e#141#167#0" expanded="true" />
           </folding>
diff --git a/ticketInquiry/__pycache__/check.cpython-36.pyc b/ticketInquiry/__pycache__/check.cpython-36.pyc
index 53a77e633f4edfde7d7694e35db7f6bcfd6c8fc2..9ce88be574504274d54456c6b75092cad3970e64 100644
GIT binary patch
delta 64
zcmaFG{D_&;n3tE!VYXgu|3*$bMoj}ZtC)bI{H)aEl9+<Zl8pR3AZ2J|Y+x2sl9`;H
STH={kSejW>88f+pu?PU6j20IF

delta 72
zcmaFF{EC^=n3tDJBUUE1cq6ABqoIX<Mt*LpesNKben4e%Mq*KJKv8~HYH~@jenF+7
bk+Ff9eo1C>c4~=dUSVlwQKkOm0>&Z$H<cI&

diff --git a/ticketInquiry/__pycache__/station.cpython-36.pyc b/ticketInquiry/__pycache__/station.cpython-36.pyc
index b3b95283346ad84a56f5b40382cdca2b7b5a296f..585e2c10a0b5dcf59a0b087e11b0cb5103d905e9 100644
GIT binary patch
delta 174
zcmezTgZ1?fRxV>+UM{vHda+Ekja*x~7%x>>-C{2;Ni50C&s)h*#LmFL@XN@}Dkh*P
zKPxr4B&MLUBqKi$NEsR#8<@qEWF}{)mU!kBmSz@J#!OePX4GNioE}ik7%vsY12rZ-
yFEKY2Y!Zavn0}<1F-DUMX!I?{%v-F*B}JJ9MVvrx5jThc*@;AOO!ur|)B*tSOEYQ!

delta 187
zcmaF;gZ1+dRxV>+UM`JTnb=1)ja*x~7%x@1NAVPwB$j06=f&qG=BBP>C}Lw^VEARF
zpOK%Ns$X1`qaRS2oRL_R8&H&=m6}{qtY1)RXk=_)reBhooSj<YnO9hvSyZV%U96f>
zhmm7?LlvXx^onXmEzw)-P=moHLJ0Qhd#V{@G&zA*++xhU#adialvz;30pu2Og9wn_
MNCf+I#~Ma008w8!0RR91

diff --git a/ticketInquiry/__pycache__/ticketInquiry.cpython-36.pyc b/ticketInquiry/__pycache__/ticketInquiry.cpython-36.pyc
index fe0bca7c9b8a1ffc3fafff37db91d1c3b76500ff..0f571fe9de2bc2d145962902739eab3d2e4186f1 100644
GIT binary patch
delta 85
zcmbO!K2e;@n3tE!VYXgu9N$K+0!B>>H>;R{qWrAX<dT?z%94!yJRoIgWNcs-Q<9mS
oom%3VS6G@^R2j2*HRD%y##@^gat1OoT2KDWmBVN;If2^}0F$L0#Q*>R

delta 97
zcmbOzK2w~_n3tDJG({%%AMZx40!Bjz{fzwFRQ=+j9Q}aG<c!3k+<>C|tkmR^V*P?j
zLnC7YGyRgx<m}WE&%DCY%%V#D&5IeovNJ|)p2-==$Y?b=mRo!>6L%=1`Q!+0O91S;
B9^L=|

diff --git a/ticketInquiry/search.py b/ticketInquiry/search.py
index 5df5355..afe8760 100644
--- a/ticketInquiry/search.py
+++ b/ticketInquiry/search.py
@@ -8,12 +8,13 @@
 import ticketInquiry as ti
 import station as sta
 # 出发地
-from_station = sta.set_station_name('北京')
-
+#_from = input("请输入始发站：")
+from_station = sta.set_station_name(input("请输入始发站："))
 # 目的地
-to_station = sta.set_station_name('武汉')
+#_to = input("请输入到达站：")
+to_station = sta.set_station_name(input("请输入到达站："))
 
 # 出发时间
-train_date = '2019-07-03'
+train_date = input("请输入出发日期(XX-XX—XX)：")
 search = ti.TicketInquiry(train_date,from_station,to_station)
 print(search.print_ticket())
\ No newline at end of file
diff --git a/ticketInquiry/station.py b/ticketInquiry/station.py
index 41bcafa..1b6b6d0 100644
--- a/ticketInquiry/station.py
+++ b/ticketInquiry/station.py
@@ -19,15 +19,15 @@
 # print(station_dict)
 
 
-def get_station_name(station_name):
-    if station_name in station_dict_1:
-        return station_dict_1[station_name]
+def get_station_name(station):
+    if station in station_dict_1:
+        return station_dict_1[station]
     return "站点名错误"
 
 
-def set_station_name(station):
-    if station in station_dict_2:
-        return station_dict_2[station]
+def set_station_name(station_name):
+    if station_name in station_dict_2:
+        return station_dict_2[station_name]
     return "站点代码错误"
 
 # print(get_station('BOP'))
\ No newline at end of file

From cc66b25d0f675dd416a535b1f564d032040d47e7 Mon Sep 17 00:00:00 2001
From: duoni <2521381713@qq.com>
Date: Mon, 29 Jul 2019 23:11:40 +0800
Subject: [PATCH 2/2] login

---
 .idea/workspace.xml     | 81 +++++++++++++++++++++++++++--------------
 login/login.py          | 72 ++++++++++++++++++++++++++++++++++++
 ticketInquiry/search.py |  2 +-
 3 files changed, 126 insertions(+), 29 deletions(-)
 create mode 100644 login/login.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8852e6f..5ec2156 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="466c32b9-0686-4bc9-97e8-7fa9340f3c3e" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/login/login.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ticketInquiry/search.py" beforeDir="false" afterPath="$PROJECT_DIR$/ticketInquiry/search.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ticketInquiry/station.py" beforeDir="false" afterPath="$PROJECT_DIR$/ticketInquiry/station.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -17,11 +18,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/ticketInquiry/search.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="76">
-              <caret line="4" column="9" lean-forward="true" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
+            <state relative-caret-position="361">
+              <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
               <folding>
                 <element signature="e#141#167#0" expanded="true" />
               </folding>
@@ -29,11 +30,23 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/login/login.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1045">
+              <caret line="58" column="4" selection-start-line="58" selection-start-column="4" selection-end-line="58" selection-end-column="4" />
+              <folding>
+                <element signature="e#0#21#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/ticketInquiry/ticketInquiry.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="190">
-              <caret line="14" selection-start-line="14" selection-end-line="14" />
+            <state relative-caret-position="494">
+              <caret line="78" column="41" lean-forward="true" selection-start-line="78" selection-start-column="41" selection-end-line="78" selection-end-column="41" />
               <folding>
                 <element signature="e#154#169#0" expanded="true" />
               </folding>
@@ -44,7 +57,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/ticketInquiry/check.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="361">
+            <state relative-caret-position="399">
               <caret line="21" selection-start-line="21" selection-end-line="21" />
               <folding>
                 <element signature="e#146#161#0" expanded="true" />
@@ -81,16 +94,17 @@
         <option value="$PROJECT_DIR$/ticketInquiry/city.py" />
         <option value="$PROJECT_DIR$/ticketInquiry/check.py" />
         <option value="$PROJECT_DIR$/ticketInquiry/ticketInquiry.py" />
-        <option value="$PROJECT_DIR$/ticketInquiry/search.py" />
         <option value="$PROJECT_DIR$/ticketInquiry/station.py" />
+        <option value="$PROJECT_DIR$/ticketInquiry/search.py" />
+        <option value="$PROJECT_DIR$/login/login.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="250" />
-    <option name="y" value="67" />
-    <option name="width" value="1654" />
-    <option name="height" value="929" />
+    <option name="y" value="66" />
+    <option name="width" value="1655" />
+    <option name="height" value="930" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -201,19 +215,19 @@
       <option name="presentableId" value="Default" />
       <updated>1562119668202</updated>
       <workItem from="1563344838851" duration="1134000" />
+      <workItem from="1564400927718" duration="8869000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1134000" />
+    <option name="totallyTimeSpent" value="10003000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22761194" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.230563" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Database Changes" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32917705" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.28524947" />
@@ -226,6 +240,7 @@
       <window_info anchor="bottom" id="Terminal" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
       <window_info anchor="bottom" id="Python Console" order="11" />
+      <window_info anchor="bottom" id="Database Changes" order="12" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -243,19 +258,9 @@
     <entry file="file:///usr/lib/python3.6/re.py" />
     <entry file="file://$USER_HOME$/.virtualenvs/py12306/lib/python3.6/site-packages/urllib3/response.py" />
     <entry file="file:///usr/lib/python3.6/sre_compile.py" />
-    <entry file="file://$PROJECT_DIR$/ticketInquiry/ticketInquiry.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="14" selection-start-line="14" selection-end-line="14" />
-          <folding>
-            <element signature="e#154#169#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/ticketInquiry/check.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="361">
+        <state relative-caret-position="399">
           <caret line="21" selection-start-line="21" selection-end-line="21" />
           <folding>
             <element signature="e#146#161#0" expanded="true" />
@@ -270,15 +275,35 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/ticketInquiry/ticketInquiry.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="78" column="41" lean-forward="true" selection-start-line="78" selection-start-column="41" selection-end-line="78" selection-end-column="41" />
+          <folding>
+            <element signature="e#154#169#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/ticketInquiry/search.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="4" column="9" lean-forward="true" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
+        <state relative-caret-position="361">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
           <folding>
             <element signature="e#141#167#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/login/login.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1045">
+          <caret line="58" column="4" selection-start-line="58" selection-start-column="4" selection-end-line="58" selection-end-column="4" />
+          <folding>
+            <element signature="e#0#21#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/login/login.py b/login/login.py
new file mode 100644
index 0000000..3dbc3f3
--- /dev/null
+++ b/login/login.py
@@ -0,0 +1,72 @@
+from PIL import Image
+import requests
+from json import loads
+class Login(object):
+
+    def __init__(self):
+        self.headers = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+                                    "Chrome/75.0.3770.142 Safari/537.36"}
+        self.session = requests.session()
+
+    def get_img(self):
+        url = "https://kyfw.12306.cn/passport/captcha/captcha-image?login_site=E&module=login&rand=sjrand"
+        reponse = self.session.get(url=url, headers=self.headers, verify=False)
+        with open('img.jpg','wp') as f
+            f.write(reponse.content)
+        im = Image.open('img.jpg')
+        im.show()
+        im.close()
+        _answer = input("请输入验证码位置（以，隔开）：")
+        return _answer
+
+    def captcha_answer(self,_answer):
+        use_ans = _answer.split(',')
+        true_ans = ['35,35','105,35','175,35','245,35','35,105','105,105','175,105','245,105']
+        use_ans_list = []
+        for item in use_ans:
+            use_ans_list.append(true_ans[int(item)])
+        use_ans_list_str = ','.join(use_ans_list)
+        return use_ans_list_str
+
+    def captcha_check(self, captcha_answer):
+        checkurl = "https: // kyfw.12306.cn/passport/captcha/captcha-check?rand=sjrand&login_site =E&answer =" \
+                   + captcha_answer.unicode()
+        cont = self.session.get(url=checkurl, headers=self.headers, verify=False)
+        dic = loads(cont.content.decode())
+        answer_code = dic['result_code']
+        if answer_code == 4:
+            return True
+        else:
+            return False
+
+    def login(self,captcha_answer):
+        user_name = input("请输入用户名：")
+        password = input("请输入密码:")
+        loginurl = "https://kyfw.12306.cn/passport/web/login"
+        date = {
+            'username':user_name,
+            'password':password,
+            'appid':'otn',
+            'answer':captcha_answer,
+           }
+        result = self.session.post(url=loginurl, headers=self.headers, date=date, verify=False)
+        get_result = loads(result.content.decode())
+        fin_result = get_result['result_message']
+        if fin_result == "登陆成功":
+            print("恭喜登陆成功")
+        else:
+            print("登陆失败")
+    if _name_ == '_main_':
+        login = Login()
+        img = get_img(login)
+        answer = captcha_answer(img)
+        chek = False
+        while not chek:
+            chek = captcha_check(answer)
+            if chek:
+                print("验证通过")
+            else:
+                print("验证失败")
+        Login.login()
+
+
diff --git a/ticketInquiry/search.py b/ticketInquiry/search.py
index afe8760..ac5ab28 100644
--- a/ticketInquiry/search.py
+++ b/ticketInquiry/search.py
@@ -16,5 +16,5 @@
 
 # 出发时间
 train_date = input("请输入出发日期(XX-XX—XX)：")
-search = ti.TicketInquiry(train_date,from_station,to_station)
+search = ti.TicketInquiry(train_date, from_station, to_station)
 print(search.print_ticket())
\ No newline at end of file