diff --git a/README.md b/README.md index 691990e..81820e5 100644 --- a/README.md +++ b/README.md @@ -189,5 +189,7 @@ - 修复bug - 优化抢票功能 +- 2018.1.25更新 + - 删除 expect_refresh_interval 无用字段,优化代码 diff --git a/config/ticket_config.yaml b/config/ticket_config.yaml index 5f6aac1..6a90bec 100644 --- a/config/ticket_config.yaml +++ b/config/ticket_config.yaml @@ -38,21 +38,18 @@ # password: "授权码" # host: "smtp.qq.com" - set: station_dates: -# - "2018-01-27" -# - "2018-01-28" - - "2018-02-09" - - "2018-02-10" -# - "2018-02-09" + - "2018-02-22" + - "2018-02-21" + station_trains: - - "G4741" - - "G2365" - - "G1371" - - "G1337" - - "G1377" - - "G1329" + - "G2366" +# - "G2365" +# - "G1371" +# - "G1337" +# - "G1377" +# - "G1329" # - "G1302" # - "G1372" # - "G1326" @@ -65,8 +62,8 @@ set: # - "G1373" # - "G1363" # - "G4933" - from_station: "上海" - to_station: "邵阳" + from_station: "邵阳" + to_station: "上海" set_type: - "二等座" is_more_ticket: True @@ -76,25 +73,24 @@ set: 12306count: # - uesr: "" # - pwd: "apple1995" - - uesr: "931128603@qq.com" + - uesr: "@qq.com" - pwd: "QWERTY" -select_refresh_interval: 0.5 -expect_refresh_interval: 0.1 +select_refresh_interval: 1 ticket_black_list_time: 3 is_aotu_code: True aotu_code_type: 2 #enable_proxy: False damatu: - uesr: "931128603" + uesr: "" pwd: "qazWSX1995" email_conf: is_email: True - email: "931128603@qq.com " + email: "@qq.com " notice_email_list: "61995120@qq.com" - username: "931128603" + username: "" password: "xwopwxbkupbqbfgb" host: "smtp.qq.com" diff --git a/init/select_ticket_info.py b/init/select_ticket_info.py index 1ac496b..14fa0f8 100644 --- a/init/select_ticket_info.py +++ b/init/select_ticket_info.py @@ -26,7 +26,7 @@ sys.setdefaultencoding('utf-8') class select: def __init__(self): - self.from_station, self.to_station, self.station_dates, self._station_seat, self.is_more_ticket, self.ticke_peoples, self.select_refresh_interval, self.station_trains, self.expect_refresh_interval, self.ticket_black_list_time = self.get_ticket_info() + self.from_station, self.to_station, self.station_dates, self._station_seat, self.is_more_ticket, self.ticke_peoples, self.select_refresh_interval, self.station_trains, self.ticket_black_list_time = self.get_ticket_info() self.is_aotu_code = _get_yaml()["is_aotu_code"] self.aotu_code_type = _get_yaml()["aotu_code_type"] self.order_request_params = {} # 订单提交时的参数 @@ -56,10 +56,9 @@ class select: ticke_peoples = ticket_info_config["set"]["ticke_peoples"] select_refresh_interval = ticket_info_config["select_refresh_interval"] station_trains = ticket_info_config["set"]["station_trains"] - expect_refresh_interval = ticket_info_config["expect_refresh_interval"] ticket_black_list_time = ticket_info_config["ticket_black_list_time"] print "*"*20 - print "当前配置:出发站:{0}\n到达站:{1}\n乘车日期:{2}\n坐席:{3}\n是否有票自动提交:{4}\n乘车人:{5}\n刷新间隔:{6}\n候选购买车次:{7}\n未开始刷票间隔时间:{8}\n僵尸票关小黑屋时长:{9}\n".format\ + print "当前配置:出发站:{0}\n到达站:{1}\n乘车日期:{2}\n坐席:{3}\n是否有票自动提交:{4}\n乘车人:{5}\n刷新间隔:{6}\n候选购买车次:{7}\n僵尸票关小黑屋时长:{8}\n".format\ ( from_station, to_station, @@ -69,11 +68,10 @@ class select: ",".join(ticke_peoples), select_refresh_interval, ",".join(station_trains), - expect_refresh_interval, ticket_black_list_time, ) print "*"*20 - return from_station, to_station, station_dates, set_type, is_more_ticket, ticke_peoples, select_refresh_interval, station_trains, expect_refresh_interval, ticket_black_list_time + return from_station, to_station, station_dates, set_type, is_more_ticket, ticke_peoples, select_refresh_interval, station_trains, ticket_black_list_time def get_order_request_params(self): return self.order_request_params @@ -240,7 +238,6 @@ class select: pass else: pass - time.sleep(self.expect_refresh_interval) else: print "车次配置信息有误,或者返回数据异常,请检查 {}".format(station_ticket) diff --git a/tkcode b/tkcode index e3e73b3..8fec992 100644 Binary files a/tkcode and b/tkcode differ