feat: 完善后端并新增 Vue3 WebUI
后端: - 修复登录校验、DB 并发(单例+WAL+纯Go sqlite)、会话密钥持久化等核心缺陷 - 新增 Timer CRUD/签到/手动触发、执行日志、仪表盘、驱动元数据等 API - 统一驱动接口: 带 context 的执行器、真实错误返回、敏感字段掩码、连通性测试 - 补全钉钉执行器; Timer 触发/提醒去重; 配置支持默认值与环境变量覆盖 前端: - Vite+Vue3+TS+Pinia+Element Plus, 由驱动元数据动态渲染配置表单 - 登录/仪表盘(倒计时环)/定时器/规则/账号/日志/设置页面, 支持暗色模式 - 主题色 #66ccff, 信号波纹 logo, go:embed 单二进制部署 构建: Dockerfile 增加前端构建阶段; 补充各驱动配置文档 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
+24
-17
@@ -10,9 +10,9 @@ import (
|
||||
"github.com/ssdomei232/goodBaby/model"
|
||||
)
|
||||
|
||||
// 定时检查所有 timers 是否需要被触发
|
||||
// CheckTimers 定时检查所有 timers 是否需要被触发
|
||||
//
|
||||
// 同时向即将被触发的 timers 发送通知
|
||||
// 同时向即将到期的 timers 对应的用户发送提醒
|
||||
func CheckTimers() {
|
||||
gormDB, err := db.GetGormDB()
|
||||
if err != nil {
|
||||
@@ -20,32 +20,39 @@ func CheckTimers() {
|
||||
return
|
||||
}
|
||||
|
||||
// 1. 获取所有 timers
|
||||
// 1. 获取所有启用中的 timers
|
||||
var timers []model.Timer
|
||||
if err := gormDB.Find(&timers).Error; err != nil {
|
||||
if err := gormDB.Where("enabled = ?", true).Find(&timers).Error; err != nil {
|
||||
log.Printf("failed to get timers: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
// 2. 检查每个 timer 是否需要被触发
|
||||
for _, timer := range timers {
|
||||
// 计算下次触发时间
|
||||
nextSignTime := timer.LastSign + timer.SignDerationSeconds
|
||||
currentTime := time.Now().Unix()
|
||||
|
||||
// 计算提醒时间
|
||||
remindTime := nextSignTime - timer.RemindTimeSeconds
|
||||
// 2. 检查每个 timer 是否需要被提醒或触发
|
||||
for i := range timers {
|
||||
timer := timers[i]
|
||||
|
||||
// 获取当前时间
|
||||
currentTime := time.Now().Unix()
|
||||
|
||||
if currentTime >= remindTime && currentTime < nextSignTime {
|
||||
// 发送通知
|
||||
reminder.Reminder(&timer)
|
||||
// 已触发过的 timer 在用户重新签到之前不再处理
|
||||
if timer.Triggered {
|
||||
continue
|
||||
}
|
||||
|
||||
nextSignTime := timer.NextSignTime()
|
||||
remindTime := timer.RemindAt()
|
||||
|
||||
if currentTime >= nextSignTime {
|
||||
// 触发 timer
|
||||
runner.Runner(&timer)
|
||||
continue
|
||||
}
|
||||
|
||||
// 每个签到周期只提醒一次
|
||||
if currentTime >= remindTime && timer.LastRemind < remindTime {
|
||||
reminder.Reminder(&timer)
|
||||
if err := gormDB.Model(&model.Timer{}).Where("id = ?", timer.ID).
|
||||
Update("last_remind", currentTime).Error; err != nil {
|
||||
log.Printf("更新 Timer(ID: %d) 提醒时间失败: %v", timer.ID, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
|
||||
"github.com/ssdomei232/goodBaby/model"
|
||||
)
|
||||
|
||||
// LoadAccountConfig 读取账号并把 Config 字段反序列化到 out。
|
||||
//
|
||||
// 各个 driver 之前都各自实现了一遍这段逻辑,其中 github driver 甚至
|
||||
// 直接把驱动内的结构体当成 gorm model 查询,这里统一收敛。
|
||||
func LoadAccountConfig(accountID uint, out any) error {
|
||||
if accountID == 0 {
|
||||
return fmt.Errorf("该规则没有关联账号")
|
||||
}
|
||||
|
||||
gormDB, err := GetGormDB()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var account model.Account
|
||||
if err := gormDB.First(&account, accountID).Error; err != nil {
|
||||
return fmt.Errorf("获取账号(ID: %d)失败: %w", accountID, err)
|
||||
}
|
||||
|
||||
if err := json.Unmarshal([]byte(account.Config), out); err != nil {
|
||||
return fmt.Errorf("解析账号(ID: %d)配置失败: %w", accountID, err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
+66
-4
@@ -1,16 +1,78 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"sync"
|
||||
|
||||
"gorm.io/driver/sqlite"
|
||||
"github.com/glebarez/sqlite"
|
||||
"github.com/ssdomei232/goodBaby/configs"
|
||||
"github.com/ssdomei232/goodBaby/model"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/logger"
|
||||
)
|
||||
|
||||
var (
|
||||
once sync.Once
|
||||
instance *gorm.DB
|
||||
initErr error
|
||||
)
|
||||
|
||||
// GetGormDB 返回全局唯一的 gorm 连接。
|
||||
//
|
||||
// 之前每次调用都会新开一个 sqlite 连接,在并发执行规则时很容易触发
|
||||
// "database is locked",这里改为单例并开启 WAL。
|
||||
func GetGormDB() (*gorm.DB, error) {
|
||||
db, err := gorm.Open(sqlite.Open("file:data.db"), &gorm.Config{})
|
||||
once.Do(func() {
|
||||
instance, initErr = open()
|
||||
})
|
||||
return instance, initErr
|
||||
}
|
||||
|
||||
// MustInit 在启动阶段初始化数据库并执行迁移,失败直接退出
|
||||
func MustInit() *gorm.DB {
|
||||
gormDB, err := GetGormDB()
|
||||
if err != nil {
|
||||
log.Fatal("打开数据库失败:", err)
|
||||
log.Fatalf("初始化数据库失败: %v", err)
|
||||
}
|
||||
return db, nil
|
||||
if err := AutoMigrate(gormDB); err != nil {
|
||||
log.Fatalf("数据库迁移失败: %v", err)
|
||||
}
|
||||
return gormDB
|
||||
}
|
||||
|
||||
func open() (*gorm.DB, error) {
|
||||
config, err := configs.GetConfig()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("读取配置失败: %w", err)
|
||||
}
|
||||
|
||||
dsn := fmt.Sprintf("file:%s?_pragma=busy_timeout(10000)&_pragma=journal_mode(WAL)&_pragma=foreign_keys(1)", config.DatabasePath)
|
||||
gormDB, err := gorm.Open(sqlite.Open(dsn), &gorm.Config{
|
||||
Logger: logger.Default.LogMode(logger.Warn),
|
||||
})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("打开数据库失败: %w", err)
|
||||
}
|
||||
|
||||
sqlDB, err := gormDB.DB()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// sqlite 单写多读,限制连接数避免写冲突
|
||||
sqlDB.SetMaxOpenConns(1)
|
||||
sqlDB.SetMaxIdleConns(1)
|
||||
|
||||
return gormDB, nil
|
||||
}
|
||||
|
||||
// AutoMigrate 建表 / 补齐新增字段
|
||||
func AutoMigrate(gormDB *gorm.DB) error {
|
||||
return gormDB.AutoMigrate(
|
||||
&model.User{},
|
||||
&model.Timer{},
|
||||
&model.Rule{},
|
||||
&model.Account{},
|
||||
&model.ExecutionLog{},
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
// Package logstore 负责写入与清理规则执行日志
|
||||
package logstore
|
||||
|
||||
import (
|
||||
"log"
|
||||
"time"
|
||||
|
||||
"github.com/ssdomei232/goodBaby/configs"
|
||||
"github.com/ssdomei232/goodBaby/handler/db"
|
||||
"github.com/ssdomei232/goodBaby/model"
|
||||
)
|
||||
|
||||
// Record 写入一条执行日志,失败只记录到标准输出,不影响主流程
|
||||
func Record(entry *model.ExecutionLog) {
|
||||
gormDB, err := db.GetGormDB()
|
||||
if err != nil {
|
||||
log.Printf("写入执行日志失败: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
if entry.CreateAt == 0 {
|
||||
entry.CreateAt = time.Now().Unix()
|
||||
}
|
||||
|
||||
if err := gormDB.Create(entry).Error; err != nil {
|
||||
log.Printf("写入执行日志失败: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
trim(entry.UID)
|
||||
}
|
||||
|
||||
// trim 按配置保留每个用户最近的 N 条日志
|
||||
func trim(uid uint) {
|
||||
config, err := configs.GetConfig()
|
||||
if err != nil || config.LogRetainCount <= 0 {
|
||||
return
|
||||
}
|
||||
|
||||
gormDB, err := db.GetGormDB()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
var cutoff model.ExecutionLog
|
||||
err = gormDB.Where("uid = ?", uid).
|
||||
Order("id DESC").
|
||||
Offset(config.LogRetainCount).
|
||||
Limit(1).
|
||||
First(&cutoff).Error
|
||||
if err != nil {
|
||||
// 没有超出保留条数
|
||||
return
|
||||
}
|
||||
|
||||
if err := gormDB.Where("uid = ? AND id <= ?", uid, cutoff.ID).
|
||||
Delete(&model.ExecutionLog{}).Error; err != nil {
|
||||
log.Printf("清理执行日志失败: %v", err)
|
||||
}
|
||||
}
|
||||
@@ -1,14 +1,18 @@
|
||||
package reminder
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"log"
|
||||
"time"
|
||||
|
||||
"github.com/ssdomei232/goodBaby/drivers/dingtalk"
|
||||
"github.com/ssdomei232/goodBaby/handler/db"
|
||||
"github.com/ssdomei232/goodBaby/handler/logstore"
|
||||
"github.com/ssdomei232/goodBaby/model"
|
||||
)
|
||||
|
||||
// reminder 负责在 checker 检查到 timer 即将被触发时,向用户发送提醒
|
||||
// Reminder 在 checker 检查到 timer 即将到期时,向用户发送提醒
|
||||
func Reminder(timer *model.Timer) {
|
||||
gormDB, err := db.GetGormDB()
|
||||
if err != nil {
|
||||
@@ -24,5 +28,29 @@ func Reminder(timer *model.Timer) {
|
||||
}
|
||||
|
||||
// 2. 向用户发送提醒
|
||||
dingtalk.SendDingTalkMsg(&user, "您的 goodbaby timer 即将被触发", "您的 goodbaby timer 即将被触发")
|
||||
deadline := time.Unix(timer.NextSignTime(), 0).Format("2006-01-02 15:04:05")
|
||||
title := fmt.Sprintf("goodBaby: %s 即将到期", timer.Name)
|
||||
msg := fmt.Sprintf("### %s\n\n定时器 **%s** 将在 %s 到期。\n\n请及时签到,否则关联的规则会被执行。", title, timer.Name, deadline)
|
||||
|
||||
err = dingtalk.SendDingTalkMsg(&user, title, msg)
|
||||
if errors.Is(err, dingtalk.ErrNoUserConfig) {
|
||||
// 用户没有配置提醒渠道,不算失败
|
||||
return
|
||||
}
|
||||
|
||||
message := "提醒发送成功"
|
||||
if err != nil {
|
||||
message = err.Error()
|
||||
log.Printf("发送提醒失败 [Timer ID: %d]: %v", timer.ID, err)
|
||||
}
|
||||
|
||||
logstore.Record(&model.ExecutionLog{
|
||||
UID: timer.UID,
|
||||
TimerID: timer.ID,
|
||||
RuleName: timer.Name,
|
||||
RuleType: "reminder",
|
||||
Trigger: model.TriggerRemind,
|
||||
Success: err == nil,
|
||||
Message: message,
|
||||
})
|
||||
}
|
||||
|
||||
+25
-14
@@ -1,9 +1,13 @@
|
||||
package runner
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"sort"
|
||||
"sync"
|
||||
|
||||
"github.com/ssdomei232/goodBaby/drivers/bilibili"
|
||||
"github.com/ssdomei232/goodBaby/drivers/dingtalk"
|
||||
"github.com/ssdomei232/goodBaby/drivers/email"
|
||||
"github.com/ssdomei232/goodBaby/drivers/github"
|
||||
"github.com/ssdomei232/goodBaby/drivers/onebot"
|
||||
@@ -12,8 +16,8 @@ import (
|
||||
|
||||
// RuleExecutor 规则执行器接口
|
||||
type RuleExecutor interface {
|
||||
// Execute 执行规则
|
||||
Execute(rule *model.Rule) error
|
||||
// Execute 执行规则,ctx 决定了重试的最长时间
|
||||
Execute(ctx context.Context, rule *model.Rule) error
|
||||
// GetType 获取执行器支持的规则类型
|
||||
GetType() string
|
||||
}
|
||||
@@ -36,13 +40,13 @@ func (er *ExecutorRegistry) Register(executor RuleExecutor) {
|
||||
}
|
||||
|
||||
// Execute 根据规则类型执行规则
|
||||
func (er *ExecutorRegistry) Execute(rule *model.Rule) error {
|
||||
func (er *ExecutorRegistry) Execute(ctx context.Context, rule *model.Rule) error {
|
||||
executor, exists := er.executors[rule.Type]
|
||||
if !exists {
|
||||
return fmt.Errorf("不支持的规则类型: %s", rule.Type)
|
||||
}
|
||||
|
||||
return executor.Execute(rule)
|
||||
return executor.Execute(ctx, rule)
|
||||
}
|
||||
|
||||
// GetSupportedTypes 获取所有支持的规则类型
|
||||
@@ -51,24 +55,31 @@ func (er *ExecutorRegistry) GetSupportedTypes() []string {
|
||||
for t := range er.executors {
|
||||
types = append(types, t)
|
||||
}
|
||||
sort.Strings(types)
|
||||
return types
|
||||
}
|
||||
|
||||
var globalExecutorRegistry *ExecutorRegistry
|
||||
var (
|
||||
registryOnce sync.Once
|
||||
globalExecutorRegistry *ExecutorRegistry
|
||||
)
|
||||
|
||||
// InitExecutorRegistry 初始化执行器注册表并注册所有执行器
|
||||
func InitExecutorRegistry() *ExecutorRegistry {
|
||||
registry := NewExecutorRegistry()
|
||||
registryOnce.Do(func() {
|
||||
registry := NewExecutorRegistry()
|
||||
|
||||
// 注册所有规则执行器
|
||||
registry.Register(&bilibili.BilibiliDynamicExecutor{})
|
||||
registry.Register(&email.EmailExecutor{})
|
||||
registry.Register(&github.GithubMakeRepoPublicExecutor{})
|
||||
registry.Register(&onebot.OneBotExecutor{})
|
||||
// 未来添加新规则类型时,在这里注册即可
|
||||
// 注册所有规则执行器
|
||||
registry.Register(&bilibili.BilibiliDynamicExecutor{})
|
||||
registry.Register(&email.EmailExecutor{})
|
||||
registry.Register(&github.GithubMakeRepoPublicExecutor{})
|
||||
registry.Register(&onebot.OneBotExecutor{})
|
||||
registry.Register(&dingtalk.DingTalkExecutor{})
|
||||
// 未来添加新规则类型时,在这里注册即可
|
||||
|
||||
globalExecutorRegistry = registry
|
||||
return registry
|
||||
globalExecutorRegistry = registry
|
||||
})
|
||||
return globalExecutorRegistry
|
||||
}
|
||||
|
||||
// GetGlobalExecutorRegistry 获取全局执行器注册表
|
||||
|
||||
@@ -1,13 +1,21 @@
|
||||
package runner
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/ssdomei232/goodBaby/handler/db"
|
||||
"github.com/ssdomei232/goodBaby/handler/logstore"
|
||||
"github.com/ssdomei232/goodBaby/internal/retry"
|
||||
"github.com/ssdomei232/goodBaby/model"
|
||||
)
|
||||
|
||||
// runner 执行需要被执行的 Rule
|
||||
// Runner 执行某个 Timer 下所有启用的规则。
|
||||
//
|
||||
// 触发前先把 Timer 标记为已触发,避免规则执行期间(可能长达数小时)
|
||||
// 被下一轮检查重复触发;用户重新签到后 Triggered 会被重置。
|
||||
func Runner(timer *model.Timer) {
|
||||
gormDB, err := db.GetGormDB()
|
||||
if err != nil {
|
||||
@@ -17,22 +25,61 @@ func Runner(timer *model.Timer) {
|
||||
|
||||
// 1. 获取所有需要执行的 Rule
|
||||
var rules []model.Rule
|
||||
if err := gormDB.Where("timer_id = ?", timer.ID).Find(&rules).Error; err != nil {
|
||||
if err := gormDB.Where("timer_id = ? AND enabled = ?", timer.ID, true).Find(&rules).Error; err != nil {
|
||||
log.Printf("failed to get rules: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
// 2. 执行每个 Rule
|
||||
for _, rule := range rules {
|
||||
go executeRule(&rule)
|
||||
// 2. 标记已触发
|
||||
now := time.Now().Unix()
|
||||
if err := gormDB.Model(&model.Timer{}).Where("id = ?", timer.ID).
|
||||
Updates(map[string]any{"triggered": true, "last_trigger": now}).Error; err != nil {
|
||||
log.Printf("标记 Timer(ID: %d) 已触发失败: %v", timer.ID, err)
|
||||
return
|
||||
}
|
||||
|
||||
log.Printf("Timer %s (ID: %d) 已到期,开始执行 %d 条规则", timer.Name, timer.ID, len(rules))
|
||||
|
||||
// 3. 并发执行每个 Rule
|
||||
var wg sync.WaitGroup
|
||||
for i := range rules {
|
||||
rule := rules[i]
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
ExecuteRule(&rule, model.TriggerTimer)
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
}
|
||||
|
||||
// executeRule 执行单个规则
|
||||
func executeRule(rule *model.Rule) {
|
||||
executorRegistry := GetGlobalExecutorRegistry()
|
||||
// ExecuteRule 执行单个规则并记录执行日志
|
||||
func ExecuteRule(rule *model.Rule, trigger string) error {
|
||||
ctx, cancel := retry.ExecutionContext()
|
||||
defer cancel()
|
||||
return ExecuteRuleWithContext(ctx, rule, trigger)
|
||||
}
|
||||
|
||||
if err := executorRegistry.Execute(rule); err != nil {
|
||||
// ExecuteRuleWithContext 使用给定 context 执行规则,手动测试时可传入较短的超时
|
||||
func ExecuteRuleWithContext(ctx context.Context, rule *model.Rule, trigger string) error {
|
||||
err := GetGlobalExecutorRegistry().Execute(ctx, rule)
|
||||
|
||||
message := "执行成功"
|
||||
if err != nil {
|
||||
message = err.Error()
|
||||
log.Printf("执行规则失败 [ID: %d, Type: %s]: %v", rule.ID, rule.Type, err)
|
||||
}
|
||||
|
||||
logstore.Record(&model.ExecutionLog{
|
||||
UID: rule.UID,
|
||||
RuleID: rule.ID,
|
||||
RuleName: rule.Name,
|
||||
RuleType: rule.Type,
|
||||
TimerID: rule.TimerID,
|
||||
Trigger: trigger,
|
||||
Success: err == nil,
|
||||
Message: message,
|
||||
})
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user