coder/project-panel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 邮件通知规则添加静默时间区间

Browse Source
This commit is contained in:
hubian
2026-04-23 23:26:36 +08:00
parent 9202e4c202
commit b2a0b66492
2 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app.py
View File

@@ -1103,7 +1103,7 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>项目服务管理面板 v3.0</title>
<title>项目服务管理面板 v3.1</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">
@@ -1751,6 +1751,18 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
</div>
</div>
<div class="mb-3">
<label class="block text-gray-400 text-sm mb-1">静默时间区间</label>
<p class="text-gray-500 text-xs mb-2">在此时间段内不发送邮件通知（如夜间休息时段）</p>
<div class="flex items-center gap-2">
<input type="time" id="emailRuleSilentStart" class="bg-gray-700 text-gray-200 px-3 py-2 rounded-lg" value="23:00">
<span class="text-gray-400">至</span>
<input type="time" id="emailRuleSilentEnd" class="bg-gray-700 text-gray-200 px-3 py-2 rounded-lg" value="08:00">
<input type="checkbox" id="emailRuleSilentEnabled" class="w-4 h-4 cursor-pointer ml-2">
<label for="emailRuleSilentEnabled" class="text-gray-300 text-xs cursor-pointer">启用静默</label>
</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>
@@ -2396,20 +2408,24 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
const resourceNames = { 'cpu': 'CPU', 'memory': '内存', 'disk': '磁盘' };
list.innerHTML = rules.map(rule => `
list.innerHTML = rules.map(rule => {
const silentInfo = rule.silentEnabled ? `静默:${rule.silentStart}-${rule.silentEnd}` : '';
return `
<div class="flex items-center justify-between bg-gray-700/50 px-3 py-2 rounded-lg">
<div class="flex items-center gap-3">
<div class="flex items-center gap-3 flex-wrap">
<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>
${silentInfo ? `<span class="text-yellow-400/70 text-xs"><i class="ri-moon-line"></i> ${silentInfo}</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('');
`;
}).join('');
}
function showAddEmailRuleModal() {
@@ -2420,6 +2436,9 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
document.getElementById('emailRuleThreshold').value = 80;
document.getElementById('emailRuleAddress').value = '';
document.getElementById('emailRuleInterval').value = 300;
document.getElementById('emailRuleSilentStart').value = '23:00';
document.getElementById('emailRuleSilentEnd').value = '08:00';
document.getElementById('emailRuleSilentEnabled').checked = false;
document.getElementById('emailRuleEnabled').checked = true;
document.getElementById('emailRuleModal').classList.remove('hidden');
}
@@ -2440,6 +2459,9 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
document.getElementById('emailRuleThreshold').value = rule.threshold;
document.getElementById('emailRuleAddress').value = rule.email;
document.getElementById('emailRuleInterval').value = rule.interval;
document.getElementById('emailRuleSilentStart').value = rule.silentStart || '23:00';
document.getElementById('emailRuleSilentEnd').value = rule.silentEnd || '08:00';
document.getElementById('emailRuleSilentEnabled').checked = rule.silentEnabled || false;
document.getElementById('emailRuleEnabled').checked = rule.enabled;
document.getElementById('emailRuleModal').classList.remove('hidden');
}
@@ -2453,6 +2475,9 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
const threshold = parseInt(document.getElementById('emailRuleThreshold').value);
const email = document.getElementById('emailRuleAddress').value.trim();
const interval = parseInt(document.getElementById('emailRuleInterval').value) || 300;
const silentStart = document.getElementById('emailRuleSilentStart').value;
const silentEnd = document.getElementById('emailRuleSilentEnd').value;
const silentEnabled = document.getElementById('emailRuleSilentEnabled').checked;
const enabled = document.getElementById('emailRuleEnabled').checked;
if (!name || !email) {
@@ -2466,13 +2491,13 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
// 编辑
const idx = rules.findIndex(r => r.id === ruleId);
if (idx >= 0) {
rules[idx] = { ...rules[idx], name, resource, threshold, email, interval, enabled };
rules[idx] = { ...rules[idx], name, resource, threshold, email, interval, silentStart, silentEnd, silentEnabled, enabled };
}
} else {
// 新增
rules.push({
id: 'rule_' + Date.now(),
name, resource, threshold, email, interval, enabled,
name, resource, threshold, email, interval, silentStart, silentEnd, silentEnabled, enabled,
lastSent: 0
});
}
@@ -2493,11 +2518,36 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
async function checkEmailRules(data) {
const rules = getEmailRules().filter(r => r.enabled);
const now = Date.now();
const nowTime = new Date();
const currentHour = nowTime.getHours();
const currentMin = nowTime.getMinutes();
const currentTimeStr = `${currentHour.toString().padStart(2, '0')}:${currentMin.toString().padStart(2, '0')}`;
for (const rule of rules) {
// 检查间隔
if (now - rule.lastSent < rule.interval * 1000) continue;
// 检查静默时间
if (rule.silentEnabled && rule.silentStart && rule.silentEnd) {
const start = rule.silentStart;
const end = rule.silentEnd;
// 处理跨越午夜的情况（如23:00到08:00）
let inSilentPeriod = false;
if (start > end) {
// 跨越午夜：如23:00-08:00，则currentTime >= start 或 currentTime < end 都在静默区间
inSilentPeriod = (currentTimeStr >= start || currentTimeStr < end);
} else {
// 同一天内：如01:00-06:00
inSilentPeriod = (currentTimeStr >= start && currentTimeStr < end);
}
if (inSilentPeriod) {
console.log(`规则 ${rule.name} 当前在静默时间段 ${start}-${end}，跳过发送`);
continue;
}
}
// 检查阈值
const value = data[rule.resource]?.percent;
if (value === undefined || value < rule.threshold) continue;

BIN
logs/app.log
View File

Binary file not shown.