优化查询逻辑

testerSunshine · Dec 31, 2018 · 0e6f2ce · 0e6f2ce
1 parent 2465d61
commit 0e6f2ce
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/config/urlConf.py b/config/urlConf.py
@@ -196,7 +196,7 @@
         "Referer": "https://kyfw.12306.cn/otn/leftTicket/init",
         "Host": "kyfw.12306.cn",
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": True,
         "is_json": True,
@@ -207,7 +207,7 @@
         "Referer": "https://kyfw.12306.cn/otn/confirmPassenger/initDc",
         "Host": "kyfw.12306.cn",
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": True,
         "is_json": True,
@@ -218,7 +218,7 @@
         "Referer": "https://kyfw.12306.cn/otn/confirmPassenger/initDc",
         "Host": "kyfw.12306.cn",
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": True,
         "is_json": True,
@@ -229,7 +229,7 @@
         "Referer": "https://kyfw.12306.cn/otn/confirmPassenger/initDc",
         "Host": "kyfw.12306.cn",
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": True,
         "is_json": True,
@@ -240,7 +240,7 @@
         "Referer": "https://kyfw.12306.cn/otn/confirmPassenger/initDc",
         "Host": "kyfw.12306.cn",
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": True,
         "is_json": True,
@@ -251,7 +251,7 @@
         "Referer": "https://kyfw.12306.cn/otn/confirmPassenger/initDc",
         "Host": "kyfw.12306.cn",
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": False,
         "is_json": False,
@@ -262,7 +262,7 @@
         "Referer": "https://kyfw.12306.cn/otn/confirmPassenger/initDc",
         "Host": "kyfw.12306.cn",
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": True,
         "is_json": True,
@@ -273,7 +273,7 @@
         "Referer": "https://kyfw.12306.cn/otn/queryOrder/initNoComplete",
         "Host": "kyfw.12306.cn",
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": True,
         "is_json": True,
@@ -284,7 +284,7 @@
         "Referer": "https://kyfw.12306.cn/otn/queryOrder/initNoComplete",
         "Host": "kyfw.12306.cn",
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": False,
         "is_json": False,
@@ -295,7 +295,7 @@
         "Referer": "https://kyfw.12306.cn/otn/queryOrder/initNoComplete",
         "Host": "kyfw.12306.cn",
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": True,
         "is_json": True,
@@ -307,7 +307,7 @@
         "Host": "kyfw.12306.cn",
         "Content-Type": 1,
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": True,
         "is_json": True,
@@ -319,7 +319,7 @@
         "Host": "kyfw.12306.cn",
         "Content-Type": 1,
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": True,
         "is_json": True,
@@ -331,7 +331,7 @@
         "Content-Type": 1,
         "Host": "kyfw.12306.cn",
         "re_try": 10,
-        "re_time": 0.1,
+        "re_time": 0.01,
         "s_time": 0.1,
         "is_logger": True,
         "is_json": True,

diff --git a/init/select_ticket_info.py b/init/select_ticket_info.py
@@ -244,8 +244,7 @@ def main(self):
                             sor.sendSubmitOrderRequest()
                 else:
                     random_time = round(random.uniform(0.5, 0.5), 2)
-                    time.sleep(random_time)
-                    print u"正在第{0}次查询 随机停留时长：{6} 乘车日期: {1} 车次：{2} 查询无票 cdn轮询IP：{4}当前cdn总数：{5} 总耗时：{3}ms".format(num,
+                    print(u"正在第{0}次查询 随机停留时长：{6} 乘车日期: {1} 车次：{2} 查询无票 cdn轮询IP：{4}当前cdn总数：{5} 总耗时：{3}ms".format(num,
                                                                                                                 ",".join(
                                                                                                                     self.station_dates),
                                                                                                                 ",".join(
@@ -255,7 +254,8 @@ def main(self):
                                                                                                                 queryResult.get("cdn", None),
                                                                                                                 len(
                                                                                                                     self.cdn_list),
-                                                                                                                random_time)
+                                                                                                                random_time))
+                    time.sleep(random_time)
             except PassengerUserException as e:
                 print e.message
                 break

diff --git a/inter/CheckUser.py b/inter/CheckUser.py
@@ -14,7 +14,7 @@ def sendCheckUser(self):
         检查用户登录, 检查间隔为2分钟
         :return:
         """
-        CHENK_TIME = 1
+        CHENK_TIME = 0.3
         if wrapcache.get("user_time") is None:
             check_user_url = self.session.urls["check_user_url"]
             data = {"_json_att": ""}

diff --git a/inter/Query.py b/inter/Query.py
@@ -39,7 +39,6 @@ def __init__(self, session, from_station, to_station, from_station_h, to_station
         self.arrival_time = session.arrival_time
         self.take_time = session.take_time
 
-
     @classmethod
     def station_seat(self, index):
         """
@@ -90,7 +89,7 @@ def sendQuery(self):
                                                                  self.session.queryUrl)
             station_ticket = self.httpClint.send(select_url)
             if station_ticket.get("c_url", ""):
-                print(station_ticket.get("c_url", ""))
+                print(u"设置当前查询url为: {}".format(station_ticket.get("c_url", "")))
                 self.session.queryUrl = station_ticket.get("c_url", "")  # 重设查询接口
                 continue
             value = station_ticket.get("data", "")

diff --git a/inter/SubmitOrderRequest.py b/inter/SubmitOrderRequest.py
@@ -57,7 +57,6 @@ def sendSubmitOrderRequest(self):
         submitResult = self.session.httpClint.send(submit_station_url, self.data_apr())
         if 'data' in submitResult and submitResult['data']:
             if submitResult['data'] == 'N':
-                print (u'出票成功')
                 coi = checkOrderInfo(self.session, self.train_no, self.set_type, self.passengerTicketStrList,
                                      self.oldPassengerStr,
                                      self.train_date, self.ticke_peoples)