From c2cf3ef79cb682e14090c9cd318671d9dc597df0 Mon Sep 17 00:00:00 2001 From: Jalin Date: Fri, 18 Jan 2019 20:17:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E9=98=9F=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9B=B4=E6=8E=A5=E7=BB=93=E6=9D=9F=E6=8E=92=E9=98=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- py12306/helpers/cdn.py | 2 +- py12306/order/order.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/py12306/helpers/cdn.py b/py12306/helpers/cdn.py index 8777b73..958121e 100644 --- a/py12306/helpers/cdn.py +++ b/py12306/helpers/cdn.py @@ -66,7 +66,7 @@ class Cdn: pass def start(self): - if not Config.is_cdn_enabled() or Config().is_slave(): return + if not Config.is_cdn_enabled(): return self.load_items() CommonLog.add_quick_log(CommonLog.MESSAGE_CDN_START_TO_CHECK.format(len(self.items))).flush() self.restore_items() diff --git a/py12306/order/order.py b/py12306/order/order.py index 028f460..c6ead0d 100644 --- a/py12306/order/order.py +++ b/py12306/order/order.py @@ -379,10 +379,12 @@ class Order: if wait_time == -2 or wait_time == -3: # -2 失败 -3 订单已撤销 OrderLog.add_quick_log( OrderLog.MESSAGE_QUERY_ORDER_WAIT_TIME_FAIL.format(result_data.get('msg'))).flush() + return False else: # 未知原因 OrderLog.add_quick_log( OrderLog.MESSAGE_QUERY_ORDER_WAIT_TIME_FAIL.format( result_data.get('msg', wait_time))).flush() + return False elif result_data.get('msg'): # 失败 对不起，由于您取消次数过多，今日将不能继续受理您的订票请求。1月8日您可继续使用订票功能。 # TODO 需要增加判断 直接结束 @@ -394,6 +396,7 @@ class Order: elif result.get('messages') or result.get('validateMessages'): OrderLog.add_quick_log(OrderLog.MESSAGE_QUERY_ORDER_WAIT_TIME_FAIL.format( result.get('messages', result.get('validateMessages')))).flush() + return False else: pass OrderLog.add_quick_log(OrderLog.MESSAGE_QUERY_ORDER_WAIT_TIME_INFO.format(self.queue_num)).flush()