Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 修改request调用方法及推送提醒 #25

Closed
wants to merge 2 commits into from
Closed

fix: 修改request调用方法及推送提醒 #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee4a58c
fix: 修改调用方法及优化提醒
Violiate Sep 21, 2024
b09b7b4
fix: 优化提醒
Violiate Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 35 additions & 43 deletions util/push/push.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import smtplib
import requests,json
import json
from loguru import logger
from util.Request import Request
#from i18n import *


Expand All @@ -10,59 +11,50 @@ class PUSH():
def __init__(self,config):
self.config = config
self.title="BTP有新推送消息"
self.net = Request()
self.headers = {
"Content-Type": "application/json",
"Charset": "UTF-8"
}
#dingding
try:
self.dingding_token=config['dingding_token']
except:
logger.error("dingding_not_set")
#logger.error(i18n_format("webhook_not_set"))
if 'dingding_token' in config:
self.dingding_token=config['dingding_token']
else:
self.dingding_token=''
#push_plus
try:
if 'pushplus_token' in config:
self.pushplus_token=config['pushplus_token']
except:
logger.error("pushplus_not_set")
#logger.error(i18n_format("pushplus_not_set"))
else:
self.pushplus_token=''
#smtp
try:
if 'smtp_mail_host' in config:
self.smtp_mail_host=config['smtp_mail_host']
self.smtp_mail_user=config['smtp_mail_user']
self.smtp_mail_pass=config['smtp_mail_pass']
self.smtp_sender=config['smtp_sender']
self.smtp_receivers=config['smtp_receivers']
except:
logger.error("smtp_not_set")
#logger.error(i18n_format("smtp_not_set"))
else:
self.smtp_mail_host=""
if 'smtp_mail_user' in config:
self.smtp_mail_user=config['smtp_mail_user']
else:
self.smtp_mail_user=""
if 'smtp_mail_pass' in config:
self.smtp_mail_pass=config['smtp_mail_pass']
else:
self.smtp_mail_pass=""
if 'smtp_sender' in config:
self.smtp_sender=config['smtp_sender']
else:
self.smtp_sender=""
if 'smtp_receivers' in config:
self.smtp_receivers=config['smtp_receivers']
else:
self.smtp_receivers=['']
#bark
try:
if 'bark_token' in config:
self.bark_token=config['bark_token']
except:
logger.error("bark_not_set")
#logger.error(i18n_format("bark_not_set"))
else:
self.bark_token=""
#ftqq
try:
if 'ftqq_token' in config:
self.ftqq_token=config['ftqq_token']
except:
logger.error("ftqq_not_set")
#logger.error(i18n_format("ftqq_not_set"))
else:
self.ftqq_token=""
#wx
try:
if 'wx_token' in config:
self.wx_token=config['wx_token']
except:
logger.error("webhook_not_set")
#logger.error(i18n_format("wx_not_set"))
else:
self.wx_token=""


Expand Down Expand Up @@ -96,7 +88,7 @@ def ding_push(self):
# 对请求的数据进行json封装
message_json = json.dumps(msg)
# 发送请求
info = requests.post(url, data=message_json, headers=self.headers)
info = self.net.Response(method='post',url=url, params=message_json,isJson=True)
# 打印返回的结果
logger.info(info.text)

Expand All @@ -113,7 +105,7 @@ def pushplus(self):
}

try:
info=requests.post(url, json=data,headers=self.headers)
info=self.net.Response(method='post',url=url, params=data,isJson=True)
logger.debug(info.text)
#logger.info(i18n_format("pushplus_send_success"))
logger.info("pushplus_send_success")
Expand All @@ -128,7 +120,7 @@ def ftqq(self):
}
url=f"https://sctapi.ftqq.com/{self.ftqq_token}.send"
try:
info=requests.post(url, data=data,headers=self.headers)
info=self.net.Response(method='post',url=url, params=data,isJson=True)
logger.debug(info.text)
#logger.info(i18n_format("bark_send_success"))
logger.info("bark_send_success")
Expand All @@ -146,7 +138,7 @@ def wx_push(self):
}
}
try:
info=requests.post(url, json=data,headers=self.headers)
info=self.net.Response(method='post',url=url, params=data,isJson=True)
logger.debug(info.text)
#logger.info(i18n_format("wx_send_success"))
logger.info("wx_send_success")
Expand Down Expand Up @@ -194,7 +186,7 @@ def smtp(self):
#退出
smtpObj.quit()
#logger.info(i18n_format("send_success"))
logger.info("send_success")
logger.info("smtp_send_success")
except smtplib.SMTPException as e:
logger.error(e) #打印错误

Expand All @@ -215,7 +207,7 @@ def bark(self):
}
url=f'https://api.day.app/{self.bark_token}'
try:
info=requests.post(url,json=data)
info=self.net.Response(method='post',url=url, params=data,isJson=True)
logger.info("bark_send_success")
logger.debug(info.text)
#logger.info(i18n_format("bark_send_success"))
Expand All @@ -225,7 +217,7 @@ def bark(self):
if __name__ == "__main__":
config={}
#只需要填入token即可，不要全部链接
config['dingding_token']=""
config['dingding_token']="123456"
config['wx_token']=''
config['pushplus_token']=''
config['bark_token']=""
Expand Down
Loading