WEBDIENSTE/aaPanel
1
0
Fork 0
mirror of https://github.com/aaPanel/aaPanel.git synced 2026-09-13 04:57:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to v8.7.0

Browse Source
This commit is contained in:
aapanel.com
2026-04-16 18:17:07 +08:00
parent c3f2d7566c
commit ee92fa2dbd
2472 changed files with 33631 additions and 20919 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/base/push_mod/base_task.py
+190 -34
View File
@@ -1,4 +1,4 @@
from typing import Union, Optional, List, Tuple
from typing import Union, Optional, Tuple
from .send_tool import WxAccountMsg
@@ -8,8 +8,8 @@ class BaseTask:
def __init__(self):
self.source_name: str = ''
self.title: str = '' # 这个是告警任务的标题(根据实际情况改变)
self.template_name: str = '' # 这个告警模板的标题(不会改变)
self.title: str = '' # 这个是告警任务的标题(根据实际情况改变)
self.template_name: str = '' # 这个告警模板的标题(不会改变)
def check_task_data(self, task_data: dict) -> Union[dict, str]:
"""
@@ -46,27 +46,27 @@ class BaseTask:
@return:
"""
return
def task_config_update_hook(self, task: dict) -> None:
"""
在告警管理中。更新任务数据后，会去掉用这个函数
@return:
"""
return
return
def task_config_remove_hook(self, task: dict) -> None:
"""
在告警管理中。移除这个任务后，会去掉用这个函数
@return:
"""
return
return
def task_config_create_hook(self, task: dict) -> None:
"""
在告警管理中。新建这个任务后，会去掉用这个函数
@return:
"""
return
return
def check_time_rule(self, time_rule: dict) -> Union[dict, str]:
"""
@@ -139,24 +139,61 @@ class BaseTask:
# time 时间日志的字符串
# timestamp 当前的时间戳
# server_name 服务器别名
# --- 所有 to_xxx_msg 于 system.py中用于各种场景告警发送 send_message 调用, 用于定制化格式
def to_dingding_msg(self, push_data: dict, push_public_data: dict) -> str:
"""钉钉消息"""
msg_list = push_data.get('msg_list', None)
if msg_list is None:
if msg_list is None or not isinstance(msg_list, list):
raise ValueError("Task: {} alert push data parameter error, there is no msg_list field".format(self.title))
return self.public_headers_msg(push_public_data,dingding=True) + "\n\n" + "\n\n".join(msg_list)
headers = self._format_public_headers(push_public_data)
beautified_list = self._beautify_msg_list(msg_list)
content = "\n\n".join(beautified_list)
# 钉钉：确保标题包含 aapanel
title = self.title
if "aapanel" not in title.lower():
title += " - aaPanel"
return f"#### 🔔 {title}\n\n{headers}\n\n{content}"
def to_feishu_msg(self, push_data: dict, push_public_data: dict) -> str:
"""飞书消息"""
msg_list = push_data.get('msg_list', None)
if msg_list is None:
if msg_list is None or not isinstance(msg_list, list):
raise ValueError("Task: {} alert push data parameter error, there is no msg_list field".format(self.title))
return self.public_headers_msg(push_public_data) + "\n\n" + "\n\n".join(msg_list)
headers = self._format_public_headers(push_public_data)
beautified_list = self._beautify_msg_list(msg_list)
content = "\n\n".join(beautified_list)
return f"{headers}\n\n{content}"
def to_mail_msg(self, push_data: dict, push_public_data: dict) -> str:
"""邮件消息"""
msg_list = push_data.get('msg_list', None)
if msg_list is None:
if msg_list is None or not isinstance(msg_list, list):
raise ValueError("Task: {} alert push data parameter error, there is no msg_list field".format(self.title))
public_headers = self.public_headers_msg(push_public_data, "<br>")
return public_headers + "<br>" + "<br>".join(msg_list)
# 邮件使用 HTML 格式
headers = self._format_public_headers(push_public_data)
headers = headers.replace("####", "<h4>").replace("\n", "<br>")
headers = headers.replace("🖥️", "&#128190;").replace("🌐", "&#127756;").replace("⏰", "&#9200;").replace("🔔",
"&#128276;")
beautified_list = self._beautify_msg_list(msg_list)
# 保留图标或转换为 HTML 实体
content_lines = []
for msg in beautified_list:
# 保留基本的 HTML 标签和图标
msg = msg.replace("✅", "&#10004;").replace("❌", "&#10060;").replace("⚠️", "&#9888;").replace("⚙️",
"&#9881;")
content_lines.append(msg)
content = "<br>".join(content_lines)
return f"{headers}<br><br>{content}"
def to_sms_msg(self, push_data: dict, push_public_data: dict) -> Tuple[str, dict]:
"""
@@ -166,42 +203,160 @@ class BaseTask:
@return: 第一项是类型， 第二项是数据
"""
raise NotImplementedError()
def to_tg_msg(self, push_data: dict, push_public_data: dict) -> str:
"""Telegram 消息"""
msg_list = push_data.get('msg_list', None)
if msg_list is None:
if msg_list is None or not isinstance(msg_list, list):
raise ValueError("Task: {} alert push data parameter error, there is no msg_list field".format(self.title))
public_headers = self.public_headers_msg(push_public_data, "<br>")
return public_headers + "<br>" + "<br>".join(msg_list)
headers = self._format_public_headers(push_public_data)
beautified_list = self._beautify_msg_list(msg_list)
content = "\n".join(beautified_list)
# Telegram：转义特殊字符
headers = self._escape_markdown(headers)
content = self._escape_markdown(content)
return f"{headers}\n{content}"
def to_weixin_msg(self, push_data: dict, push_public_data: dict) -> str:
"""企业微信消息"""
msg_list = push_data.get('msg_list', None)
if msg_list is None:
if msg_list is None or not isinstance(msg_list, list):
raise ValueError("Task: {} alert push data parameter error, there is no msg_list field".format(self.title))
headers = self._format_public_headers(push_public_data)
beautified_list = self._beautify_msg_list(msg_list)
# 企业微信：移除 HTML 标签，使用缩进
headers = self._remove_html_tags(headers)
content = "\n\n".join([self._remove_html_tags(m) for m in beautified_list])
spc = "\n "
public_headers = self.public_headers_msg(push_public_data, "\n ")
return public_headers + spc + spc.join(msg_list)
return f"{headers}{spc}{spc}{content.replace(chr(10), spc)}"
def to_wx_account_msg(self, push_data: dict, push_public_data: dict) -> WxAccountMsg:
raise NotImplementedError()
def to_web_hook_msg(self, push_data: dict, push_public_data: dict) -> str:
"""Webhook 消息"""
msg_list = push_data.get('msg_list', None)
if msg_list is None:
if msg_list is None or not isinstance(msg_list, list):
raise ValueError("Task: {} alert push data parameter error, there is no msg_list field".format(self.title))
public_headers = self.public_headers_msg(push_public_data, "\n")
return public_headers + "\n" + "\n".join(msg_list)
def public_headers_msg(self, push_public_data: dict, spc: str = None,dingding=False) -> str:
headers = self._format_public_headers(push_public_data)
beautified_list = self._beautify_msg_list(msg_list)
content = "\n".join(beautified_list)
return f"{headers}\n{content}"
def to_discord_msg(self, push_data: dict, push_public_data: dict) -> str:
"""Discord 消息"""
msg_list = push_data.get('msg_list', None)
if msg_list is None or not isinstance(msg_list, list):
raise ValueError("Task: {} alert push data parameter error, there is no msg_list field".format(self.title))
headers = self._format_public_headers(push_public_data)
beautified_list = self._beautify_msg_list(msg_list)
content = "\n".join(beautified_list)
# 清理HTML标签
import re
headers = re.sub(r'<[^>]+>', '', headers)
content = re.sub(r'<[^>]+>', '', content)
return f"{headers}\n{content}"
# ==================== 消息格式化辅助方法 ====================
def _format_public_headers(self, push_public_data: dict) -> str:
"""
格式化公共头部
@param push_public_data: 公共数据
@return: 格式化后的头部字符串
"""
return (
f"#### 🔔 {self.title}\n"
f"> 🖥️ Server: {push_public_data['server_name']}\n"
f"> 🌐 IP: {push_public_data['ip']}(Public) {push_public_data['local_ip']}(Private)\n"
f"> ⏰ Time: {push_public_data['time']}"
)
def _beautify_msg_list(self, msg_list: list) -> list:
"""
美化消息列表
- 添加状态图标
- 优化格式
@param msg_list: 原始消息列表
@return: 美化后的消息列表
"""
if not msg_list:
return []
icons = {
"success": "✅",
"fail": "❌",
"error": "❌",
"warning": "⚠️",
"config": "⚙️",
"completed": "⚙️",
}
beautified = []
for msg in msg_list:
icon = ""
msg_lower = msg.lower()
for keyword, icon_char in icons.items():
if keyword in msg_lower:
icon = icon_char
break
# 如果消息以 > 开头，图标放在 > 之后
if msg.startswith(">"):
msg = f"> {icon} {msg[1:].lstrip()}" if icon else msg
else:
msg = f"{icon} {msg}" if icon else msg
beautified.append(msg)
return beautified
def _remove_html_tags(self, text: str) -> str:
"""
移除 HTML 标签（保留内容）
主要用于企业微信通道
@param text: 原始文本
@return: 移除标签后的文本
"""
import re
return re.sub(r'<font[^>]*>(.+?)</font>', r'\1', text)
def _escape_markdown(self, text: str) -> str:
"""
转义 Telegram Markdown 特殊字符
只转义需要转义的字符，保留 Markdown 语法字符（如 # >）
@param text: 原始文本
@return: 转义后的文本
"""
# Telegram Markdown 需要转义的字符（不包含 # > .，要保留标题、引用和IP格式）
escape_chars = r'*_[]()~`+-=|{}!'
for ch in escape_chars:
text = text.replace(ch, '\\' + ch)
return text
# ==================== 原 public_headers_msg 方法, 可以继续使用 ====================
def public_headers_msg(self, push_public_data: dict, spc: str = None, dingding=False) -> str:
"""
原方法
@deprecated: 建议使用 _format_public_headers()
"""
if spc is None:
spc = "\n\n"
title = self.title
print(title)
if dingding:
print("dingdingtitle",title)
if "aapanel" not in title:
title += "aapanel"
print("dingdingtitle",title)
print(title)
if dingding and "aapanel" not in title:
title += "aapanel"
return spc.join([
"#### {}".format(title),
">Server:" + push_public_data['server_name'],
@@ -209,6 +364,7 @@ class BaseTask:
">SendingTime: " + push_public_data['time']
])
class BaseTaskViewMsg:
def get_msg(self, task: dict) -> Optional[str]: