Update.

Author: xOS

model/alertrule.go

@@ -13,14 +13,15 @@ const (
 )
 
 type CycleTransferStats struct {
-	Name       string
-	From       time.Time
-	To         time.Time
-	Max        uint64
-	Min        uint64
-	ServerName map[uint64]string
-	Transfer   map[uint64]uint64
-	NextUpdate map[uint64]time.Time
+	Name          string
+	From          time.Time
+	To            time.Time
+	Max           uint64
+	Min           uint64
+	ServerName    map[uint64]string
+	Transfer      map[uint64]uint64
+	NextUpdate    map[uint64]time.Time // 下次检查时间
+	LastResetTime map[uint64]time.Time // 上次重置时间（用于判断是否需要重置）
 }
 
 type AlertRule struct {

service/rpc/server.go

@@ -972,16 +972,17 @@ func checkAndResetCycleTraffic(clientID uint64) {
 	currentCycleStart := transferRule.GetTransferDurationStart()
 	currentCycleEnd := transferRule.GetTransferDurationEnd()
 
-	// 读取上次重置参考时间（仍在读锁下，随后立即释放）
+	// 读取上次重置时间（仍在读锁下，随后立即释放）
 	lastResetTime := time.Time{}
-	hasNextUpdate := false
+	hasResetRecord := false
 	if stats, exists := singleton.AlertsCycleTransferStatsStore[matchingAlert.ID]; exists && stats != nil {
-		if nu, has := stats.NextUpdate[clientID]; has {
-			hasNextUpdate = true
-			// 如果NextUpdate在当前周期开始之前，说明是上个周期的记录，可以作为重置参考
-			if nu.Before(currentCycleStart) {
-				lastResetTime = nu
-			}
+		// 确保LastResetTime map已初始化
+		if stats.LastResetTime == nil {
+			stats.LastResetTime = make(map[uint64]time.Time)
+		}
+		if resetTime, has := stats.LastResetTime[clientID]; has {
+			hasResetRecord = true
+			lastResetTime = resetTime
 		}
 	}
 	singleton.AlertsLock.RUnlock()
@@ -990,9 +991,35 @@ func checkAndResetCycleTraffic(clientID uint64) {
 	needReset := false
 	now := time.Now()
 
-	// 重置条件：有NextUpdate记录且lastResetTime在当前周期之前
-	if hasNextUpdate && now.After(currentCycleStart) && !lastResetTime.IsZero() && lastResetTime.Before(currentCycleStart) {
-		needReset = true
+	// 重置条件：
+	// - 如果从未重置过（!hasResetRecord），且当前时间在周期内，则首次初始化，不重置
+	// - 如果有重置记录，检查lastResetTime是否在当前周期之前
+	if hasResetRecord {
+		// 有重置记录，检查是否需要重置
+		if lastResetTime.Before(currentCycleStart) && now.After(currentCycleStart) {
+			needReset = true
+			log.Printf("[周期流量重置] 服务器ID=%d 触发重置: 上次重置时间=%s 在当前周期 %s 之前",
+				clientID, lastResetTime.Format("2006-01-02 15:04:05"), currentCycleStart.Format("2006-01-02 15:04:05"))
+		}
+	} else {
+		if now.After(currentCycleStart) {
+			// 没有重置记录但当前时间已进入周期，说明此前未按时重置，需要立即补偿
+			needReset = true
+			log.Printf("[周期流量重置] 服务器ID=%d 首次检测发现缺失记录，立即补偿重置。当前周期开始=%s",
+				clientID, currentCycleStart.Format("2006-01-02 15:04:05"))
+		} else {
+			// 周期尚未开始，记录初始化时间，等待周期开始后再重置
+			singleton.AlertsLock.Lock()
+			if stats, exists := singleton.AlertsCycleTransferStatsStore[matchingAlert.ID]; exists && stats != nil {
+				if stats.LastResetTime == nil {
+					stats.LastResetTime = make(map[uint64]time.Time)
+				}
+				stats.LastResetTime[clientID] = now
+				log.Printf("[周期流量初始化] 服务器ID=%d 首次记录重置时间: %s", clientID, now.Format("2006-01-02 15:04:05"))
+			}
+			singleton.AlertsLock.Unlock()
+			return
+		}
 	}
 
 	if !needReset {
@@ -1045,8 +1072,12 @@ func checkAndResetCycleTraffic(clientID uint64) {
 		if stats.Transfer == nil {
 			stats.Transfer = make(map[uint64]uint64)
 		}
+		if stats.LastResetTime == nil {
+			stats.LastResetTime = make(map[uint64]time.Time)
+		}
 		stats.NextUpdate[clientID] = now
 		stats.Transfer[clientID] = 0
+		stats.LastResetTime[clientID] = now // 更新上次重置时间
 		stats.From = currentCycleStart
 		stats.To = currentCycleEnd
 	}

service/singleton/alertsentinel.go

@@ -46,14 +46,15 @@ func addCycleTransferStatsInfo(alert *model.AlertRule) {
 			from := alert.Rules[j].GetTransferDurationStart()
 			to := alert.Rules[j].GetTransferDurationEnd()
 			AlertsCycleTransferStatsStore[alert.ID] = &model.CycleTransferStats{
-				Name:       alert.Name,
-				From:       from,
-				To:         to,
-				Max:        uint64(alert.Rules[j].Max),
-				Min:        uint64(alert.Rules[j].Min),
-				ServerName: make(map[uint64]string),
-				Transfer:   make(map[uint64]uint64),
-				NextUpdate: make(map[uint64]time.Time),
+				Name:          alert.Name,
+				From:          from,
+				To:            to,
+				Max:           uint64(alert.Rules[j].Max),
+				Min:           uint64(alert.Rules[j].Min),
+				ServerName:    make(map[uint64]string),
+				Transfer:      make(map[uint64]uint64),
+				NextUpdate:    make(map[uint64]time.Time),
+				LastResetTime: make(map[uint64]time.Time),
 			}
 		}
 	}
@@ -350,7 +351,7 @@ func checkStatus() {
 			}
 			continue
 		}
-		
+
 		// 初始化每个Rule的字段，避免nil指针
 		for i := range alert.Rules {
 			if alert.Rules[i].NextTransferAt == nil {
@@ -372,7 +373,7 @@ func checkStatus() {
 				}
 				continue
 			}
-			
+
 			// 安全检查：确保alert不为nil
 			if alert == nil {
 				if Conf.Debug {
@@ -409,7 +410,7 @@ func checkStatus() {
 				// SQLite模式下，传入DB参数
 				snapshot = alert.Snapshot(cycleStats, server, DB)
 			}
-			
+
 			// 安全检查：确保snapshot不为nil
 			if snapshot == nil {
 				snapshot = make([]interface{}, 0)
@@ -1197,7 +1198,7 @@ func generateThresholdAlertMessage(alert *model.AlertRule, server *model.Server,
 	}
 
 	usagePercent := float64(currentUsage) / rule.Max * 100
-	
+
 	// 根据实际使用百分比生成动态标题
 	var dynamicTitle string
 	if usagePercent >= 100 {
@@ -1207,7 +1208,7 @@ func generateThresholdAlertMessage(alert *model.AlertRule, server *model.Server,
 	} else {
 		dynamicTitle = fmt.Sprintf("%.1f%%流量使用提醒", usagePercent)
 	}
-	
+
 	message := fmt.Sprintf("%s %s\n", icon, dynamicTitle)
 	message += fmt.Sprintf("时间: %s\n", now.Format("2006-01-02 15:04:05"))
 	message += fmt.Sprintf("服务器: %s\n", server.Name)