feat: MySQL SSL 支持 + 任务编辑回显 + InfluxDB 备份

MySQL:
- 新增 use_ssl 选项;MariaDB 11.x 默认强制 SSL 且默认 verify cert,
  故启用 SSL 时同时加 --skip-ssl-verify-server-cert 以兼容自签名证书。

任务编辑回显:
- 后端 JobOut 新增 source_config_safe 字段,解密后敏感字段(password/token/
  secret_key/access_key)脱敏为 "***"。
- 更新端点接收 source_config;若密码字段为 "***" 则保留原值不变,
  支持"不改密码只改其它字段"的常见场景。
- 前端 JobForm 完整回显所有数据源字段,type='edit' 时去掉 disabled。

InfluxDB 备份(新增类型):
- 后端 core/backup/influxdb.py:
  - v2.x:调用 influx CLI(influxdb2-client-2.7.5 二进制直接安装)执行 influx backup
    生成目录后 tar.gz 流式打包上传。
  - v1.x:通过 HTTP API 调用 /query?db=...&q=SELECT * FROM /.*/ 拉取全量数据
    导出为 CSV + META.txt。
- Dockerfile:直接下载 influx CLI 二进制(绕开 apt 签名问题)。
- 前端 JobForm:根据 version 动态显示 v1/v2 表单字段。
- schemas/job.py:新增 InfluxDBSourceConfigV1 / V2。
- 类型字面量扩展:'mysql' | 'directory' | 'influxdb'。

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
publ
2026-06-22 19:14:45 +08:00
parent febdeab35c
commit 2568c0380b
9 changed files with 779 additions and 61 deletions
+56 -9
View File
@@ -12,6 +12,8 @@ from app.models.run import Run
from app.models.storage import Storage
from app.schemas.job import (
DirectorySourceConfig,
InfluxDBSourceConfigV1,
InfluxDBSourceConfigV2,
JobCreate,
JobOut,
JobRunResponse,
@@ -21,7 +23,22 @@ from app.schemas.job import (
RunSummary,
)
from app.scheduler.scheduler import remove_job, reschedule_job
from app.utils.crypto import encrypt_dict
from app.utils.crypto import decrypt_dict, encrypt_dict
# 脱敏字段:编辑时返回占位符,避免明文密码在网络传输
_SENSITIVE_KEYS = {"password", "token", "secret_key", "access_key"}
def _redact_source(cfg: dict) -> dict:
"""敏感字段脱敏为 '***',但保留字段名以提示用户该字段已配置。"""
out = {}
for k, v in cfg.items():
if k in _SENSITIVE_KEYS:
out[k] = "***" if v else ""
else:
out[k] = v
return out
router = APIRouter(prefix="/jobs", tags=["jobs"])
@@ -31,6 +48,13 @@ def _validate_source(type_: str, cfg: dict) -> dict:
return MySQLSourceConfig(**cfg).model_dump()
if type_ == "directory":
return DirectorySourceConfig(**cfg).model_dump()
if type_ == "influxdb":
ver = cfg.get("version")
if ver == "1":
return InfluxDBSourceConfigV1(**cfg).model_dump()
if ver == "2":
return InfluxDBSourceConfigV2(**cfg).model_dump()
raise HTTPException(status_code=400, detail="InfluxDB config 缺少 version (1 或 2)")
raise HTTPException(status_code=400, detail=f"Unsupported job type: {type_}")
@@ -43,6 +67,12 @@ def _job_to_with_last_run(job: Job, db) -> JobWithLastRun:
)
out = JobWithLastRun.model_validate(job)
out.last_run = RunSummary.model_validate(last) if last else None
# 解密 source_config 并脱敏
try:
cfg = decrypt_dict(job.source_config_json)
out.source_config_safe = _redact_source(cfg)
except Exception:
out.source_config_safe = {}
return out
@@ -53,7 +83,7 @@ def list_jobs(db: DBSession, _: CurrentUser) -> list[JobWithLastRun]:
@router.post("", response_model=JobOut, status_code=201)
def create_job(payload: JobCreate, db: DBSession, _: AdminUser) -> Job:
def create_job(payload: JobCreate, db: DBSession, _: AdminUser) -> JobOut:
if db.query(Job).filter(Job.name == payload.name).first():
raise HTTPException(status_code=400, detail="名称已存在")
if not db.get(Storage, payload.storage_id):
@@ -74,7 +104,9 @@ def create_job(payload: JobCreate, db: DBSession, _: AdminUser) -> Job:
db.commit()
db.refresh(job)
reschedule_job(job.id)
return job
out = JobOut.model_validate(job)
out.source_config_safe = _redact_source(src)
return out
@router.get("/{job_id}", response_model=JobWithLastRun)
@@ -86,7 +118,7 @@ def get_job(job_id: int, db: DBSession, _: CurrentUser) -> JobWithLastRun:
@router.put("/{job_id}", response_model=JobOut)
def update_job(job_id: int, payload: JobUpdate, db: DBSession, _: AdminUser) -> Job:
def update_job(job_id: int, payload: JobUpdate, db: DBSession, _: AdminUser) -> JobOut:
job = db.get(Job, job_id)
if not job:
raise HTTPException(status_code=404, detail="Not found")
@@ -94,9 +126,19 @@ def update_job(job_id: int, payload: JobUpdate, db: DBSession, _: AdminUser) ->
if db.query(Job).filter(Job.name == payload.name, Job.id != job_id).first():
raise HTTPException(status_code=400, detail="名称已存在")
job.name = payload.name
new_src: dict | None = None
if payload.source_config is not None:
src = _validate_source(job.type, payload.source_config)
job.source_config_json = encrypt_dict(src)
new_src = _validate_source(job.type, payload.source_config)
# 如果 password 为 "***" 占位符,保留原值
existing_src = decrypt_dict(job.source_config_json)
for k in _SENSITIVE_KEYS:
if (
k in new_src
and k in existing_src
and new_src[k] == "***"
):
new_src[k] = existing_src[k]
job.source_config_json = encrypt_dict(new_src)
if payload.storage_id is not None:
if not db.get(Storage, payload.storage_id):
raise HTTPException(status_code=400, detail="存储目标不存在")
@@ -114,7 +156,10 @@ def update_job(job_id: int, payload: JobUpdate, db: DBSession, _: AdminUser) ->
db.commit()
db.refresh(job)
reschedule_job(job.id)
return job
out = JobOut.model_validate(job)
cfg = new_src if new_src is not None else decrypt_dict(job.source_config_json)
out.source_config_safe = _redact_source(cfg)
return out
@router.delete("/{job_id}", status_code=204)
@@ -148,7 +193,7 @@ async def run_job(job_id: int, db: DBSession, _: CurrentUser) -> JobRunResponse:
@router.post("/{job_id}/toggle", response_model=JobOut)
def toggle_job(job_id: int, db: DBSession, _: AdminUser) -> Job:
def toggle_job(job_id: int, db: DBSession, _: AdminUser) -> JobOut:
job = db.get(Job, job_id)
if not job:
raise HTTPException(status_code=404, detail="Not found")
@@ -156,4 +201,6 @@ def toggle_job(job_id: int, db: DBSession, _: AdminUser) -> Job:
db.commit()
db.refresh(job)
reschedule_job(job.id)
return job
out = JobOut.model_validate(job)
out.source_config_safe = _redact_source(decrypt_dict(job.source_config_json))
return out