fix: 手动触发全部成功时被误报为失败

trigger 接口的 fails 是 nil 切片,无失败时序列化成 JSON null,
前端读 failed.length 抛异常并落入 catch 分支,把成功显示成"触发失败"。
改为初始化空切片,前端同时加空值兜底。

顺带修复 logstore.trim 用 First 查询保留位置,日志未超出保留条数时
返回 ErrRecordNotFound,导致每写一条日志都刷一行 gorm 警告。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
mei
2026-07-26 22:34:29 +08:00
co-authored by Claude Fable 5
parent d5ede38848
commit 0d766020bc
4 changed files with 19 additions and 12 deletions
+6 -3
View File
@@ -57,11 +57,14 @@ func HandleTriggerTimer(c *gin.Context) {
defer cancel()
// 并发执行所有规则,收集失败信息
//
// fails 必须初始化为空切片:nil 切片会被序列化成 JSON null,
// 前端读 failed.length 时会抛异常,把全部成功误报成触发失败。
var (
wg sync.WaitGroup
mu sync.Mutex
fails []string
wg sync.WaitGroup
mu sync.Mutex
)
fails := []string{}
for i := range rules {
rule := rules[i]
wg.Add(1)
+10 -5
View File
@@ -42,18 +42,23 @@ func trim(uid uint) {
return
}
var cutoff model.ExecutionLog
err = gormDB.Where("uid = ?", uid).
// 用 Find 而不是 First:日志没超出保留条数是常态,
// First 找不到记录会返回 ErrRecordNotFound,每写一条日志都刷一行 gorm 警告。
var cutoff []model.ExecutionLog
if err := gormDB.Where("uid = ?", uid).
Order("id DESC").
Offset(config.LogRetainCount).
Limit(1).
First(&cutoff).Error
if err != nil {
Find(&cutoff).Error; err != nil {
log.Printf("清理执行日志失败: %v", err)
return
}
if len(cutoff) == 0 {
// 没有超出保留条数
return
}
if err := gormDB.Where("uid = ? AND id <= ?", uid, cutoff.ID).
if err := gormDB.Where("uid = ? AND id <= ?", uid, cutoff[0].ID).
Delete(&model.ExecutionLog{}).Error; err != nil {
log.Printf("清理执行日志失败: %v", err)
}
View File
+3 -4
View File
@@ -147,12 +147,11 @@ async function trigger(timer: Timer) {
triggeringId.value = timer.id
try {
const result = await timerApi.trigger(timer.id)
if (result.failed.length === 0) {
const failed = result.failed ?? []
if (failed.length === 0) {
ElMessage.success(`已执行 ${result.total} 条规则,全部成功`)
} else {
ElMessage.warning(
`已执行 ${result.total} 条规则,${result.failed.length} 条失败,详情见执行日志`,
)
ElMessage.warning(`已执行 ${result.total} 条规则,${failed.length} 条失败,详情见执行日志`)
}
} catch (error) {
ElMessage.error(error instanceof ApiError ? error.message : '触发失败')