5 Commits

Author SHA1 Message Date
9202e4c202 feat: 邮件通知规则功能 2026-04-23 23:04:24 +08:00
38db7b0606 fix: JavaScript换行符转义问题 2026-04-23 18:31:07 +08:00
6e5b963b3f fix: 修复desktopNotifyEnabled变量重复声明 2026-04-23 18:27:08 +08:00
a201b0356a fix: JavaScript变量声明顺序修复 2026-04-23 18:08:57 +08:00
71dd1d3aff feat: 系统桌面通知功能 2026-04-23 17:54:02 +08:00
3 changed files with 394 additions and 8 deletions

Binary file not shown.

402
app.py
View File

@@ -851,6 +851,69 @@ def get_next_run_time(expression):
return '无法计算'
# ==================== 邮件通知 API ====================
@app.route('/api/email/send', methods=['POST'])
def api_email_send():
"""发送邮件通知"""
data = request.get_json()
if not data:
return jsonify({'error': '无效数据'}), 400
to_email = data.get('to')
subject = data.get('subject')
body = data.get('body')
if not to_email or not subject or not body:
return jsonify({'error': '缺少必要参数'}), 400
try:
import smtplib
from email.mime.text import MIMEText
from email.mime.multipart import MIMEMultipart
from datetime import datetime
# SMTP配置 (从环境变量或默认值)
smtp_host = os.environ.get('SMTP_HOST', 'mail.tphai.com')
smtp_port = int(os.environ.get('SMTP_PORT', 587))
smtp_user = os.environ.get('SMTP_USER', 'favor@tphai.com')
smtp_pass = os.environ.get('SMTP_PASS', 'favor@!')
server = smtplib.SMTP(smtp_host, smtp_port)
server.ehlo()
server.login(smtp_user, smtp_pass)
msg = MIMEMultipart()
msg['From'] = smtp_user
msg['To'] = to_email
msg['Subject'] = subject
msg['Date'] = datetime.now().strftime('%a, %d %b %Y %H:%M:%S +0800')
msg['Reply-To'] = to_email
msg.attach(MIMEText(body, 'plain', 'utf-8'))
server.sendmail(smtp_user, to_email, msg.as_string())
server.quit()
return jsonify({'success': True, 'message': '邮件已发送'})
except Exception as e:
return jsonify({'error': str(e)}), 500
@app.route('/api/email/config', methods=['GET', 'POST'])
def api_email_config():
"""获取/设置邮件配置"""
if request.method == 'GET':
return jsonify({
'host': os.environ.get('SMTP_HOST', 'mail.tphai.com'),
'port': int(os.environ.get('SMTP_PORT', 587)),
'user': os.environ.get('SMTP_USER', 'favor@tphai.com')
})
else:
data = request.get_json()
# 只保存到环境变量说明,实际使用需要配置环境变量
return jsonify({'message': '邮件配置需要通过环境变量设置'})
@app.route('/api/crons')
def api_crons():
"""获取系统 cron 列表(兼容旧接口)"""
@@ -1040,7 +1103,7 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>项目服务管理面板 v2.8</title>
<title>项目服务管理面板 v3.0</title>
<link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'><text y='.9em' font-size='90'>📊</text></svg>">
<script src="https://cdn.tailwindcss.com"></script>
<link href="https://cdn.jsdelivr.net/npm/remixicon@3.5.0/fonts/remixicon.css" rel="stylesheet">
@@ -1078,6 +1141,8 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
.threshold-section { background: #1e293b; border: 1px solid #334155; border-radius: 12px; padding: 16px; margin-bottom: 16px; }
.threshold-item { display: flex; align-items: center; gap: 12px; padding: 8px 0; border-bottom: 1px solid #334155; }
.threshold-item:last-child { border-bottom: none; }
.notification-toggle { display: flex; align-items: center; gap: 8px; padding: 12px; background: #334155; border-radius: 8px; margin-top: 12px; }
.notification-toggle label { cursor: pointer; }
.threshold-label { flex: 1; display: flex; align-items: center; gap: 8px; }
.threshold-input { width: 60px; background: #334155; border: 1px solid #475569; border-radius: 6px; padding: 4px 8px; color: #f1f5f9; text-align: center; }
.threshold-input:focus { outline: none; border-color: #3b82f6; }
@@ -1357,6 +1422,29 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
<span class="text-gray-500 text-xs">秒</span>
</div>
</div>
<!-- 桌面通知开关 -->
<div class="notification-toggle">
<input type="checkbox" id="enableDesktopNotify" onchange="toggleDesktopNotify()" class="w-4 h-4 cursor-pointer">
<label for="enableDesktopNotify" class="text-gray-300 text-sm cursor-pointer">
<i class="ri-notification-line text-yellow-400"></i> 系统桌面通知
</label>
<span id="notifyStatus" class="text-xs text-gray-500 ml-1"></span>
</div>
<!-- 邮件通知规则 -->
<div class="mt-4 pt-4 border-t border-gray-600">
<div class="flex items-center justify-between mb-3">
<h4 class="text-gray-200 text-sm font-medium flex items-center gap-2">
<i class="ri-mail-line text-green-400"></i> 邮件通知规则
</h4>
<button onclick="showAddEmailRuleModal()" class="btn bg-green-600 hover:bg-green-700 px-2 py-1 rounded text-xs flex items-center gap-1">
<i class="ri-add-line"></i> 添加规则
</button>
</div>
<div id="emailRulesList" class="space-y-2 text-sm">
<div class="text-gray-500 text-center py-4">暂无邮件通知规则</div>
</div>
</div>
</div>
<!-- 控制按钮 -->
@@ -1617,6 +1705,65 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
</div>
</div>
<!-- 邮件通知规则模态框 -->
<div id="emailRuleModal" class="modal-overlay hidden">
<div class="card rounded-xl modal-content p-6">
<div class="flex items-center justify-between mb-4">
<h3 id="emailRuleModalTitle" class="font-bold text-lg">添加邮件通知规则</h3>
<button onclick="closeEmailRuleModal()" class="text-gray-400 hover:text-white"><i class="ri-close-line text-xl"></i></button>
</div>
<form id="emailRuleForm" onsubmit="saveEmailRule(event)">
<input type="hidden" id="emailRuleId">
<div class="mb-3">
<label class="block text-gray-400 text-sm mb-1">规则名称 *</label>
<input type="text" id="emailRuleName" required class="w-full bg-gray-700 text-gray-200 px-3 py-2 rounded-lg" placeholder="例如CPU告警通知">
</div>
<div class="mb-3">
<label class="block text-gray-400 text-sm mb-1">监控资源 *</label>
<select id="emailRuleResource" class="w-full bg-gray-700 text-gray-200 px-3 py-2 rounded-lg">
<option value="cpu">CPU 使用率</option>
<option value="memory">内存使用率</option>
<option value="disk">磁盘使用率</option>
</select>
</div>
<div class="mb-3">
<label class="block text-gray-400 text-sm mb-1">触发阈值 *</label>
<div class="flex items-center gap-2">
<input type="number" id="emailRuleThreshold" required min="1" max="100" value="80" class="w-20 bg-gray-700 text-gray-200 px-3 py-2 rounded-lg">
<span class="text-gray-400">%</span>
</div>
</div>
<div class="mb-3">
<label class="block text-gray-400 text-sm mb-1">收件邮箱 *</label>
<input type="email" id="emailRuleAddress" required class="w-full bg-gray-700 text-gray-200 px-3 py-2 rounded-lg" placeholder="alert@example.com">
</div>
<div class="mb-3">
<label class="block text-gray-400 text-sm mb-1">通知间隔</label>
<div class="flex items-center gap-2">
<input type="number" id="emailRuleInterval" min="60" max="3600" value="300" class="w-20 bg-gray-700 text-gray-200 px-3 py-2 rounded-lg">
<span class="text-gray-400">秒最少60秒</span>
</div>
</div>
<div class="mb-3 flex items-center gap-2">
<input type="checkbox" id="emailRuleEnabled" checked class="w-4 h-4 cursor-pointer">
<label for="emailRuleEnabled" class="text-gray-300 text-sm cursor-pointer">启用此规则</label>
</div>
<div class="flex justify-end gap-2">
<button type="button" onclick="closeEmailRuleModal()" class="btn bg-gray-600 hover:bg-gray-700 px-4 py-2 rounded-lg">取消</button>
<button type="submit" class="btn bg-green-600 hover:bg-green-700 px-4 py-2 rounded-lg">保存</button>
</div>
</form>
</div>
</div>
<!-- 导航按钮 -->
<div class="nav-buttons">
<button onclick="scrollToTop()" class="nav-btn" title="回到顶部"><i class="ri-arrow-up-line"></i></button>
@@ -1635,6 +1782,13 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
document.getElementById('enableLogs').checked = enableLogs;
// Tab 切换
// 系统资源监控变量(必须先声明)
let realtimeTimer = null;
let realtimeInterval = 2; // 秒
let lastAlertTime = 0; // 上次警告时间
let thresholds = { cpu: 80, memory: 85, disk: 90, interval: 60 };
let desktopNotifyEnabled = false;
function switchTab(tab) {
currentTab = tab;
document.querySelectorAll('.tab-btn').forEach(btn => {
@@ -1658,16 +1812,12 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
}
if (tab === 'system') {
loadThresholds();
loadDesktopNotifySetting();
renderEmailRules();
loadSystemStats();
}
}
// 系统资源加载
let realtimeTimer = null;
let realtimeInterval = 2; // 秒
let lastAlertTime = 0; // 上次警告时间
let thresholds = { cpu: 80, memory: 85, disk: 90, interval: 60 };
// 加载阈值设置
function loadThresholds() {
const saved = localStorage.getItem('systemThresholds');
@@ -1689,6 +1839,85 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
localStorage.setItem('systemThresholds', JSON.stringify(thresholds));
}
// 桌面通知开关(已在外部声明 desktopNotifyEnabled
function toggleDesktopNotify() {
const checked = document.getElementById('enableDesktopNotify').checked;
const status = document.getElementById('notifyStatus');
if (checked) {
// 检查浏览器支持
if (!('Notification' in window)) {
status.textContent = '不支持';
status.className = 'text-xs text-red-500 ml-1';
document.getElementById('enableDesktopNotify').checked = false;
return;
}
// 检查权限状态
if (Notification.permission === 'granted') {
desktopNotifyEnabled = true;
status.textContent = '已启用';
status.className = 'text-xs text-green-400 ml-1';
localStorage.setItem('desktopNotify', 'true');
} else if (Notification.permission === 'denied') {
status.textContent = '已拒绝';
status.className = 'text-xs text-red-500 ml-1';
document.getElementById('enableDesktopNotify').checked = false;
} else {
// 请求权限
Notification.requestPermission().then(permission => {
if (permission === 'granted') {
desktopNotifyEnabled = true;
status.textContent = '已启用';
status.className = 'text-xs text-green-400 ml-1';
localStorage.setItem('desktopNotify', 'true');
} else {
status.textContent = '已拒绝';
status.className = 'text-xs text-red-500 ml-1';
document.getElementById('enableDesktopNotify').checked = false;
}
});
}
} else {
desktopNotifyEnabled = false;
status.textContent = '';
localStorage.setItem('desktopNotify', 'false');
}
}
// 加载桌面通知设置
function loadDesktopNotifySetting() {
const saved = localStorage.getItem('desktopNotify');
if (saved === 'true' && Notification.permission === 'granted') {
desktopNotifyEnabled = true;
document.getElementById('enableDesktopNotify').checked = true;
document.getElementById('notifyStatus').textContent = '已启用';
document.getElementById('notifyStatus').className = 'text-xs text-green-400 ml-1';
}
}
// 发送桌面通知
function sendDesktopNotification(warnings) {
if (!desktopNotifyEnabled || Notification.permission !== 'granted') return;
const notification = new Notification('⚠️ 系统资源告警', {
body: warnings.join('\\n'),
icon: 'data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><text y=".9em" font-size="90">📊</text></svg>',
tag: 'system-alert',
requireInteraction: false
});
// 点击后聚焦窗口
notification.onclick = () => {
window.focus();
notification.close();
};
// 5秒后自动关闭
setTimeout(() => notification.close(), 5000);
}
// 检查阈值并弹窗警告
function checkThresholds(data) {
const now = Date.now();
@@ -1713,10 +1942,16 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
lastAlertTime = now;
showAlertPopup(warnings);
}
// 检查邮件通知规则
checkEmailRules(data);
}
// 显示警告弹窗
// 显示警告弹窗(同时发送桌面通知)
function showAlertPopup(warnings) {
// 发送桌面通知
sendDesktopNotification(warnings);
// 移除已有弹窗
const existing = document.querySelector('.alert-popup');
if (existing) existing.remove();
@@ -2139,6 +2374,157 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
localStorage.setItem('customServices', JSON.stringify(services));
}
// ==================== 邮件通知规则管理 ====================
function getEmailRules() {
const stored = localStorage.getItem('emailNotifyRules');
return stored ? JSON.parse(stored) : [];
}
function saveEmailRules(rules) {
localStorage.setItem('emailNotifyRules', JSON.stringify(rules));
}
function renderEmailRules() {
const rules = getEmailRules();
const list = document.getElementById('emailRulesList');
if (rules.length === 0) {
list.innerHTML = '<div class="text-gray-500 text-center py-4">暂无邮件通知规则</div>';
return;
}
const resourceNames = { 'cpu': 'CPU', 'memory': '内存', 'disk': '磁盘' };
list.innerHTML = rules.map(rule => `
<div class="flex items-center justify-between bg-gray-700/50 px-3 py-2 rounded-lg">
<div class="flex items-center gap-3">
<span class="px-2 py-0.5 rounded text-xs ${rule.enabled ? 'bg-green-500/20 text-green-400' : 'bg-gray-500/20 text-gray-400'}">${rule.enabled ? '启用' : '禁用'}</span>
<span class="text-gray-200">${rule.name}</span>
<span class="text-gray-400 text-xs">${resourceNames[rule.resource]} ≥ ${rule.threshold}%</span>
<span class="text-gray-400 text-xs">→ ${rule.email}</span>
</div>
<div class="flex items-center gap-1">
<button onclick="editEmailRule('${rule.id}')" class="text-blue-400 hover:text-blue-300 px-1" title="编辑"><i class="ri-edit-line"></i></button>
<button onclick="deleteEmailRule('${rule.id}')" class="text-red-400 hover:text-red-300 px-1" title="删除"><i class="ri-delete-bin-line"></i></button>
</div>
</div>
`).join('');
}
function showAddEmailRuleModal() {
document.getElementById('emailRuleModalTitle').textContent = '添加邮件通知规则';
document.getElementById('emailRuleId').value = '';
document.getElementById('emailRuleName').value = '';
document.getElementById('emailRuleResource').value = 'cpu';
document.getElementById('emailRuleThreshold').value = 80;
document.getElementById('emailRuleAddress').value = '';
document.getElementById('emailRuleInterval').value = 300;
document.getElementById('emailRuleEnabled').checked = true;
document.getElementById('emailRuleModal').classList.remove('hidden');
}
function closeEmailRuleModal() {
document.getElementById('emailRuleModal').classList.add('hidden');
}
function editEmailRule(ruleId) {
const rules = getEmailRules();
const rule = rules.find(r => r.id === ruleId);
if (!rule) return;
document.getElementById('emailRuleModalTitle').textContent = '编辑邮件通知规则';
document.getElementById('emailRuleId').value = rule.id;
document.getElementById('emailRuleName').value = rule.name;
document.getElementById('emailRuleResource').value = rule.resource;
document.getElementById('emailRuleThreshold').value = rule.threshold;
document.getElementById('emailRuleAddress').value = rule.email;
document.getElementById('emailRuleInterval').value = rule.interval;
document.getElementById('emailRuleEnabled').checked = rule.enabled;
document.getElementById('emailRuleModal').classList.remove('hidden');
}
function saveEmailRule(event) {
event.preventDefault();
const ruleId = document.getElementById('emailRuleId').value;
const name = document.getElementById('emailRuleName').value.trim();
const resource = document.getElementById('emailRuleResource').value;
const threshold = parseInt(document.getElementById('emailRuleThreshold').value);
const email = document.getElementById('emailRuleAddress').value.trim();
const interval = parseInt(document.getElementById('emailRuleInterval').value) || 300;
const enabled = document.getElementById('emailRuleEnabled').checked;
if (!name || !email) {
alert('请填写完整信息');
return;
}
const rules = getEmailRules();
if (ruleId) {
// 编辑
const idx = rules.findIndex(r => r.id === ruleId);
if (idx >= 0) {
rules[idx] = { ...rules[idx], name, resource, threshold, email, interval, enabled };
}
} else {
// 新增
rules.push({
id: 'rule_' + Date.now(),
name, resource, threshold, email, interval, enabled,
lastSent: 0
});
}
saveEmailRules(rules);
closeEmailRuleModal();
renderEmailRules();
}
function deleteEmailRule(ruleId) {
if (!confirm('确定删除此邮件通知规则?')) return;
const rules = getEmailRules().filter(r => r.id !== ruleId);
saveEmailRules(rules);
renderEmailRules();
}
// 检查邮件规则并发送通知
async function checkEmailRules(data) {
const rules = getEmailRules().filter(r => r.enabled);
const now = Date.now();
for (const rule of rules) {
// 检查间隔
if (now - rule.lastSent < rule.interval * 1000) continue;
// 检查阈值
const value = data[rule.resource]?.percent;
if (value === undefined || value < rule.threshold) continue;
// 发送邮件
try {
const res = await fetch('/api/email/send', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
to: rule.email,
subject: `[系统告警] ${rule.name}`,
body: `${rule.name} 触发告警\n\n${rule.resource.toUpperCase()} 使用率: ${value.toFixed(1)}%\n阈值: ${rule.threshold}%\n时间: ${new Date().toLocaleString()}\n\n请及时处理。`
})
});
if (res.ok) {
// 更新发送时间
rule.lastSent = now;
saveEmailRules(getEmailRules().map(r => r.id === rule.id ? rule : r));
}
} catch (e) {
console.error('邮件发送失败:', e);
}
}
}
function showAddServiceModal() {
document.getElementById('serviceName').value = '';
document.getElementById('servicePort').value = '';

Binary file not shown.