Bug fix.

Author: xOS

cmd/dashboard/main.go

@@ -60,12 +60,7 @@ func initSystem() {
 			singleton.SyncAllServerTrafficFromDB()
 		} else {
 			log.Println("使用BadgerDB，执行BadgerDB监控历史清理...")
-			count, err := singleton.CleanMonitorHistory()
-			if err != nil {
-				log.Printf("BadgerDB监控历史清理失败: %v", err)
-			} else {
-				log.Printf("BadgerDB监控历史清理完成，清理了%d条记录", count)
-			}
+			singleton.CleanMonitorHistory()
 		}
 
 		// 特别强调：面板重启时必须执行流量重新计算

db/model_ops.go

@@ -6,7 +6,6 @@ import (
 	"log"
 	"sort"
 	"strconv"
-	"strings"
 	"sync"
 	"time"
 
@@ -373,47 +372,84 @@ func (o *MonitorHistoryOps) GetMonitorHistoriesByServerAndMonitorRangeReverseLim
 // CleanupOldMonitorHistories removes monitor histories older than maxAge
 func (o *MonitorHistoryOps) CleanupOldMonitorHistories(maxAge time.Duration) (int, error) {
 	cutoffNano := time.Now().Add(-maxAge).UnixNano()
-	keys, err := o.db.GetKeysWithPrefix("monitor_history:")
-	if err != nil {
-		return 0, err
-	}
+	const scanBatchSize = 5000
+	const deleteBatchSize = 1000
+	prefix := []byte("monitor_history:")
 
-	keysToDelete := make([]string, 0, len(keys)/2)
-	for _, key := range keys {
-		idx := strings.LastIndexByte(key, ':')
-		if idx <= 0 || idx+1 >= len(key) {
-			continue
-		}
+	deleted := 0
+	startKey := append([]byte{}, prefix...)
+
+	for {
+		keysToDelete := make([]string, 0, deleteBatchSize)
+		hasMore := false
+		nextStartKey := make([]byte, 0)
+
+		o.db.rwMutex.RLock()
+		err := o.db.db.View(func(txn *badger.Txn) error {
+			opts := badger.DefaultIteratorOptions
+			opts.PrefetchValues = false
+			it := txn.NewIterator(opts)
+			defer it.Close()
+
+			scanned := 0
+			for it.Seek(startKey); it.ValidForPrefix(prefix); it.Next() {
+				scanned++
+
+				key := it.Item().KeyCopy(nil)
+				idx := bytes.LastIndexByte(key, ':')
+				if idx > 0 && idx+1 < len(key) {
+					ts, parseErr := strconv.ParseInt(string(key[idx+1:]), 10, 64)
+					if parseErr == nil && ts <= cutoffNano {
+						keysToDelete = append(keysToDelete, string(key))
+					}
+				}
 
-		ts, parseErr := strconv.ParseInt(key[idx+1:], 10, 64)
-		if parseErr != nil {
-			continue
-		}
+				if scanned >= scanBatchSize {
+					nextStartKey = append([]byte{}, key...)
+					nextStartKey = append(nextStartKey, 0)
+					hasMore = true
+					break
+				}
+			}
 
-		if ts <= cutoffNano {
-			keysToDelete = append(keysToDelete, key)
+			return nil
+		})
+		o.db.rwMutex.RUnlock()
+		if err != nil {
+			return deleted, err
 		}
-	}
 
-	if len(keysToDelete) == 0 {
-		return 0, nil
-	}
+		for start := 0; start < len(keysToDelete); start += deleteBatchSize {
+			end := start + deleteBatchSize
+			if end > len(keysToDelete) {
+				end = len(keysToDelete)
+			}
 
-	// Batch delete in one write transaction to reduce lock and txn overhead.
-	o.db.rwMutex.Lock()
-	defer o.db.rwMutex.Unlock()
-	if err := o.db.db.Update(func(txn *badger.Txn) error {
-		for _, key := range keysToDelete {
-			if delErr := txn.Delete([]byte(key)); delErr != nil {
-				return delErr
+			batch := keysToDelete[start:end]
+			o.db.rwMutex.Lock()
+			err = o.db.db.Update(func(txn *badger.Txn) error {
+				for _, key := range batch {
+					if delErr := txn.Delete([]byte(key)); delErr != nil {
+						return delErr
+					}
+				}
+				return nil
+			})
+			o.db.rwMutex.Unlock()
+			if err != nil {
+				return deleted, err
 			}
+
+			deleted += len(batch)
 		}
-		return nil
-	}); err != nil {
-		return 0, err
+
+		if !hasMore {
+			break
+		}
+		startKey = append([]byte{}, nextStartKey...)
 	}
 
-	return len(keysToDelete), nil
+	return deleted, nil
 }
 
 // UserOps provides specialized operations for users

pkg/geoip/geoip.db

@@ -1 +0,0 @@
-stub

service/singleton/crontask.go

@@ -85,7 +85,9 @@ func InitCronTask() {
 // loadCronTasks 加载计划任务
 func loadCronTasks() {
 	log.Println("加载计划任务...")
-	InitCronTask()
+	if Cron == nil {
+		InitCronTask()
+	}
 
 	// 如果使用BadgerDB，从BadgerDB加载定时任务
 	if Conf.DatabaseType == "badger" {