From 6b849c1201b97448bfd3c0b8def06a1f9e2310a7 Mon Sep 17 00:00:00 2001 From: wenxianping <931128603@qq.com> Date: Wed, 29 Aug 2018 19:19:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84=20=E6=96=B0=E5=A2=9E=E5=8F=8C=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E7=9B=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/12306.iml | 5 +- .idea/12306login.iml | 11 - .idea/codeStyleSettings.xml | 14 - .idea/dictionaries/wenxianping.xml | 3 - .idea/inspectionProfiles/Project_Default.xml | 49 +- .../inspectionProfiles/profiles_settings.xml | 7 - .idea/misc.xml | 5 +- .idea/workspace.xml | 1810 ++++------------- README.md | 166 +- Update.md | 118 ++ config/TicketEnmu.py | 5 + config/ticketConf.py | 17 +- config/ticket_config.yaml | 114 +- config/urlConf.py | 4 +- init/SelectTicketInfoFast.py | 292 --- init/login.py | 150 +- init/select_ticket_info.py | 771 ++----- inter/AutoSubmitOrderRequest.py | 74 +- inter/CheckOrderInfo.py | 73 + inter/CheckRandCodeAnsyn.py | 27 + inter/CheckUser.py | 33 + inter/ConfirmSingleForQueue.py | 96 + inter/ConfirmSingleForQueueAsys.py | 14 +- inter/GetPassCodeNewOrderAndLogin.py | 22 + inter/GetPassengerDTOs.py | 3 +- inter/GetQueueCount.py | 109 + inter/GetQueueCountAsync.py | 59 +- inter/GetRandCode.py | 79 + inter/GetRepeatSubmitToken.py | 36 + inter/Query.py | 40 +- inter/QueryOrderWaitTime.py | 3 +- inter/SubmitOrderRequest.py | 69 + myUrllib/MySocketUtils.py | 202 ++ myUrllib/httpUtils.py | 78 +- requirements.txt | 3 +- run.py | 14 +- 36 files changed, 1686 insertions(+), 2889 deletions(-) delete mode 100644 .idea/12306login.iml delete mode 100644 .idea/codeStyleSettings.xml delete mode 100755 .idea/dictionaries/wenxianping.xml delete mode 100755 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 Update.md delete mode 100755 init/SelectTicketInfoFast.py create mode 100644 inter/CheckOrderInfo.py create mode 100644 inter/CheckRandCodeAnsyn.py create mode 100644 inter/CheckUser.py create mode 100644 inter/ConfirmSingleForQueue.py create mode 100644 inter/GetPassCodeNewOrderAndLogin.py create mode 100644 inter/GetQueueCount.py create mode 100644 inter/GetRandCode.py create mode 100644 inter/GetRepeatSubmitToken.py create mode 100644 inter/SubmitOrderRequest.py create mode 100644 myUrllib/MySocketUtils.py diff --git a/.idea/12306.iml b/.idea/12306.iml index 774d532..3ae6b30 100644 --- a/.idea/12306.iml +++ b/.idea/12306.iml @@ -2,10 +2,11 @@ - + - \ No newline at end of file diff --git a/.idea/12306login.iml b/.idea/12306login.iml deleted file mode 100644 index 774d532..0000000 --- a/.idea/12306login.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index ffd7416..0000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/dictionaries/wenxianping.xml b/.idea/dictionaries/wenxianping.xml deleted file mode 100755 index 3891a03..0000000 --- a/.idea/dictionaries/wenxianping.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 2be4900..36e6057 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,10 +1,49 @@ \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100755 index c23ecac..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 0ed3b43..1842d96 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,7 @@ - + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 74336b6..808810c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,24 +1,51 @@ - -<<<<<<< Updated upstream - - - - - - - -======= - - - - - ->>>>>>> Stashed changes - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - -<<<<<<< Updated upstream - -======= - ->>>>>>> Stashed changes - - - - - - - - -<<<<<<< Updated upstream - -======= - ->>>>>>> Stashed changes - - - - - - - + - - + + -<<<<<<< Updated upstream - - -======= - - ->>>>>>> Stashed changes - - - + + -<<<<<<< Updated upstream - - + + - - - -======= - - - - - - - - + + - - - - - ->>>>>>> Stashed changes - - - - - - - -<<<<<<< Updated upstream - - - - - -======= - - - ->>>>>>> Stashed changes - - - - -<<<<<<< Updated upstream - - - - - - - - -======= - - - - - - ->>>>>>> Stashed changes - - - - -<<<<<<< Updated upstream - - - - - - -======= - - + + - - - + + ->>>>>>> Stashed changes + + + + + + + -<<<<<<< Updated upstream - - -======= - - ->>>>>>> Stashed changes - - - - - - - - -<<<<<<< Updated upstream - - - - - -======= - - - ->>>>>>> Stashed changes - - - - - - - -<<<<<<< Updated upstream - - -======= - - ->>>>>>> Stashed changes - - - - - - - - - - - -<<<<<<< Updated upstream - -======= - ->>>>>>> Stashed changes - + + @@ -246,142 +118,67 @@ -<<<<<<< Updated upstream - 该车次小于上次提交时间 - 学生票 - checkRandCodeAnsyn + dto + get_passengerDTOs + passengerTicketStr + left_ticket_init + is_aotu_code + aotu_code_type + self.urlConf + self.httpClint + user_time + is_check_user + 加入小黑屋 + _get_yaml + 小黑 + sendConfirmSingleForQueueAsys + flo + unquote + confirmSingleForQueueAsys + getQueueCountAsync + is_more_ticket + damatu select_refresh_interval - checkOrderInfoUrl - passenger - checkOrderInfo - resultOrderForDcQueue - expect_refresh_interval - validateMessages - submitOrderRequest - initdc_url - confirmSingleForQueue - initDc - secretStr - time - state - autoSubmitOrderRequest - checkQueueOrderUrl - map - cdn_list - req_url - func - is_logger - is_logg - 超时 - 118.180.15.113 - checku - {u'status': True, u'validateMessagesShowId': u'_validatorMessage', u'messages': [], u'httpstatus': 200, u'validateMessages': {}, u'data': {u'flag': False}} - init -======= - expect_refresh_interval - validateMessages - submitOrderRequest - initdc_url - confirmSingleForQueue - initDc - secretStr - time - state - autoSubmitOrderRequest - checkQueueOrderUrl - map - cdn_list - req_url - func - is_logger - is_logg - 超时 - 118.180.15.113 - checku - {u'status': True, u'validateMessagesShowId': u'_validatorMessage', u'messages': [], u'httpstatus': 200, u'validateMessages': {}, u'data': {u'flag': False}} - threading - init - 下载验证码成功 - 正在获取cookie - 获取 - loginInit - check - checkRandCodeAnsyn - select_url ->>>>>>> Stashed changes + wap + 小黑屋 + + is_auto_code + auto_code_type + self.session.urls + self.session.httpClint + - @@ -391,33 +188,19 @@ true DEFINITION_ORDER - -