From d1be6833bb3fe1068f4f598027e2387518ce48c4 Mon Sep 17 00:00:00 2001
From: wenxianping <931128603@qq.com>
Date: Sun, 14 Jan 2018 14:07:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A9=E4=B8=8A7=E7=82=B9?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E7=A5=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                  | 7 +++++++
 init/select_ticket_info.py | 7 +++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 696a08c..6922646 100644
--- a/README.md
+++ b/README.md
@@ -107,4 +107,11 @@
     #host: 邮箱地址
     ```
 
+- 2018.1.14更新
+    - 优化订票流程
+    - 优化挂机功能
+        - 修改之前程序到11点自动跳出功能，现在修改为到早上7点自动开启刷票
+        - 需要开启打码兔代码功能，is_aotu_code 设置为True
+    - 增加异常判断
+
 
diff --git a/init/select_ticket_info.py b/init/select_ticket_info.py
index 69186c8..074fb1f 100644
--- a/init/select_ticket_info.py
+++ b/init/select_ticket_info.py
@@ -9,10 +9,12 @@ import urllib
 import sys
 import time
 from collections import OrderedDict
+from init import login
 
 from config.emailConf import sendEmail
 from config.ticketConf import _get_yaml
 from damatuCode.damatuWeb import DamatuApi
+from init.login import login
 from myException.PassengerUserException import PassengerUserException
 from myException.ticketConfigException import ticketConfigException
 from myException.ticketIsExitsException import ticketIsExitsException
@@ -611,8 +613,9 @@ class select:
                 num += 1
                 time.sleep(self.select_refresh_interval)
                 if time.strftime('%H:%M:%S', time.localtime(time.time())) > "23:00:00":
-                    print "12306休息时间，本程序自动停止,明天早上七点运行"
-                    break
+                    print "12306休息时间，本程序自动停止,明天早上七点将自动运行"
+                    time.sleep(28800)
+                    login.main()   # 重新登录
                 start_time = datetime.datetime.now()
                 self.submitOrderRequestImplement(from_station, to_station)
                 print "正在第{0}次查询  乘车日期: {1}  车次{2} 查询无票  代理设置 无  总耗时{3}ms".format(num, self.station_date, ",".join(self.station_trains), (datetime.datetime.now()-start_time).microseconds/1000)