jiazhizhong/py12306
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge https://github.com/wonderful60/py12306 into pr

Browse Source
This commit is contained in:
Jalin
2019-01-15 12:02:30 +08:00
parent ebca190c26 6a5d58605d
commit 6685c1570e
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
env.docker.py.example
View File

@@ -54,8 +54,9 @@ TELEGRAM_BOT_API_URL = 'https://tgbot.lbyczf.com/sendMessage/:your_token'
# ServerChan和PushBear配置
SERVERCHAN_ENABLED = 0
PUSHBEAR_ENABLED = 0
S_KEY = 'SCUdafadsfasfdafdf45234234234'
PUSHBEAR_ENABLED = 0
SC_KEY = '8474-ca071ADSFADSF'
# 输出日志到文件 (Docker 中不建议修改此组配置项)
OUT_PUT_LOG_TO_FILE_ENABLED = 1

3
env.py.example
View File

@@ -54,8 +54,9 @@ TELEGRAM_BOT_API_URL = 'https://tgbot.lbyczf.com/sendMessage/:your_token'
# ServerChan和PushBear配置
SERVERCHAN_ENABLED = 0
PUSHBEAR_ENABLED = 0
S_KEY = 'SCUdafadsfasfdafdf45234234234'
PUSHBEAR_ENABLED = 0
SC_KEY = '8474-ca071ADSFADSF'
# 输出日志到文件
OUT_PUT_LOG_TO_FILE_ENABLED = 0

2
py12306/app.py
View File

@@ -123,7 +123,7 @@ class App:
if Config().PUSHBEAR_ENABLED: # PushBear通知
CommonLog.add_quick_log(CommonLog.MESSAGE_TEST_SEND_PUSH_BEAR).flush()
Notification.push_bear(Config().S_KEY, '测试发送消息', 'By py12306')
Notification.push_bear(Config().SC_KEY, '测试发送消息', 'By py12306')
@classmethod
def run_check(cls):

3
py12306/config.py
View File

@@ -64,8 +64,9 @@ class Config:
# ServerChan和PushBear配置
SERVERCHAN_ENABLED = 0
PUSHBEAR_ENABLED = 0
S_KEY = ''
PUSHBEAR_ENABLED = 0
SC_KEY = ''
# 邮箱配置
EMAIL_ENABLED = 0

2
py12306/order/order.py
View File

@@ -91,7 +91,7 @@ class Order:
Notification.server_chan(Config().S_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().S_KEY, OrderLog.MESSAGE_ORDER_SUCCESS_NOTIFICATION_TITLE,
Notification.push_bear(Config().SC_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