From ae91368a261558ef4d572d825161fc011797c045 Mon Sep 17 00:00:00 2001 From: wenxianping <931128603@qq.com> Date: Thu, 17 Jan 2019 17:37:36 +0800 Subject: [PATCH] fix --- config/pushbearConf.py | 2 +- init/login.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/pushbearConf.py b/config/pushbearConf.py index e268247..bc8576c 100644 --- a/config/pushbearConf.py +++ b/config/pushbearConf.py @@ -21,7 +21,7 @@ def sendPushBear(msg): sendPushBearUrls = urls.get("Pushbear") data = { "sendkey": conf["pushbear_conf"]["send_key"].strip(), - "text": "易行购票成功通知-{}".format(time.strftime("%F %T")), + "text": "易行购票成功通知", "desp": msg } httpClint = HTTPClient(0) diff --git a/init/login.py b/init/login.py index 478ea6c..11913e4 100755 --- a/init/login.py +++ b/init/login.py @@ -104,10 +104,10 @@ class GoLogin: :param passwd: 密码 :return: """ - if self.is_auto_code and self.auto_code_type == 1: - balance = DamatuApi(_get_yaml()["auto_code_account"]["user"], _get_yaml()["auto_code_account"]["pwd"]).getBalance() - if int(balance) < 40: - raise balanceException(u'余额不足，当前余额为: {}'.format(balance)) + # if self.is_auto_code and self.auto_code_type == 1: + # balance = DamatuApi(_get_yaml()["auto_code_account"]["user"], _get_yaml()["auto_code_account"]["pwd"]).getBalance() + # if int(balance) < 40: + # raise balanceException(u'余额不足，当前余额为: {}'.format(balance)) user, passwd = _get_yaml()["set"]["12306account"][0]["user"], _get_yaml()["set"]["12306account"][1]["pwd"] if not user or not passwd: raise UserPasswordException(u"温馨提示: 用户名或者密码为空，请仔细检查")