diff --git a/env.docker.py.example b/env.docker.py.example index f18120c..32cd401 100644 --- a/env.docker.py.example +++ b/env.docker.py.example @@ -52,11 +52,14 @@ DINGTALK_WEBHOOK = 'https://oapi.dingtalk.com/robot/send?access_token=your token TELEGRAM_ENABLED = 0 TELEGRAM_BOT_API_URL = 'https://tgbot.lbyczf.com/sendMessage/:your_token' -# ServerChan和PushBear配置 +# ServerChan 和 PushBear 微信消息推送 +# 使用说明 +# ServerChan http://sc.ftqq.com +# PushBear http://pushbear.ftqq.com SERVERCHAN_ENABLED = 0 -S_KEY = 'SCUdafadsfasfdafdf45234234234' +SERVERCHAN_KEY = '' PUSHBEAR_ENABLED = 0 -SC_KEY = '8474-ca071ADSFADSF' +PUSHBEAR_KEY = '' # 输出日志到文件 (Docker 中不建议修改此组配置项) OUT_PUT_LOG_TO_FILE_ENABLED = 1 diff --git a/env.py.example b/env.py.example index 3f856d0..03fd246 100644 --- a/env.py.example +++ b/env.py.example @@ -43,6 +43,7 @@ NOTIFICATION_API_APP_CODE = 'your app code' NOTIFICATION_VOICE_CODE_PHONE = 'your phone' # 接受通知的手机号 # 钉钉通知 +# 使用说明 https://open-doc.dingtalk.com/docs/doc.htm?treeId=257&articleId=105735&docType=1 DINGTALK_ENABLED = 0 DINGTALK_WEBHOOK = 'https://oapi.dingtalk.com/robot/send?access_token=your token' @@ -52,11 +53,14 @@ DINGTALK_WEBHOOK = 'https://oapi.dingtalk.com/robot/send?access_token=your token TELEGRAM_ENABLED = 0 TELEGRAM_BOT_API_URL = 'https://tgbot.lbyczf.com/sendMessage/:your_token' -# ServerChan和PushBear配置 +# ServerChan 和 PushBear 微信消息推送 +# 使用说明 +# ServerChan http://sc.ftqq.com +# PushBear http://pushbear.ftqq.com SERVERCHAN_ENABLED = 0 -S_KEY = 'SCUdafadsfasfdafdf45234234234' +SERVERCHAN_KEY = '' PUSHBEAR_ENABLED = 0 -SC_KEY = '8474-ca071ADSFADSF' +PUSHBEAR_KEY = '' # 输出日志到文件 OUT_PUT_LOG_TO_FILE_ENABLED = 0 diff --git a/py12306/app.py b/py12306/app.py index 2c62d5b..e0f720c 100644 --- a/py12306/app.py +++ b/py12306/app.py @@ -119,11 +119,11 @@ class App: if Config().SERVERCHAN_ENABLED: # ServerChan通知 CommonLog.add_quick_log(CommonLog.MESSAGE_TEST_SEND_SERVER_CHAN).flush() - Notification.server_chan(Config().S_KEY, '测试发送消息', 'By py12306') + Notification.server_chan(Config().SERVERCHAN_KEY, '测试发送消息', 'By py12306') if Config().PUSHBEAR_ENABLED: # PushBear通知 CommonLog.add_quick_log(CommonLog.MESSAGE_TEST_SEND_PUSH_BEAR).flush() - Notification.push_bear(Config().SC_KEY, '测试发送消息', 'By py12306') + Notification.push_bear(Config().PUSHBEAR_KEY, '测试发送消息', 'By py12306') @classmethod def run_check(cls): diff --git a/py12306/config.py b/py12306/config.py index ca43739..5258f2b 100644 --- a/py12306/config.py +++ b/py12306/config.py @@ -64,9 +64,9 @@ class Config: # ServerChan和PushBear配置 SERVERCHAN_ENABLED = 0 - S_KEY = '' + SERVERCHAN_KEY = '8474-ca071ADSFADSF' PUSHBEAR_ENABLED = 0 - SC_KEY = '' + PUSHBEAR_KEY = 'SCUdafadsfasfdafdf45234234234' # 邮箱配置 EMAIL_ENABLED = 0 diff --git a/py12306/order/order.py b/py12306/order/order.py index 797d94d..ba7d2cc 100644 --- a/py12306/order/order.py +++ b/py12306/order/order.py @@ -88,10 +88,10 @@ class Order: Notification.send_to_telegram( OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_OF_EMAIL_CONTENT.format(self.order_id)) if Config().SERVERCHAN_ENABLED: # ServerChan通知 - Notification.server_chan(Config().S_KEY, OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_TITLE, + Notification.server_chan(Config().SERVERCHAN_KEY, OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_TITLE, OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_OF_EMAIL_CONTENT.format(self.order_id)) if Config().PUSHBEAR_ENABLED: # PushBear通知 - Notification.push_bear(Config().SC_KEY, OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_TITLE, + Notification.push_bear(Config().PUSHBEAR_KEY, OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_TITLE, OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_OF_EMAIL_CONTENT.format(self.order_id)) while sustain_time: # TODO 后面直接查询有没有待支付的订单就可以 num += 1