From 68445e1913ba34a91f20e18f7768576b598e10f5 Mon Sep 17 00:00:00 2001
From: Jalin <admin@pjialin.com>
Date: Fri, 25 Jan 2019 14:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=81=9C=E7=95=99=E9=97=B4?=
 =?UTF-8?q?=E9=9A=94=EF=BC=8C=E5=BE=AA=E7=8E=AF=E8=8E=B7=E5=8F=96=E4=B9=98?=
 =?UTF-8?q?=E5=AE=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 py12306/order/order.py | 6 ++++--
 py12306/query/job.py   | 7 +++----
 py12306/user/job.py    | 2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/py12306/order/order.py b/py12306/order/order.py
index c6ead0d..9e342d5 100644
--- a/py12306/order/order.py
+++ b/py12306/order/order.py
@@ -141,8 +141,10 @@ class Order:
             return True
         else:
             if (str(result.get('messages', '')).find('未处理') >= 0):  # 未处理订单
-                self.order_id = 0  # 需要拿到订单号 TODO
-                return -1
+                # 0125 增加排队时长到 5 分钟之后，更多的是 排队失败，得通过拿到订单列表才能确认，再打个 TODO
+                # self.order_id = 0  # 需要拿到订单号 TODO
+                # return -1
+                pass
             OrderLog.add_quick_log(
                 OrderLog.MESSAGE_SUBMIT_ORDER_REQUEST_FAIL.format(
                     result.get('messages', CommonLog.MESSAGE_RESPONSE_EMPTY_ERROR))).flush()
diff --git a/py12306/query/job.py b/py12306/query/job.py
index 68b6da9..d31de1d 100644
--- a/py12306/query/job.py
+++ b/py12306/query/job.py
@@ -45,6 +45,7 @@ class Job:
 
     interval = {}
     interval_additional = 0
+    interval_additional_max = 5
 
     query = None
     cluster = None
@@ -224,10 +225,8 @@ class Job:
         """
         if response.status_code != 200:
             QueryLog.print_query_error(response.reason, response.status_code)
-            if self.interval_additional:
-                self.interval_additional += self.interval_additional
-            else:
-                self.interval_additional = self.interval.get('min')
+            if self.interval_additional < self.interval_additional_max:
+                self.interval_additional += self.interval.get('min')
         else:
             self.interval_additional = 0
         result = response.json().get('data.result')
diff --git a/py12306/user/job.py b/py12306/user/job.py
index 7bf8bb8..ac78048 100644
--- a/py12306/user/job.py
+++ b/py12306/user/job.py
@@ -311,6 +311,8 @@ class UserJob:
             UserLog.add_quick_log(
                 UserLog.MESSAGE_GET_USER_PASSENGERS_FAIL.format(
                     result.get('messages', CommonLog.MESSAGE_RESPONSE_EMPTY_ERROR), self.retry_time)).flush()
+            if Config().is_slave():
+                self.load_user_from_remote() # 加载最新 cookie
             stay_second(self.retry_time)
             return self.get_user_passengers()