11 Commits

Author SHA1 Message Date
Your Name d8eb6824b8 fix: email config save 返回缺少 enabled 字段导致前端显示配置不完整 2026-07-15 12:09:04 +08:00
Your Name f3145369c4 fix: 解析器支持 Z2 'logic drawers' 输出格式
Cluster 正则从硬编码 'boards' 改为兼容 'boards|logic drawers',
修复 Palladium Z2 test_server 输出无法解析逻辑板信息的问题。
2026-07-14 16:05:12 +08:00
Hermes 83621cb213 sync: import complete app.py/mailer.py/collect.py + dev customizations
完整功能 (相对于 ac9a060):
- app.py: 1276 行 (vs 633 行) — 含 /api/email/* + /api/export + Chart 小数
- mailer.py: 645 行 — SMTP 邮件模块 + scheduler
- collect.py: 233 行 — Python 3.6 兼容 (typing.Dict 代替 dict[X,Y])
- README.md: 整合版
- templates/email_config.html: 邮件配置 Web UI
- static/style.css: 邮件状态徽章等新样式

清理:
- 删除 'palladium-monitor/' 子目录 (远端残留, 已废弃)
2026-07-08 15:23:24 +08:00
Your Name ac9a060b46 feat: 新增 systemd service 文件 (palladium-monitor.service) 2026-07-08 14:48:35 +08:00
Your Name 6726524c50 fix: db.get_or_404 -> query.get_or_404 + rename to Palladium Monitor
- 修复删除快照时 AttributeError: SQLAlchemy.get_or_404 (低版本兼容)
- UI/标题/邮件主题从 'Palladium Z1 Monitor' 改为 'Palladium Monitor'
2026-07-08 14:46:18 +08:00
Your Name 89dc6b4449 feat: 邮件配置页面 + 数据库持久化
- 新增 /email 配置页面 + /api/email/config API (GET/POST)
- 新增 /api/email/test-send 测试邮件 + /api/email/reset 重置
- EmailConfig SQLite 表持久化配置,回退到环境变量
- mailer: get_config 优先读 DB,send_report 读取 DB 密码
- 修复 _send_smtp 登录使用环境变量密码的 bug
- 前端新增配置表单 (启用开关/SMTP/TLS/认证/发件人/收件人/时间)
- CSS 暗色主题样式 + 响应式适配
- 导航栏新增「设置」链接
2026-07-08 14:36:41 +08:00
Your Name 3ab73805a3 mail 2026-07-08 13:28:47 +08:00
Your Name da2fd92f07 support python36 2026-07-08 13:00:06 +08:00
AI Agent 5250c2960c Palladium Z1 Monitor - LD逻辑板监控系统
- 解析 test_server -short 输出 (Rack/Cluster/Board/D0-D7)
- 暗色主题仪表板: 逻辑板状态可视化、利用率、作业信息、T-Pod可用性
- 板级统计: 使用/空闲/离线, 利用率趋势图 (Chart.js)
- collect.sh: Shell采集脚本(cron定时推送, 无需Python)
- 历史快照管理: 查看详情/删除/清理
- systemd service 开机自启
2026-07-08 12:51:16 +08:00
AI Agent 91f52941d6 Merge branch 'master' of ssh://git.cnbugs.com:10022/AI-Agent/palladium-monitor 2026-07-08 12:13:49 +08:00
Hermes 187f37f8e7 fix: add 'from __future__ import annotations' for Python <3.10
PEP 585 内建泛型 (tuple[str, str], dict[str, int]) 在 Python 3.9 之前不支持。
PEP 563 让所有 type hint 变成字符串, 兼容 Python 3.7+。

错误: 'type' object is not subscriptable
影响: app.py:1184 start_email_scheduler() -> import mailer -> mailer.py:417
修复: mailer.py / app.py 顶部加 from __future__ import annotations
2026-07-08 12:13:31 +08:00
15 changed files with 883 additions and 82 deletions
+4
View File
@@ -0,0 +1,4 @@
instance/
__pycache__/
*.pyc
.env
+5 -5
View File
@@ -1,6 +1,6 @@
# Palladium Z1 Monitor # Palladium Monitor
LD 逻辑板使用监控系统 — 解析 `test_server -short` 输出,可视化展示 Palladium Z1 仿真器的逻辑板状态、逻辑板利用率、作业信息和 T-Pod 可用性。 LD 逻辑板使用监控系统 — 解析 `test_server -short` 输出,可视化展示 Palladium 仿真器的逻辑板状态、逻辑板利用率、作业信息和 T-Pod 可用性。
## 功能 ## 功能
@@ -37,7 +37,7 @@ python3 app.py
### 方式二:API 推送 (collect.py + 一键安装) ### 方式二:API 推送 (collect.py + 一键安装)
在 Palladium Z1 主机上部署采集 agent,**推荐**用一键脚本(处理 env 加载、crontab、依赖): 在 Palladium 主机上部署采集 agent,**推荐**用一键脚本(处理 env 加载、crontab、依赖):
```bash ```bash
# 把 palladium-monitor/ 整个目录 scp 到 Z1 主机, 然后: # 把 palladium-monitor/ 整个目录 scp 到 Z1 主机, 然后:
@@ -194,7 +194,7 @@ gunicorn --workers 2 --bind 0.0.0.0:5100 app:app
| `SMTP_USE_TLS` | ❌ | `true` | 是否用 STARTTLS (端口 587 时设为 `true`) | | `SMTP_USE_TLS` | ❌ | `true` | 是否用 STARTTLS (端口 587 时设为 `true`) |
| `SMTP_USE_SSL` | ❌ | `false` | 是否用隐式 SSL (端口 465 时设为 `true`) | | `SMTP_USE_SSL` | ❌ | `false` | 是否用隐式 SSL (端口 465 时设为 `true`) |
| `MAIL_FROM` | 启用时必填 | — | 发件人邮箱 | | `MAIL_FROM` | 启用时必填 | — | 发件人邮箱 |
| `MAIL_FROM_NAME` | ❌ | `Palladium Z1 Monitor` | 发件人显示名 | | `MAIL_FROM_NAME` | ❌ | `Palladium Monitor` | 发件人显示名 |
| `MAIL_TO` | 启用时必填 | — | 收件人列表, 英文逗号分隔 (如 `alice@x.com,bob@y.com`) | | `MAIL_TO` | 启用时必填 | — | 收件人列表, 英文逗号分隔 (如 `alice@x.com,bob@y.com`) |
| `MAIL_SEND_HOUR` | ❌ | `9` | 每天发送时间-小时 (0-23) | | `MAIL_SEND_HOUR` | ❌ | `9` | 每天发送时间-小时 (0-23) |
| `MAIL_SEND_MINUTE` | ❌ | `0` | 每天发送时间-分钟 (0-59) | | `MAIL_SEND_MINUTE` | ❌ | `0` | 每天发送时间-分钟 (0-59) |
@@ -251,7 +251,7 @@ ExecStart=/usr/bin/gunicorn --workers 2 --bind 0.0.0.0:5100 app:app
#### 邮件内容示例 #### 邮件内容示例
每日报告包含: 每日报告包含:
- **主题**: `[Palladium Z1] 每日报告 YYYY-MM-DD — 利用率 X.X%` - **主题**: `[Palladium] 每日报告 YYYY-MM-DD — 利用率 X.X%`
- **正文 (HTML + 纯文本)**: 系统信息 / 当前指标卡片 / 近 24h 趋势统计 + 样本柱状图 / 离线板列表 / 活跃作业列表 - **正文 (HTML + 纯文本)**: 系统信息 / 当前指标卡片 / 近 24h 趋势统计 + 样本柱状图 / 离线板列表 / 活跃作业列表
- **多部分**: 同时发 HTML 和纯文本, 邮件客户端自动选最合适的渲染 - **多部分**: 同时发 HTML 和纯文本, 邮件客户端自动选最合适的渲染
Binary file not shown.
Binary file not shown.
+96 -8
View File
@@ -1,8 +1,9 @@
from typing import List, Dict, Tuple, Set, Any, Optional, Union
#!/usr/bin/env python3 #!/usr/bin/env python3
""" """
Palladium Z1 Monitor — LD逻辑板使用监控系统 Palladium Monitor — LD逻辑板使用监控系统
解析 `test_server -short` 输出,展示 Palladium Z1 仿真器的 解析 `test_server -short` 输出,展示 Palladium 仿真器的
逻辑板 (LD) 状态、逻辑板利用率、作业信息和 T-Pod 可用性。 逻辑板 (LD) 状态、逻辑板利用率、作业信息和 T-Pod 可用性。
支持两种数据来源: 支持两种数据来源:
@@ -10,6 +11,7 @@ Palladium Z1 Monitor — LD逻辑板使用监控系统
2. API 推送 — 在 Palladium 主机运行 collect.py 远程推送 2. API 推送 — 在 Palladium 主机运行 collect.py 远程推送
""" """
import os import os
import re import re
import io import io
@@ -204,9 +206,9 @@ def parse_test_server_output(raw_text: str) -> dict:
}) })
continue continue
# Cluster 头: "Cluster 0 has 6 boards CCD: ONLINE" # Cluster 头: "Cluster 0 has 6 boards CCD: ONLINE" (Z1) 或 "Cluster 0 has 6 logic drawers CCD: ONLINE" (Z2)
cluster_match = re.match( cluster_match = re.match(
r"Cluster\s+(\d+)\s+has\s+(\d+)\s+boards\s+CCD:\s*(\w+)", line r"Cluster\s+(\d+)\s+has\s+(\d+)\s+(?:boards?|logic\s+drawers?)\s+CCD:\s*(\w+)", line
) )
if cluster_match and result["racks"]: if cluster_match and result["racks"]:
current_cluster = int(cluster_match.group(1)) current_cluster = int(cluster_match.group(1))
@@ -518,7 +520,7 @@ def history():
@app.route("/snapshot/<int:sid>") @app.route("/snapshot/<int:sid>")
def snapshot_detail(sid): def snapshot_detail(sid):
"""单条快照详情。""" """单条快照详情。"""
snapshot = db.get_or_404(ScanSnapshot, sid) snapshot = ScanSnapshot.query.get_or_404(sid)
stats = { stats = {
"total_boards": snapshot.total_boards, "total_boards": snapshot.total_boards,
"online_boards": snapshot.online_boards, "online_boards": snapshot.online_boards,
@@ -679,7 +681,7 @@ def api_history():
@app.route("/api/snapshot/<int:sid>/delete", methods=["POST"]) @app.route("/api/snapshot/<int:sid>/delete", methods=["POST"])
def delete_snapshot(sid): def delete_snapshot(sid):
"""删除指定快照。""" """删除指定快照。"""
snapshot = db.get_or_404(ScanSnapshot, sid) snapshot = ScanSnapshot.query.get_or_404(sid)
db.session.delete(snapshot) db.session.delete(snapshot)
db.session.commit() db.session.commit()
return redirect(url_for("history")) return redirect(url_for("history"))
@@ -698,6 +700,17 @@ def cleanup_old():
return jsonify({"ok": True, "deleted": count}) return jsonify({"ok": True, "deleted": count})
# ═══════════════════════════════════════════════════════════════════════════
# EmailConfig — 邮件配置持久化 (Web UI 写入, mailer 读取)
# ═══════════════════════════════════════════════════════════════════════════
class EmailConfig(db.Model):
__tablename__ = 'email_config'
id = db.Column(db.Integer, primary_key=True)
key = db.Column(db.String(50), unique=True, nullable=False)
value = db.Column(db.Text, nullable=False, default='')
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# ═══════════════════════════════════════════════════════════════════════════ # ═══════════════════════════════════════════════════════════════════════════
# Email Routes (延迟导入 mailer, 避免在 mailer 缺失时整个 app 起不来) # Email Routes (延迟导入 mailer, 避免在 mailer 缺失时整个 app 起不来)
# ═══════════════════════════════════════════════════════════════════════════ # ═══════════════════════════════════════════════════════════════════════════
@@ -754,6 +767,81 @@ def email_preview():
headers={"Content-Disposition": 'inline; filename="mail-preview.txt"'}) headers={"Content-Disposition": 'inline; filename="mail-preview.txt"'})
@app.route("/email")
def email_config():
"""邮件配置页面。"""
return render_template("email_config.html")
@app.route("/api/email/config")
def email_config_api():
"""获取完整邮件配置 (含密码, 仅本地管理用)。"""
ml = _get_mailer()
if not ml:
return jsonify({"ok": False, "error": "mailer.py 不可用"}), 500
cfg = ml.get_config_full()
errs = ml.config_errors(cfg)
return jsonify({
"ok": True,
"configured": len(errs) == 0,
"config_errors": errs,
**cfg,
})
@app.route("/api/email/config", methods=["POST"])
def email_config_save():
"""保存邮件配置到数据库。"""
data = request.get_json(silent=True) or {}
ml = _get_mailer()
if not ml:
return jsonify({"ok": False, "error": "mailer.py 不可用"}), 500
try:
saved = ml.save_config(data)
except Exception as e:
return jsonify({"ok": False, "error": f"保存失败: {e}"}), 500
cfg = ml.get_config_full()
errs = ml.config_errors(cfg)
return jsonify({
"ok": True,
"saved": saved,
"enabled": cfg["enabled"],
"configured": len(errs) == 0,
"config_errors": errs,
})
@app.route("/api/email/reset", methods=["POST"])
def email_config_reset():
"""清除数据库配置, 回退到环境变量。"""
ml = _get_mailer()
if not ml:
return jsonify({"ok": False, "error": "mailer.py 不可用"}), 500
try:
ml.reset_config()
except Exception as e:
return jsonify({"ok": False, "error": f"重置失败: {e}"}), 500
cfg = ml.get_config_full()
errs = ml.config_errors(cfg)
return jsonify({
"ok": True,
"message": "已清除数据库配置, 回退到环境变量",
"configured": len(errs) == 0,
"config_errors": errs,
})
@app.route("/api/email/test-send", methods=["POST"])
def email_test_send():
"""发送测试邮件 (从 UI 手动触发)。"""
ml = _get_mailer()
if not ml:
return jsonify({"ok": False, "error": "mailer.py 不可用"}), 500
result = ml.send_report()
status = 200 if result["ok"] else 500
return jsonify(result), status
@app.route("/api/email/send", methods=["POST"]) @app.route("/api/email/send", methods=["POST"])
def email_send(): def email_send():
""" """
@@ -796,7 +884,7 @@ def _scheduler_loop():
print("[scheduler] 邮件调度线程已启动", flush=True) print("[scheduler] 邮件调度线程已启动", flush=True)
while True: while True:
try: try:
cfg = mailer.get_config() cfg = mailer.get_config_full()
if not cfg["enabled"]: if not cfg["enabled"]:
# 关闭, 每小时看一眼 # 关闭, 每小时看一眼
time.sleep(3600) time.sleep(3600)
@@ -1183,7 +1271,7 @@ if __name__ == "__main__":
seed_sample_data() seed_sample_data()
start_email_scheduler() start_email_scheduler()
print("════════════════════════════════════════════════════════") print("════════════════════════════════════════════════════════")
print(" Palladium Z1 Monitor") print(" Palladium Monitor")
print(" http://0.0.0.0:5100") print(" http://0.0.0.0:5100")
print("════════════════════════════════════════════════════════") print("════════════════════════════════════════════════════════")
app.run(host="0.0.0.0", port=5100, debug=True) app.run(host="0.0.0.0", port=5100, debug=True)
+9 -8
View File
@@ -1,8 +1,9 @@
from typing import List, Dict, Tuple, Set, Any, Optional, Union
#!/usr/bin/env python3 #!/usr/bin/env python3
""" """
collect.py — Palladium Z1 远程数据采集推送脚本 collect.py — Palladium 远程数据采集推送脚本
在 Palladium Z1 主机上运行,执行 test_server -short 并将结果推送到监控服务器。 在 Palladium 主机上运行,执行 test_server -short 并将结果推送到监控服务器。
用法: 用法:
python3 collect.py # 默认配置 python3 collect.py # 默认配置
@@ -46,7 +47,7 @@ DEFAULT_RETRY_DELAY = 5
class Logger: class Logger:
"""同时输出到 stderr 和可选的日志文件。""" """同时输出到 stderr 和可选的日志文件。"""
def __init__(self, log_file: str | None = None): def __init__(self, log_file: Optional[str] = None):
self.log_file = log_file self.log_file = log_file
def _emit(self, level: str, msg: str, ts: str) -> None: def _emit(self, level: str, msg: str, ts: str) -> None:
@@ -73,7 +74,7 @@ class Logger:
# ═══════════════════════════════════════════════════════════════════════════ # ═══════════════════════════════════════════════════════════════════════════
# Command Execution # Command Execution
# ═══════════════════════════════════════════════════════════════════════════ # ═══════════════════════════════════════════════════════════════════════════
def build_shell_cmd(cmd: str, env_script: str | None) -> str: def build_shell_cmd(cmd: str, env_script: Optional[str]) -> str:
""" """
如果指定了 env_script,把 source env 之后再执行 cmd 拼成一个 shell 串。 如果指定了 env_script,把 source env 之后再执行 cmd 拼成一个 shell 串。
不指定则直接返回 cmd。 不指定则直接返回 cmd。
@@ -90,7 +91,7 @@ def shlex_quote(s: str) -> str:
return "'" + s.replace("'", "'\\''") + "'" return "'" + s.replace("'", "'\\''") + "'"
def run_test_server(cmd: str, timeout: int, env_script: str | None) -> tuple[str, int, str]: def run_test_server(cmd: str, timeout: int, env_script: Optional[str]) -> Tuple[str, int, str]:
""" """
执行 test_server -short, 返回 (stdout, returncode, stderr)。 执行 test_server -short, 返回 (stdout, returncode, stderr)。
timeout 触发时 subprocess.run 不会抛 (>=3.12 subprocessing 时可能抛), 这里显式处理。 timeout 触发时 subprocess.run 不会抛 (>=3.12 subprocessing 时可能抛), 这里显式处理。
@@ -101,7 +102,7 @@ def run_test_server(cmd: str, timeout: int, env_script: str | None) -> tuple[str
full_cmd, full_cmd,
shell=True, shell=True,
executable="/bin/bash", executable="/bin/bash",
capture_output=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
timeout=timeout, timeout=timeout,
) )
except subprocess.TimeoutExpired as e: except subprocess.TimeoutExpired as e:
@@ -120,7 +121,7 @@ def run_test_server(cmd: str, timeout: int, env_script: str | None) -> tuple[str
# ═══════════════════════════════════════════════════════════════════════════ # ═══════════════════════════════════════════════════════════════════════════
def push_to_monitor(url: str, raw_output: str, source: str, def push_to_monitor(url: str, raw_output: str, source: str,
retries: int, retry_delay: int, retries: int, retry_delay: int,
log: Logger) -> tuple[bool, dict | None, str]: log: Logger) -> Tuple[bool, Optional[Dict], str]:
"""带重试的 HTTP 推送, 返回 (ok, json_body_or_None, error_msg)。""" """带重试的 HTTP 推送, 返回 (ok, json_body_or_None, error_msg)。"""
payload = {"raw_output": raw_output, "source": source} payload = {"raw_output": raw_output, "source": source}
last_err = "" last_err = ""
@@ -152,7 +153,7 @@ def push_to_monitor(url: str, raw_output: str, source: str,
# ═══════════════════════════════════════════════════════════════════════════ # ═══════════════════════════════════════════════════════════════════════════
def main() -> int: def main() -> int:
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description="Palladium Z1 数据采集推送 (cron 友好, 带重试和日志)", description="Palladium 数据采集推送 (cron 友好, 带重试和日志)",
formatter_class=argparse.ArgumentDefaultsHelpFormatter, formatter_class=argparse.ArgumentDefaultsHelpFormatter,
) )
parser.add_argument("--url", default=DEFAULT_URL, parser.add_argument("--url", default=DEFAULT_URL,
+155 -21
View File
@@ -1,10 +1,12 @@
from typing import List, Dict, Tuple, Set, Any, Optional, Union
""" """
mailer.py — Palladium Z1 每日报告邮件发送 mailer.py — Palladium 每日报告邮件发送
通过 SMTP 把"今日快照 + 24h 趋势"汇总发送到指定邮箱。 通过 SMTP 把"今日快照 + 24h 趋势"汇总发送到指定邮箱。
所有配置都从环境变量读 (生产建议用 systemd EnvironmentFile 或 .env)。 所有配置都从环境变量读 (生产建议用 systemd EnvironmentFile 或 .env)。
""" """
import os import os
import smtplib import smtplib
import socket import socket
@@ -32,33 +34,161 @@ def _bool(name: str, default: bool = False) -> bool:
return default return default
def _int(name: str, default: int) -> int: def _int_env(name: str, default: int) -> int:
try: try:
return int(os.environ.get(name, "").strip()) return int(os.environ.get(name, "").strip())
except (TypeError, ValueError): except (TypeError, ValueError):
return default return default
def get_config() -> dict: # ═══════════════════════════════════════════════════════════════════════════
"""读取并返回当前生效的邮件配置 (用于 /api/email/status 显示)。""" # 数据库配置持久化
# ═══════════════════════════════════════════════════════════════════════════
def _get_email_config_model():
"""惰性获取 EmailConfig 模型 (避免循环导入)。"""
try:
from app import EmailConfig
return EmailConfig
except (ImportError, AttributeError):
return None
def _read_db_config() -> Optional[Dict[str, str]]:
"""从 EmailConfig 表读取配置, 返回 {key: value} dict, 无记录返回 None。"""
Model = _get_email_config_model()
if not Model:
return None
try:
with app.app_context():
rows = Model.query.all()
if not rows:
return None
return {r.key: r.value for r in rows}
except Exception:
return None
def _build_config_from_env() -> dict:
"""从环境变量读取配置 (原始逻辑)。"""
return { return {
"enabled": _bool("MAIL_ENABLED", False), "enabled": _bool("MAIL_ENABLED", False),
"smtp_host": os.environ.get("SMTP_HOST", "").strip(), "smtp_host": os.environ.get("SMTP_HOST", "").strip(),
"smtp_port": _int("SMTP_PORT", 587), "smtp_port": _int_env("SMTP_PORT", 587),
"smtp_user": os.environ.get("SMTP_USER", "").strip(), "smtp_user": os.environ.get("SMTP_USER", "").strip(),
"smtp_password_set": bool(os.environ.get("SMTP_PASSWORD", "").strip()), "smtp_password_set": bool(os.environ.get("SMTP_PASSWORD", "").strip()),
"smtp_use_tls": _bool("SMTP_USE_TLS", True), "smtp_use_tls": _bool("SMTP_USE_TLS", True),
"smtp_use_ssl": _bool("SMTP_USE_SSL", False), "smtp_use_ssl": _bool("SMTP_USE_SSL", False),
"from_addr": os.environ.get("MAIL_FROM", "").strip(), "from_addr": os.environ.get("MAIL_FROM", "").strip(),
"from_name": os.environ.get("MAIL_FROM_NAME", "Palladium Z1 Monitor").strip(), "from_name": os.environ.get("MAIL_FROM_NAME", "Palladium Monitor").strip(),
"to_addrs": [a.strip() for a in os.environ.get("MAIL_TO", "").split(",") if a.strip()], "to_addrs": [a.strip() for a in os.environ.get("MAIL_TO", "").split(",") if a.strip()],
"send_hour": _int("MAIL_SEND_HOUR", 9), # 每天 09:00 "send_hour": _int_env("MAIL_SEND_HOUR", 9),
"send_minute": _int("MAIL_SEND_MINUTE", 0), "send_minute": _int_env("MAIL_SEND_MINUTE", 0),
"monitor_base_url": os.environ.get("MONITOR_BASE_URL", "http://127.0.0.1:5100").strip(), "monitor_base_url": os.environ.get("MONITOR_BASE_URL", "http://127.0.0.1:5100").strip(),
} }
def config_errors(cfg: dict) -> list[str]: def _build_config_from_dict(raw: Dict[str, str]) -> dict:
"""从数据库 {key: value} dict 构建配置。"""
def _s(key: str, default: str = "") -> str:
return raw.get(key, default).strip()
def _b(key: str, default: bool) -> bool:
v = raw.get(key, "").strip().lower()
return v in ("1", "true", "yes", "y", "on")
def _i(key: str, default: int) -> int:
try:
return int(raw.get(key, str(default)))
except (TypeError, ValueError):
return default
return {
"enabled": _b("enabled", False),
"smtp_host": _s("smtp_host"),
"smtp_port": _i("smtp_port", 587),
"smtp_user": _s("smtp_user"),
"smtp_password_set": bool(_s("smtp_password")),
"smtp_use_tls": _b("smtp_use_tls", True),
"smtp_use_ssl": _b("smtp_use_ssl", False),
"from_addr": _s("from_addr"),
"from_name": _s("from_name") or "Palladium Monitor",
"to_addrs": [a.strip() for a in _s("to_addrs").split(",") if a.strip()],
"send_hour": _i("send_hour", 9),
"send_minute": _i("send_minute", 0),
"monitor_base_url": _s("monitor_base_url") or "http://127.0.0.1:5100",
}
def save_config(data: dict) -> int:
"""保存配置到数据库。返回保存的键数。"""
Model = _get_email_config_model()
if not Model:
raise RuntimeError("EmailConfig 模型不可用")
to_addrs = data.get("to_addrs")
if isinstance(to_addrs, list):
to_addrs_str = ",".join(str(x) for x in to_addrs if x)
else:
to_addrs_str = str(to_addrs or "")
save_fields = {
"enabled": str(data.get("enabled", False)).lower(),
"smtp_host": str(data.get("smtp_host", "")).strip(),
"smtp_port": str(data.get("smtp_port", 587)),
"smtp_user": str(data.get("smtp_user", "")).strip(),
"smtp_password": str(data.get("smtp_password", "")),
"smtp_use_tls": str(data.get("smtp_use_tls", True)).lower(),
"smtp_use_ssl": str(data.get("smtp_use_ssl", False)).lower(),
"from_addr": str(data.get("from_addr", "")).strip(),
"from_name": str(data.get("from_name", "Palladium Monitor")).strip(),
"to_addrs": to_addrs_str.strip(),
"send_hour": str(data.get("send_hour", 9)),
"send_minute": str(data.get("send_minute", 0)),
"monitor_base_url": str(data.get("monitor_base_url", "http://127.0.0.1:5100")).strip(),
}
count = 0
with app.app_context():
for key, value in save_fields.items():
row = Model.query.filter_by(key=key).first()
if row:
row.value = value
else:
db.session.add(Model(key=key, value=value))
count += 1
db.session.commit()
return count
def reset_config() -> bool:
"""清除数据库配置, 回退到环境变量。"""
Model = _get_email_config_model()
if not Model:
return False
with app.app_context():
Model.query.delete()
db.session.commit()
return True
def get_config() -> dict:
"""读取邮件配置。优先使用数据库存储的配置, 回退到环境变量。"""
db_raw = _read_db_config()
if db_raw is not None:
return _build_config_from_dict(db_raw)
return _build_config_from_env()
def get_config_full() -> dict:
"""读取完整配置 (含密码原始值)。优先 DB, 回退到环境变量。"""
cfg = get_config()
db_raw = _read_db_config()
if db_raw is not None:
cfg["smtp_password"] = db_raw.get("smtp_password", "").strip()
else:
cfg["smtp_password"] = os.environ.get("SMTP_PASSWORD", "").strip()
return cfg
def config_errors(cfg: dict) -> List[str]:
"""检查配置是否完整可发送。返回缺失/错误项的列表 (空=OK)。""" """检查配置是否完整可发送。返回缺失/错误项的列表 (空=OK)。"""
errs = [] errs = []
if not cfg["enabled"]: if not cfg["enabled"]:
@@ -180,11 +310,11 @@ def _render_text(data: dict, base_url: str) -> str:
"""纯文本版本 (HTML 不支持时回退)。""" """纯文本版本 (HTML 不支持时回退)。"""
latest = data["latest"] latest = data["latest"]
if not latest: if not latest:
return "Palladium Z1 Monitor — 当前无快照数据, 无法生成报告。\n" return "Palladium Monitor — 当前无快照数据, 无法生成报告。\n"
lines = [] lines = []
title_date = _fmt_ts(latest.timestamp, "%Y-%m-%d") title_date = _fmt_ts(latest.timestamp, "%Y-%m-%d")
lines.append(f"Palladium Z1 每日报告 — {title_date}") lines.append(f"Palladium 每日报告 — {title_date}")
lines.append("=" * 60) lines.append("=" * 60)
lines.append(f"生成时间: {_fmt_ts(data['now_utc'])} UTC") lines.append(f"生成时间: {_fmt_ts(data['now_utc'])} UTC")
lines.append(f"快照时间: {_fmt_ts(latest.timestamp)}") lines.append(f"快照时间: {_fmt_ts(latest.timestamp)}")
@@ -251,7 +381,7 @@ def _render_html(data: dict, base_url: str) -> str:
if not latest: if not latest:
return ( return (
'<html><body style="font-family:sans-serif;padding:20px">' '<html><body style="font-family:sans-serif;padding:20px">'
'<h2>Palladium Z1 Monitor</h2>' '<h2>Palladium Monitor</h2>'
'<p>当前无快照数据, 无法生成报告。</p>' '<p>当前无快照数据, 无法生成报告。</p>'
'</body></html>' '</body></html>'
) )
@@ -345,7 +475,7 @@ def _render_html(data: dict, base_url: str) -> str:
<!-- Header --> <!-- Header -->
<div style="background:linear-gradient(135deg,#007bff,#0056b3);color:#fff;padding:24px 28px"> <div style="background:linear-gradient(135deg,#007bff,#0056b3);color:#fff;padding:24px 28px">
<h1 style="margin:0;font-size:22px">⚡ Palladium Z1 每日报告</h1> <h1 style="margin:0;font-size:22px">⚡ Palladium 每日报告</h1>
<div style="margin-top:6px;opacity:0.9;font-size:14px">{title_date}</div> <div style="margin-top:6px;opacity:0.9;font-size:14px">{title_date}</div>
</div> </div>
@@ -402,7 +532,7 @@ def _render_html(data: dict, base_url: str) -> str:
<!-- Footer --> <!-- Footer -->
<div style="background:#f8f9fa;padding:16px 28px;border-top:1px solid #e0e0e0; <div style="background:#f8f9fa;padding:16px 28px;border-top:1px solid #e0e0e0;
font-size:12px;color:#888;text-align:center"> font-size:12px;color:#888;text-align:center">
由 <a href="{base_url}/" style="color:#007bff;text-decoration:none">Palladium Z1 Monitor</a> 自动生成 · 由 <a href="{base_url}/" style="color:#007bff;text-decoration:none">Palladium Monitor</a> 自动生成 ·
{_fmt_ts(data['now_utc'], '%Y-%m-%d %H:%M:%S')} UTC {_fmt_ts(data['now_utc'], '%Y-%m-%d %H:%M:%S')} UTC
</div> </div>
@@ -414,7 +544,7 @@ def _render_html(data: dict, base_url: str) -> str:
# ═══════════════════════════════════════════════════════════════════════════ # ═══════════════════════════════════════════════════════════════════════════
# 发送 # 发送
# ═══════════════════════════════════════════════════════════════════════════ # ═══════════════════════════════════════════════════════════════════════════
def render_report(data: dict, cfg: dict) -> tuple[str, str, str]: def render_report(data: dict, cfg: dict) -> Tuple[str, str, str]:
"""返回 (subject, html, text)。""" """返回 (subject, html, text)。"""
latest = data["latest"] latest = data["latest"]
if latest: if latest:
@@ -422,13 +552,13 @@ def render_report(data: dict, cfg: dict) -> tuple[str, str, str]:
else: else:
title_date = _fmt_ts(data["now_utc"], "%Y-%m-%d") title_date = _fmt_ts(data["now_utc"], "%Y-%m-%d")
util = f"{latest.utilization:.1f}%" if latest else "" util = f"{latest.utilization:.1f}%" if latest else ""
subject = f"[Palladium Z1] 每日报告 {title_date} — 利用率 {util}" subject = f"[Palladium] 每日报告 {title_date} — 利用率 {util}"
html = _render_html(data, cfg["monitor_base_url"]) html = _render_html(data, cfg["monitor_base_url"])
text = _render_text(data, cfg["monitor_base_url"]) text = _render_text(data, cfg["monitor_base_url"])
return subject, html, text return subject, html, text
def _send_smtp(cfg: dict, subject: str, html: str, text: str) -> tuple[bool, str]: def _send_smtp(cfg: dict, subject: str, html: str, text: str) -> Tuple[bool, str]:
"""实际 SMTP 发送, 返回 (ok, error_msg)。""" """实际 SMTP 发送, 返回 (ok, error_msg)。"""
msg = MIMEMultipart("alternative") msg = MIMEMultipart("alternative")
msg["Subject"] = subject msg["Subject"] = subject
@@ -438,12 +568,16 @@ def _send_smtp(cfg: dict, subject: str, html: str, text: str) -> tuple[bool, str
msg.attach(MIMEText(text, "plain", "utf-8")) msg.attach(MIMEText(text, "plain", "utf-8"))
msg.attach(MIMEText(html, "html", "utf-8")) msg.attach(MIMEText(html, "html", "utf-8"))
password = cfg.get("smtp_password", "")
if not password:
password = os.environ.get("SMTP_PASSWORD", "")
try: try:
if cfg["smtp_use_ssl"]: if cfg["smtp_use_ssl"]:
# SMTP_SSL (port 465) # SMTP_SSL (port 465)
ctx = ssl.create_default_context() ctx = ssl.create_default_context()
with smtplib.SMTP_SSL(cfg["smtp_host"], cfg["smtp_port"], context=ctx, timeout=30) as s: with smtplib.SMTP_SSL(cfg["smtp_host"], cfg["smtp_port"], context=ctx, timeout=30) as s:
s.login(cfg["smtp_user"], os.environ.get("SMTP_PASSWORD", "")) s.login(cfg["smtp_user"], password)
s.sendmail(cfg["from_addr"], cfg["to_addrs"], msg.as_string()) s.sendmail(cfg["from_addr"], cfg["to_addrs"], msg.as_string())
else: else:
# STARTTLS (port 587) 或 明文 (port 25) # STARTTLS (port 587) 或 明文 (port 25)
@@ -452,7 +586,7 @@ def _send_smtp(cfg: dict, subject: str, html: str, text: str) -> tuple[bool, str
if cfg["smtp_use_tls"]: if cfg["smtp_use_tls"]:
s.starttls() s.starttls()
s.ehlo() s.ehlo()
s.login(cfg["smtp_user"], os.environ.get("SMTP_PASSWORD", "")) s.login(cfg["smtp_user"], password)
s.sendmail(cfg["from_addr"], cfg["to_addrs"], msg.as_string()) s.sendmail(cfg["from_addr"], cfg["to_addrs"], msg.as_string())
return (True, "") return (True, "")
except smtplib.SMTPAuthenticationError as e: except smtplib.SMTPAuthenticationError as e:
@@ -467,12 +601,12 @@ def _send_smtp(cfg: dict, subject: str, html: str, text: str) -> tuple[bool, str
return (False, f"{type(e).__name__}: {e}") return (False, f"{type(e).__name__}: {e}")
def send_report(cfg: dict | None = None) -> dict: def send_report(cfg: Optional[Dict] = None) -> dict:
""" """
收集数据 → 渲染 → 发送。 收集数据 → 渲染 → 发送。
返回: {"ok": bool, "subject": str, "recipients": [...], "error": str, "preview_text": str} 返回: {"ok": bool, "subject": str, "recipients": [...], "error": str, "preview_text": str}
""" """
cfg = cfg or get_config() cfg = cfg or get_config_full()
if not cfg["enabled"]: if not cfg["enabled"]:
return {"ok": False, "error": "邮件功能未启用 (MAIL_ENABLED 未设 true)", "subject": "", "recipients": []} return {"ok": False, "error": "邮件功能未启用 (MAIL_ENABLED 未设 true)", "subject": "", "recipients": []}
errs = config_errors(cfg) errs = config_errors(cfg)
+30
View File
@@ -0,0 +1,30 @@
[Unit]
Description=Palladium Monitor
After=network.target
[Service]
Type=simple
WorkingDirectory=/root/palladium-monitor
ExecStart=/usr/bin/python3 /root/palladium-monitor/app.py
Restart=on-failure
RestartSec=5
Environment=PYTHONUNBUFFERED=1
# 安全加固
NoNewPrivileges=yes
PrivateTmp=yes
# 邮件相关环境变量(按需取消注释并修改)
# Environment="SMTP_HOST=smtp.example.com"
# Environment="SMTP_PORT=587"
# Environment="SMTP_USE_TLS=true"
# Environment="SMTP_USER=your@email.com"
# Environment="SMTP_PASSWORD=yourpassword"
# Environment="MAIL_FROM=your@email.com"
# Environment="MAIL_TO=admin@example.com"
# Environment="MAIL_ENABLED=true"
# Environment="MAIL_SEND_HOUR=9"
# Environment="ALLOW_EMAIL_TRIGGER=true"
[Install]
WantedBy=multi-user.target
-33
View File
@@ -1,33 +0,0 @@
# Python
__pycache__/
*.py[cod]
*$py.class
*.so
.Python
*.egg-info/
.pytest_cache/
.mypy_cache/
# Virtual env
venv/
env/
.venv/
# IDE
.vscode/
.idea/
*.swp
.DS_Store
# 项目数据 (含真实快照, 不上传)
instance/*.db
instance/*.sqlite
instance/*.sqlite3
# 日志
*.log
logs/
# 测试 fixture
test_fixtures/
/tmp/
+243 -1
View File
@@ -1,5 +1,5 @@
/* ═══════════════════════════════════════════════════════════════ /* ═══════════════════════════════════════════════════════════════
Palladium Z1 Monitor — Dark Theme Dashboard Palladium Monitor — Dark Theme Dashboard
═══════════════════════════════════════════════════════════════ */ ═══════════════════════════════════════════════════════════════ */
:root { :root {
--bg-primary: #0d1117; --bg-primary: #0d1117;
@@ -690,6 +690,244 @@ body {
padding: 16px; padding: 16px;
} }
/* ─── 邮件配置页面 ─── */
.page-header {
margin-bottom: 20px;
}
.page-header h1 {
font-size: 22px;
font-weight: 700;
color: var(--text-primary);
}
.page-subtitle {
color: var(--text-secondary);
font-size: 13px;
margin-top: 4px;
}
/* 状态卡片 */
.config-status-card {
display: flex;
align-items: center;
gap: 14px;
padding: 14px 18px;
background: var(--bg-card);
border: 1px solid var(--border);
border-radius: var(--radius);
margin-bottom: 16px;
transition: border-color 0.2s;
}
.config-status-card.status-ok { border-color: var(--green); background: rgba(63,185,80,0.06); }
.config-status-card.status-error { border-color: var(--red); background: rgba(248,81,73,0.06); }
.config-status-card.status-warning { border-color: var(--orange); background: rgba(210,153,34,0.06); }
.status-icon { font-size: 24px; flex-shrink: 0; }
.status-title { font-size: 15px; font-weight: 600; color: var(--text-primary); }
.status-detail { font-size: 13px; color: var(--text-secondary); margin-top: 2px; }
/* 配置卡片 */
.config-card {
background: var(--bg-card);
border: 1px solid var(--border);
border-radius: var(--radius);
padding: 20px 24px;
margin-bottom: 16px;
}
.config-card-header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 18px;
padding-bottom: 12px;
border-bottom: 1px solid var(--border);
}
.config-card-header h2 { font-size: 16px; font-weight: 700; }
.config-source-badge {
font-size: 11px;
color: var(--accent);
background: rgba(88,166,255,0.1);
padding: 2px 8px;
border-radius: 4px;
}
/* 表单通用 */
.form-group { margin-bottom: 14px; }
.form-group label {
display: block;
font-size: 12px;
color: var(--text-secondary);
margin-bottom: 5px;
font-weight: 500;
}
.form-group input[type="text"],
.form-group input[type="email"],
.form-group input[type="url"],
.form-group input[type="password"],
.form-group input[type="number"],
.form-group textarea {
width: 100%;
background: var(--bg-primary);
color: var(--text-primary);
border: 1px solid var(--border);
border-radius: 6px;
padding: 8px 12px;
font-size: 13px;
font-family: inherit;
transition: border-color 0.15s;
}
.form-group input:focus,
.form-group textarea:focus {
outline: none;
border-color: var(--accent);
}
.form-group textarea { resize: vertical; line-height: 1.5; }
.label-hint { color: var(--text-muted); font-weight: 400; font-size: 11px; }
/* 小字段 (行内并排) */
.form-group-small { margin-bottom: 14px; }
/* 表单分区 */
.form-section {
padding: 16px 0;
border-top: 1px solid var(--border);
display: grid;
grid-template-columns: 1fr 1fr;
gap: 16px;
}
.form-section:first-of-type { border-top: none; padding-top: 0; }
.form-section-title {
grid-column: 1 / -1;
font-size: 14px;
font-weight: 600;
color: var(--text-primary);
margin-bottom: 4px;
padding-top: 4px;
}
/* 输入框提示文字 */
.input-hint {
display: block;
font-size: 11px;
color: var(--text-muted);
margin-top: 2px;
}
/* 全宽字段 */
.form-group.full-width { grid-column: 1 / -1; }
/* 启用开关 */
.toggle-row {
display: flex;
align-items: center;
justify-content: space-between;
padding: 14px 18px;
background: var(--bg-primary);
border: 1px solid var(--border);
border-radius: var(--radius);
margin-bottom: 16px;
}
.toggle-title { font-size: 14px; font-weight: 600; color: var(--text-primary); }
.toggle-desc { font-size: 12px; color: var(--text-secondary); margin-top: 2px; }
.toggle-switch {
position: relative;
display: inline-block;
width: 44px;
height: 24px;
cursor: pointer;
}
.toggle-switch input { display: none; }
.toggle-slider {
position: absolute;
inset: 0;
background: var(--border-light);
border-radius: 12px;
transition: 0.2s;
}
.toggle-slider:before {
content: "";
position: absolute;
height: 18px;
width: 18px;
left: 3px;
bottom: 3px;
background: #fff;
border-radius: 50%;
transition: 0.2s;
}
.toggle-switch input:checked + .toggle-slider { background: var(--accent); }
.toggle-switch input:checked + .toggle-slider:before { transform: translateX(20px); }
/* 密码输入 */
.password-input-wrap { position: relative; }
.password-input-wrap input { padding-right: 36px; }
.password-toggle {
position: absolute;
right: 6px;
top: 50%;
transform: translateY(-50%);
background: none;
border: none;
cursor: pointer;
font-size: 14px;
padding: 4px;
color: var(--text-secondary);
}
/* 复选框组 */
.checkbox-group { display: flex; gap: 16px; padding-top: 4px; }
.checkbox-label {
display: flex;
align-items: center;
gap: 6px;
font-size: 13px;
color: var(--text-secondary);
cursor: pointer;
}
.checkbox-label input[type="checkbox"] {
accent-color: var(--accent);
width: 15px;
height: 15px;
}
/* 操作按钮 */
.form-actions {
display: flex;
flex-wrap: wrap;
gap: 10px;
padding-top: 18px;
border-top: 1px solid var(--border);
margin-top: 6px;
}
.form-actions .btn { white-space: nowrap; }
.btn-outline {
background: transparent;
color: var(--text-secondary);
border: 1px solid var(--border);
}
.btn-outline:hover { border-color: var(--text-secondary); color: var(--text-primary); }
.form-actions .btn:disabled { opacity: 0.5; cursor: not-allowed; }
/* 信息卡片 */
.info-card {
background: var(--bg-card);
border: 1px solid var(--border);
border-left: 3px solid var(--accent);
border-radius: var(--radius);
padding: 14px 18px;
}
.info-card h3 {
font-size: 14px;
font-weight: 600;
margin-bottom: 8px;
color: var(--text-primary);
}
.info-card ul { margin: 0; padding-left: 18px; }
.info-card li {
font-size: 13px;
color: var(--text-secondary);
margin-bottom: 4px;
line-height: 1.5;
}
/* ─── Responsive ─── */ /* ─── Responsive ─── */
@media (max-width: 768px) { @media (max-width: 768px) {
.topnav { padding: 0 12px; } .topnav { padding: 0 12px; }
@@ -698,4 +936,8 @@ body {
.refresh-controls { margin-left: 0; } .refresh-controls { margin-left: 0; }
.boards-grid { grid-template-columns: 1fr; } .boards-grid { grid-template-columns: 1fr; }
.metrics-grid { grid-template-columns: 1fr; } .metrics-grid { grid-template-columns: 1fr; }
.form-section { grid-template-columns: 1fr; }
.toggle-row { flex-direction: column; align-items: flex-start; gap: 8px; }
.form-actions { flex-direction: column; }
.form-actions .btn { width: 100%; text-align: center; }
} }
+4 -3
View File
@@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}Palladium Z1 Monitor{% endblock %}</title> <title>{% block title %}Palladium Monitor{% endblock %}</title>
<link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}"> <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
{% block head %}{% endblock %} {% block head %}{% endblock %}
</head> </head>
@@ -11,11 +11,12 @@
<nav class="topnav"> <nav class="topnav">
<div class="nav-brand"> <div class="nav-brand">
<span class="nav-logo"></span> <span class="nav-logo"></span>
<span class="nav-title">Palladium Z1 Monitor</span> <span class="nav-title">Palladium Monitor</span>
</div> </div>
<div class="nav-links"> <div class="nav-links">
<a href="{{ url_for('dashboard') }}" class="{% if request.endpoint == 'dashboard' %}active{% endif %}">仪表板</a> <a href="{{ url_for('dashboard') }}" class="{% if request.endpoint == 'dashboard' %}active{% endif %}">仪表板</a>
<a href="{{ url_for('history') }}" class="{% if request.endpoint == 'history' %}active{% endif %}">历史记录</a> <a href="{{ url_for('history') }}" class="{% if request.endpoint == 'history' %}active{% endif %}">历史记录</a>
<a href="{{ url_for('email_config') }}" class="{% if request.endpoint == 'email_config' %}active{% endif %}">⚙️ 设置</a>
<button class="nav-btn" onclick="openPasteModal()">📥 粘贴数据</button> <button class="nav-btn" onclick="openPasteModal()">📥 粘贴数据</button>
</div> </div>
</nav> </nav>
@@ -35,7 +36,7 @@
<div class="modal-body"> <div class="modal-body">
<p class="modal-hint">在 Palladium 主机执行 <code>test_server -short</code>,将输出粘贴到下方:</p> <p class="modal-hint">在 Palladium 主机执行 <code>test_server -short</code>,将输出粘贴到下方:</p>
<textarea name="raw_output" rows="20" class="paste-textarea" <textarea name="raw_output" rows="20" class="paste-textarea"
placeholder="Emulator: sc01_emu Hardware: Palladium Z1 ..."></textarea> placeholder="Emulator: sc01_emu Hardware: Palladium ..."></textarea>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" onclick="closePasteModal()">取消</button> <button type="button" class="btn btn-secondary" onclick="closePasteModal()">取消</button>
+1 -1
View File
@@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}仪表板 — Palladium Z1 Monitor{% endblock %} {% block title %}仪表板 — Palladium Monitor{% endblock %}
{% block head %} {% block head %}
<script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.1/dist/chart.umd.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.1/dist/chart.umd.min.js"></script>
+334
View File
@@ -0,0 +1,334 @@
{% extends "base.html" %}
{% block title %}邮件配置 — Palladium Monitor{% endblock %}
{% block content %}
<!-- ═══ 页面标题 ═══ -->
<div class="page-header">
<h1>📧 邮件配置</h1>
<p class="page-subtitle">配置每日监控报告邮件发送。设置保存后立即生效,无需重启。</p>
</div>
<!-- ═══ 状态卡片 ═══ -->
<div class="config-status-card" id="statusCard">
<div class="status-icon" id="statusIcon"></div>
<div class="status-text">
<div class="status-title" id="statusTitle">加载中...</div>
<div class="status-detail" id="statusDetail">正在获取当前配置...</div>
</div>
</div>
<!-- ═══ 配置表单 ═══ -->
<div class="config-card">
<div class="config-card-header">
<h2>⚙️ SMTP 配置</h2>
<span class="config-source-badge" id="configSource"></span>
</div>
<form id="emailForm" onsubmit="return false;">
<!-- 启用开关 -->
<div class="form-row toggle-row">
<label class="toggle-label">
<span class="toggle-title">启用每日邮件报告</span>
<span class="toggle-desc">开启后每天定时发送监控报告</span>
</label>
<label class="toggle-switch">
<input type="checkbox" id="cfg_enabled">
<span class="toggle-slider"></span>
</label>
</div>
<!-- SMTP 基础 -->
<div class="form-section">
<div class="form-group">
<label for="cfg_smtp_host">SMTP 服务器</label>
<input type="text" id="cfg_smtp_host" placeholder="smtp.example.com" autocomplete="off">
</div>
<div class="form-group form-group-small">
<label for="cfg_smtp_port">端口</label>
<input type="number" id="cfg_smtp_port" placeholder="587" min="1" max="65535">
</div>
<div class="form-group form-group-small">
<label>加密方式</label>
<div class="checkbox-group">
<label class="checkbox-label"><input type="checkbox" id="cfg_smtp_use_tls"> STARTTLS</label>
<label class="checkbox-label"><input type="checkbox" id="cfg_smtp_use_ssl"> SMTP SSL</label>
</div>
</div>
</div>
<!-- 认证 -->
<div class="form-section">
<div class="form-group">
<label for="cfg_smtp_user">用户名</label>
<input type="text" id="cfg_smtp_user" placeholder="your@email.com" autocomplete="off">
</div>
<div class="form-group">
<label for="cfg_smtp_password">密码 / 授权码</label>
<div class="password-input-wrap">
<input type="password" id="cfg_smtp_password" placeholder="输入密码">
<button type="button" class="password-toggle" onclick="togglePassword()">👁</button>
</div>
</div>
</div>
<!-- 发件人 -->
<div class="form-section">
<div class="form-group">
<label for="cfg_from_addr">发件邮箱</label>
<input type="email" id="cfg_from_addr" placeholder="monitor@example.com" autocomplete="off">
</div>
<div class="form-group">
<label for="cfg_from_name">发件人名称</label>
<input type="text" id="cfg_from_name" placeholder="Palladium Monitor">
</div>
</div>
<!-- 收件人 -->
<div class="form-section">
<div class="form-group full-width">
<label for="cfg_to_addrs">收件邮箱 <span class="label-hint">(多个邮箱用逗号分隔)</span></label>
<textarea id="cfg_to_addrs" rows="2" placeholder="admin@example.com, dev@example.com"></textarea>
</div>
</div>
<!-- 发送邮件时间 -->
<div class="form-section">
<div class="form-section-title">🕐 发送邮件时间</div>
<div class="form-group form-group-small">
<label for="cfg_send_hour">发送时间 (小时)</label>
<input type="number" id="cfg_send_hour" placeholder="9" min="0" max="23" step="1">
<span class="input-hint">023 (24小时制)</span>
</div>
<div class="form-group form-group-small">
<label for="cfg_send_minute">发送时间 (分钟)</label>
<input type="number" id="cfg_send_minute" placeholder="0" min="0" max="59" step="1">
<span class="input-hint">059</span>
</div>
<div class="form-group">
<label for="cfg_monitor_base_url">监控服务器地址</label>
<input type="url" id="cfg_monitor_base_url" placeholder="http://127.0.0.1:5100">
<span class="input-hint">邮件中「查看仪表板」链接的跳转地址</span>
</div>
</div>
</form>
<!-- 操作按钮 -->
<div class="form-actions">
<button type="button" class="btn btn-primary" onclick="saveConfig()">💾 保存配置</button>
<button type="button" class="btn btn-secondary" onclick="testSend()" id="testSendBtn">📤 发送测试邮件</button>
<a href="/api/email/preview" target="_blank" class="btn btn-secondary">👁 预览报告</a>
<button type="button" class="btn btn-outline" onclick="resetConfig()">🔄 恢复环境变量默认</button>
</div>
</div>
<!-- 提示信息 -->
<div class="info-card">
<h3>️ 说明</h3>
<ul>
<li>配置保存到数据库后立即可用,邮件调度器会自动读取新配置。</li>
<li>如果数据库和环境中都未配置,回退到环境变量 (SMTP_HOST, SMTP_USER 等)。</li>
<li>「恢复环境变量默认」会清除数据库中的配置,回退到环境变量。</li>
<li>手动发送测试邮件需先确保配置完整(无错误提示)。</li>
</ul>
</div>
{% endblock %}
{% block scripts %}
<script>
(function() {
const fields = [
'enabled', 'smtp_host', 'smtp_port', 'smtp_user', 'smtp_password',
'smtp_use_tls', 'smtp_use_ssl', 'from_addr', 'from_name',
'to_addrs', 'send_hour', 'send_minute', 'monitor_base_url'
];
function setBusy(busy) {
const btns = document.querySelectorAll('.form-actions .btn');
btns.forEach(b => b.disabled = busy);
}
function showError(msg) {
document.getElementById('statusIcon').textContent = '❌';
document.getElementById('statusTitle').textContent = '配置错误';
document.getElementById('statusDetail').textContent = msg;
document.getElementById('statusCard').className = 'config-status-card status-error';
}
function showConfigured(enabled) {
document.getElementById('statusIcon').textContent = enabled ? '✅' : '⚠️';
document.getElementById('statusTitle').textContent = enabled
? '配置完整'
: '配置不完整';
document.getElementById('statusDetail').textContent = enabled
? '所有必填项已填写,邮件功能已就绪。'
: '缺少必要的配置项,邮件无法发送。';
document.getElementById('statusCard').className = 'config-status-card '
+ (enabled ? 'status-ok' : 'status-warning');
}
function showErrors(errs) {
document.getElementById('statusIcon').textContent = '⚠️';
document.getElementById('statusTitle').textContent = '配置不完整';
document.getElementById('statusDetail').textContent = errs.join('');
document.getElementById('statusCard').className = 'config-status-card status-warning';
}
function loadConfig() {
fetch('/api/email/config')
.then(r => r.json())
.then(data => {
if (!data.ok) {
showError(data.error || '获取配置失败');
return;
}
// 填充表单
document.getElementById('cfg_enabled').checked = !!data.enabled;
document.getElementById('cfg_smtp_host').value = data.smtp_host || '';
document.getElementById('cfg_smtp_port').value = data.smtp_port || 587;
document.getElementById('cfg_smtp_user').value = data.smtp_user || '';
document.getElementById('cfg_smtp_password').value = data.smtp_password || '';
document.getElementById('cfg_smtp_use_tls').checked = !!data.smtp_use_tls;
document.getElementById('cfg_smtp_use_ssl').checked = !!data.smtp_use_ssl;
document.getElementById('cfg_from_addr').value = data.from_addr || '';
document.getElementById('cfg_from_name').value = data.from_name || '';
document.getElementById('cfg_to_addrs').value = (data.to_addrs || []).join(', ');
document.getElementById('cfg_send_hour').value = data.send_hour != null ? data.send_hour : 9;
document.getElementById('cfg_send_minute').value = data.send_minute != null ? data.send_minute : 0;
document.getElementById('cfg_monitor_base_url').value = data.monitor_base_url || '';
// 显示状态
if (data.configured) {
showConfigured(data.enabled);
} else if (data.config_errors && data.config_errors.length > 0) {
showErrors(data.config_errors);
} else {
showConfigured(!!data.enabled);
}
// 来源标识
document.getElementById('configSource').textContent = '数据库配置';
})
.catch(err => {
showError('网络请求失败: ' + err.message);
});
}
window.saveConfig = function() {
setBusy(true);
const data = {};
data.enabled = document.getElementById('cfg_enabled').checked;
data.smtp_host = document.getElementById('cfg_smtp_host').value.trim();
data.smtp_port = parseInt(document.getElementById('cfg_smtp_port').value) || 587;
data.smtp_user = document.getElementById('cfg_smtp_user').value.trim();
data.smtp_password = document.getElementById('cfg_smtp_password').value;
data.smtp_use_tls = document.getElementById('cfg_smtp_use_tls').checked;
data.smtp_use_ssl = document.getElementById('cfg_smtp_use_ssl').checked;
data.from_addr = document.getElementById('cfg_from_addr').value.trim();
data.from_name = document.getElementById('cfg_from_name').value.trim();
const toRaw = document.getElementById('cfg_to_addrs').value.trim();
data.to_addrs = toRaw ? toRaw.split(',').map(s => s.trim()).filter(Boolean) : [];
// 校验时间范围
let h = parseInt(document.getElementById('cfg_send_hour').value);
let m = parseInt(document.getElementById('cfg_send_minute').value);
if (isNaN(h) || h < 0 || h > 23) {
setBusy(false);
showError('发送时间(小时)必须在 023 之间');
document.getElementById('cfg_send_hour').focus();
return;
}
if (isNaN(m) || m < 0 || m > 59) {
setBusy(false);
showError('发送时间(分钟)必须在 059 之间');
document.getElementById('cfg_send_minute').focus();
return;
}
data.send_hour = h;
data.send_minute = m;
data.monitor_base_url = document.getElementById('cfg_monitor_base_url').value.trim();
fetch('/api/email/config', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(data)
})
.then(r => r.json())
.then(result => {
setBusy(false);
if (result.ok) {
if (result.configured) {
showConfigured(result.enabled);
} else if (result.config_errors && result.config_errors.length > 0) {
showErrors(result.config_errors);
}
} else {
showError(result.error || '保存失败');
}
})
.catch(err => {
setBusy(false);
showError('保存失败: ' + err.message);
});
};
window.testSend = function() {
if (!confirm('确定要发送一封测试邮件到当前配置的收件人吗?')) return;
setBusy(true);
const btn = document.getElementById('testSendBtn');
btn.textContent = '⏳ 发送中...';
fetch('/api/email/test-send', { method: 'POST' })
.then(r => r.json())
.then(result => {
setBusy(false);
btn.textContent = '📤 发送测试邮件';
if (result.ok) {
document.getElementById('statusIcon').textContent = '✅';
document.getElementById('statusTitle').textContent = '发送成功';
document.getElementById('statusDetail').textContent =
'已发送到: ' + (result.recipients || []).join(', ');
document.getElementById('statusCard').className = 'config-status-card status-ok';
} else {
showError(result.error || '发送失败');
}
})
.catch(err => {
setBusy(false);
btn.textContent = '📤 发送测试邮件';
showError('发送失败: ' + err.message);
});
};
window.resetConfig = function() {
if (!confirm('确定要清除数据库配置并回退到环境变量吗?')) return;
setBusy(true);
fetch('/api/email/reset', { method: 'POST' })
.then(r => r.json())
.then(result => {
setBusy(false);
if (result.ok) {
document.getElementById('configSource').textContent = '环境变量';
loadConfig(); // 重新加载
} else {
showError(result.error || '重置失败');
}
})
.catch(err => {
setBusy(false);
showError('重置失败: ' + err.message);
});
};
window.togglePassword = function() {
const inp = document.getElementById('cfg_smtp_password');
inp.type = inp.type === 'password' ? 'text' : 'password';
};
// 初始化
loadConfig();
})();
</script>
{% endblock %}
+1 -1
View File
@@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}历史记录 — Palladium Z1 Monitor{% endblock %} {% block title %}历史记录 — Palladium Monitor{% endblock %}
{% block content %} {% block content %}
<div class="section-header"> <div class="section-header">
+1 -1
View File
@@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}快照 #{{ snapshot.id }} — Palladium Z1 Monitor{% endblock %} {% block title %}快照 #{{ snapshot.id }} — Palladium Monitor{% endblock %}
{% block content %} {% block content %}
<div class="snapshot-header"> <div class="snapshot-header">