mirror of
https://github.com/whyour/qinglong.git
synced 2025-07-27 22:56:07 +08:00
update:更改tg_bot消息发送方式
This commit is contained in:
parent
2578aae0ba
commit
a2ba64dc50
|
@ -61,7 +61,7 @@ push_config = {
|
||||||
'PUSH_KEY': '', # server 酱的 PUSH_KEY,兼容旧版与 Turbo 版
|
'PUSH_KEY': '', # server 酱的 PUSH_KEY,兼容旧版与 Turbo 版
|
||||||
|
|
||||||
'DEER_KEY': '', # PushDeer 的 PUSHDEER_KEY
|
'DEER_KEY': '', # PushDeer 的 PUSHDEER_KEY
|
||||||
|
|
||||||
'PUSH_PLUS_TOKEN': '', # push+ 微信推送的用户令牌
|
'PUSH_PLUS_TOKEN': '', # push+ 微信推送的用户令牌
|
||||||
'PUSH_PLUS_USER': '', # push+ 微信推送的群组编码
|
'PUSH_PLUS_USER': '', # push+ 微信推送的群组编码
|
||||||
|
|
||||||
|
@ -274,12 +274,12 @@ def pushdeer(title: str, content: str) -> None:
|
||||||
data = {"text": title, "desp": content, "type": "markdown", "pushkey": push_config.get("DEER_KEY")}
|
data = {"text": title, "desp": content, "type": "markdown", "pushkey": push_config.get("DEER_KEY")}
|
||||||
url = 'https://api2.pushdeer.com/message/push'
|
url = 'https://api2.pushdeer.com/message/push'
|
||||||
response = requests.post(url, data=data).json()
|
response = requests.post(url, data=data).json()
|
||||||
|
|
||||||
if len(response.get("content").get("result")) > 0:
|
if len(response.get("content").get("result")) > 0:
|
||||||
print("PushDeer 推送成功!")
|
print("PushDeer 推送成功!")
|
||||||
else:
|
else:
|
||||||
print("PushDeer 推送失败!错误信息:", response)
|
print("PushDeer 推送失败!错误信息:", response)
|
||||||
|
|
||||||
|
|
||||||
def pushplus_bot(title: str, content: str) -> None:
|
def pushplus_bot(title: str, content: str) -> None:
|
||||||
"""
|
"""
|
||||||
|
@ -469,8 +469,8 @@ def telegram_bot(title: str, content: str) -> None:
|
||||||
url = (
|
url = (
|
||||||
f"https://api.telegram.org/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
|
f"https://api.telegram.org/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
|
||||||
)
|
)
|
||||||
headers = {"Content-Type": "application/x-www-form-urlencoded"}
|
headers = {"Content-Type": "application/json"}
|
||||||
payload = {
|
data = {
|
||||||
"chat_id": str(push_config.get("TG_USER_ID")),
|
"chat_id": str(push_config.get("TG_USER_ID")),
|
||||||
"text": f"{title}\n\n{content}",
|
"text": f"{title}\n\n{content}",
|
||||||
"disable_web_page_preview": "true",
|
"disable_web_page_preview": "true",
|
||||||
|
@ -489,9 +489,7 @@ def telegram_bot(title: str, content: str) -> None:
|
||||||
push_config.get("TG_PROXY_HOST"), push_config.get("TG_PROXY_PORT")
|
push_config.get("TG_PROXY_HOST"), push_config.get("TG_PROXY_PORT")
|
||||||
)
|
)
|
||||||
proxies = {"http": proxyStr, "https": proxyStr}
|
proxies = {"http": proxyStr, "https": proxyStr}
|
||||||
response = requests.post(
|
response = requests.post(url=url, headers=headers, json=data, proxies=proxies).json()
|
||||||
url=url, headers=headers, params=payload, proxies=proxies
|
|
||||||
).json()
|
|
||||||
|
|
||||||
if response["ok"]:
|
if response["ok"]:
|
||||||
print("tg 推送成功!")
|
print("tg 推送成功!")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user