feat: 补齐第一批已知缺口（关闭握手 / 定时备份 / Origin 白名单 / DTO 收敛）
- httpapi：新增 POST /api/shutdown（admin 会话或 X-Shutdown-Token 常量时间比对） 与 GET /api/rules/switches（recorder 可读，只回布尔开关）；settings/standings 的 重复 DTO 收敛到 internal/dto；standings.showIndividualMedals 贯通到设置读写与前端 - export：抽出 export.Service，新增自动备份定时任务（backup.intervalMinutes/keep）， 自动、手动、发布前三类备份共用同一把互斥锁与滚动清理 - realtime：/ws 去掉 InsecureSkipVerify，改用 OriginPatterns（同源与无 Origin 放行， 跨站需命中 server.allowedOrigins） - console：停止服务改走 POST /api/shutdown 优雅关闭（5 秒宽限后回退强杀）， 服务管理器新增「已连接的大屏实例」卡片 - deploy：build.bat 改用 for /f 读内部署名——set /p 在 chcp 65001 下返回空， 导致最近这次构建的 exe 里根本没注入署名 - docs：备份策略、关闭超时、Origin 配置的说明与实现对齐
This commit is contained in:
AskaEth committed
1 parent
4d56c73ae6
commit
2c9ff65fc4
42 files changed
+1271
-275
No files matched your search
@@ -1,13 +1,16 @@
|
||||
package export
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -48,7 +51,7 @@ func Backup(db *sql.DB, opts BackupOptions) (BackupInfo, error) {
|
||||
}
|
||||
dir := strings.TrimSpace(opts.Dir)
|
||||
if dir == "" {
|
||||
return BackupInfo{}, errors.New("export: 备份目录为空")
|
||||
return BackupInfo{}, ErrNoDir
|
||||
}
|
||||
if err := os.MkdirAll(dir, 0o755); err != nil {
|
||||
return BackupInfo{}, fmt.Errorf("export: 创建备份目录 %s: %w", dir, err)
|
||||
@@ -100,6 +103,113 @@ func BackupBeforePublish(db *sql.DB, opts BackupOptions) (BackupInfo, error) {
|
||||
return Backup(db, opts)
|
||||
}
|
||||
|
||||
// Service 收拢「系统库 + 赛事库」的备份，并串行化手动、发布前、定时三类触发：
|
||||
// 同一时刻只允许一个 VACUUM INTO 在跑，避免并发快照互相拖慢或写入同一文件。
|
||||
type Service struct {
|
||||
system *sql.DB
|
||||
event *sql.DB
|
||||
dir string
|
||||
keep int
|
||||
logger *slog.Logger
|
||||
|
||||
mu sync.Mutex
|
||||
}
|
||||
|
||||
// NewService 构造备份服务；keep<=0 时按 DefaultBackupKeep 滚动保留。
|
||||
func NewService(system, event *sql.DB, dir string, keep int, logger *slog.Logger) *Service {
|
||||
if logger == nil {
|
||||
logger = slog.Default()
|
||||
}
|
||||
return &Service{system: system, event: event, dir: dir, keep: keep, logger: logger}
|
||||
}
|
||||
|
||||
// Run 备份系统库与赛事库各一份（手动备份、定时备份用）。
|
||||
func (s *Service) Run(reason string) ([]BackupInfo, error) {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
return s.snapshotAll(reason, true)
|
||||
}
|
||||
|
||||
// RunEvent 只备份赛事库（发布前备份用）；与 Run 共用同一把锁。
|
||||
func (s *Service) RunEvent(reason string) ([]BackupInfo, error) {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
return s.snapshotAll(reason, false)
|
||||
}
|
||||
|
||||
// StartAuto 跟随 ctx 定时备份：ctx 取消即停止，间隔 <=0 表示关闭。
|
||||
//
|
||||
// 定时备份不写审计：一天下来会产生几百条 system.backup，把审计表刷满；
|
||||
// 手动备份与发布前备份照旧写审计。
|
||||
func (s *Service) StartAuto(ctx context.Context, interval time.Duration) {
|
||||
if interval <= 0 {
|
||||
s.logger.Info("自动备份已关闭", "interval", interval.String())
|
||||
return
|
||||
}
|
||||
if strings.TrimSpace(s.dir) == "" {
|
||||
s.logger.Warn("未配置数据目录，跳过自动备份")
|
||||
return
|
||||
}
|
||||
go func() {
|
||||
ticker := time.NewTicker(interval)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-ticker.C:
|
||||
if ctx.Err() != nil {
|
||||
return
|
||||
}
|
||||
infos, err := s.Run("auto")
|
||||
if err != nil {
|
||||
s.logger.Error("自动备份失败", "err", err)
|
||||
continue
|
||||
}
|
||||
for _, info := range infos {
|
||||
s.logger.Info("自动备份完成", "path", info.Path, "size", info.Size)
|
||||
}
|
||||
}
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
func (s *Service) snapshotAll(reason string, withSystem bool) ([]BackupInfo, error) {
|
||||
if strings.TrimSpace(s.dir) == "" {
|
||||
return nil, ErrNoDir
|
||||
}
|
||||
out := make([]BackupInfo, 0, 2)
|
||||
if withSystem && s.system != nil {
|
||||
info, err := s.snapshot(s.system, "system", reason)
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
out = append(out, info)
|
||||
}
|
||||
if s.event != nil {
|
||||
info, err := s.snapshot(s.event, "event", reason)
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
out = append(out, info)
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (s *Service) snapshot(db *sql.DB, prefix, reason string) (BackupInfo, error) {
|
||||
info, err := Backup(db, BackupOptions{Dir: s.dir, Prefix: prefix, Reason: reason, Keep: s.keep})
|
||||
if err == nil {
|
||||
return info, nil
|
||||
}
|
||||
// 快照已生成、只是滚动清理旧备份失败时 Backup 仍返回有效 info：
|
||||
// 删不掉旧文件不算本次备份失败，记日志即可（下次备份会再试）。
|
||||
if info.Path != "" {
|
||||
s.logger.Warn("清理旧备份失败", "prefix", prefix, "err", err)
|
||||
return info, nil
|
||||
}
|
||||
return BackupInfo{}, err
|
||||
}
|
||||
|
||||
// ListBackups 按时间倒序列出备份；prefix 为空时列出全部 .db 备份。
|
||||
// 不计算校验和（避免每次列表都全量读盘），需要校验时用 Backup 的返回值。
|
||||
func ListBackups(dir, prefix string) ([]BackupInfo, error) {
|
||||
@@ -150,7 +260,8 @@ func LatestBackup(dir, prefix string) (BackupInfo, bool, error) {
|
||||
return list[0], true, nil
|
||||
}
|
||||
|
||||
// PruneBackups 只保留最近 keep 份，返回被删除的文件路径。
|
||||
// PruneBackups 只保留最近 keep 份，返回被删除的文件路径；
|
||||
// 个别文件删不掉只汇总到返回的错误里，不影响继续清理其余旧备份。
|
||||
func PruneBackups(dir, prefix string, keep int) ([]string, error) {
|
||||
if keep <= 0 {
|
||||
keep = DefaultBackupKeep
|
||||
@@ -164,13 +275,15 @@ func PruneBackups(dir, prefix string, keep int) ([]string, error) {
|
||||
}
|
||||
|
||||
removed := make([]string, 0, len(list)-keep)
|
||||
var errs []error
|
||||
for _, b := range list[keep:] {
|
||||
if err := os.Remove(b.Path); err != nil && !os.IsNotExist(err) {
|
||||
return removed, fmt.Errorf("export: 删除旧备份 %s: %w", b.Path, err)
|
||||
errs = append(errs, fmt.Errorf("export: 删除旧备份 %s: %w", b.Path, err))
|
||||
continue
|
||||
}
|
||||
removed = append(removed, b.Path)
|
||||
}
|
||||
return removed, nil
|
||||
return removed, errors.Join(errs...)
|
||||
}
|
||||
|
||||
func uniqueBackupPath(dir, prefix, reason string, now time.Time) string {
|
||||
@@ -184,15 +297,27 @@ func uniqueBackupPath(dir, prefix, reason string, now time.Time) string {
|
||||
}
|
||||
}
|
||||
|
||||
// reasonFromName 从 <prefix>-<reason>-<yyyyMMdd>-<HHmmss>.db 里取回原因。
|
||||
// reasonFromName 从 <prefix>-<reason>-<yyyyMMdd>-<HHmmss>[-<序号>].db 里取回原因；
|
||||
// 同一秒重复备份会多一段序号，所以从右侧找「8 位日期 + 6 位时间」再截断。
|
||||
func reasonFromName(name, prefix string) string {
|
||||
base := strings.TrimSuffix(name, filepath.Ext(name))
|
||||
if prefix != "" {
|
||||
base = strings.TrimPrefix(base, prefix+"-")
|
||||
}
|
||||
parts := strings.Split(base, "-")
|
||||
if len(parts) >= 3 {
|
||||
return strings.Join(parts[:len(parts)-2], "-")
|
||||
for i := len(parts) - 2; i >= 0; i-- {
|
||||
if len(parts[i]) == 8 && len(parts[i+1]) == 6 && allDigits(parts[i]) && allDigits(parts[i+1]) {
|
||||
return strings.Join(parts[:i], "-")
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func allDigits(s string) bool {
|
||||
for _, r := range s {
|
||||
if r < '0' || r > '9' {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return s != ""
|
||||
}
|
||||
Reference in new issue
Block a user