feat: key检测重试功能

cmd/gpt-load/main.go

@@ -86,7 +86,7 @@ func main() {
 
 	taskService := services.NewTaskService(storage)
 	channelFactory := channel.NewFactory(settingsManager)
-	keyValidatorService := services.NewKeyValidatorService(database, channelFactory)
+	keyValidatorService := services.NewKeyValidatorService(database, channelFactory, settingsManager)
 
 	keyManualValidationService := services.NewKeyManualValidationService(database, keyValidatorService, taskService, settingsManager)
 	keyCronService := services.NewKeyCronService(database, keyValidatorService, settingsManager)

internal/services/key_cron_service.go

@@ -56,7 +56,7 @@ func (s *KeyCronService) run() {
 		// Dynamically get the interval for the next run
 		intervalMinutes := s.SettingsManager.GetInt("key_validation_interval_minutes", 60)
 		if intervalMinutes <= 0 {
-			intervalMinutes = 60 // Fallback to a safe default
+			intervalMinutes = 60
 		}
 		nextRunTimer := time.NewTimer(time.Duration(intervalMinutes) * time.Minute)
 
@@ -84,6 +84,7 @@ func (s *KeyCronService) validateAllGroups(ctx context.Context) {
 			// Get effective settings for the group
 			effectiveSettings := s.SettingsManager.GetEffectiveConfig(g.Config)
 			interval := time.Duration(effectiveSettings.KeyValidationIntervalMinutes) * time.Minute
+			logrus.Infof("KeyCronService: Validating group %s with interval %s", g.Name, interval)
 
 			// Check if it's time to validate this group
 			if g.LastValidatedAt == nil || time.Since(*g.LastValidatedAt) > interval {

internal/services/key_validator_service.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"gpt-load/internal/channel"
+	"gpt-load/internal/config"
 	"gpt-load/internal/models"
 
 	"github.com/sirupsen/logrus"
@@ -19,21 +20,22 @@ type KeyTestResult struct {
 
 // KeyValidatorService provides methods to validate API keys.
 type KeyValidatorService struct {
-	DB             *gorm.DB
+	DB              *gorm.DB
-	channelFactory *channel.Factory
+	channelFactory  *channel.Factory
+	SettingsManager *config.SystemSettingsManager
 }
 
 // NewKeyValidatorService creates a new KeyValidatorService.
-func NewKeyValidatorService(db *gorm.DB, factory *channel.Factory) *KeyValidatorService {
+func NewKeyValidatorService(db *gorm.DB, factory *channel.Factory, settingsManager *config.SystemSettingsManager) *KeyValidatorService {
 	return &KeyValidatorService{
-		DB:             db,
+		DB:              db,
-		channelFactory: factory,
+		channelFactory:  factory,
+		SettingsManager: settingsManager,
 	}
 }
 
 // ValidateSingleKey performs a validation check on a single API key.
 func (s *KeyValidatorService) ValidateSingleKey(ctx context.Context, key *models.APIKey, group *models.Group) (bool, error) {
-	// 添加超时保护
 	if ctx.Err() != nil {
 		return false, fmt.Errorf("context cancelled or timed out: %w", ctx.Err())
 	}
@@ -49,56 +51,52 @@ func (s *KeyValidatorService) ValidateSingleKey(ctx context.Context, key *models
 		return false, fmt.Errorf("failed to get channel for group %s: %w", group.Name, err)
 	}
 
-	// 记录验证开始
+	effectiveSettings := s.SettingsManager.GetEffectiveConfig(group.Config)
-	logrus.WithFields(logrus.Fields{
+	retries := effectiveSettings.BlacklistThreshold
-		"key_id":     key.ID,
+	if retries <= 0 {
-		"group_id":   group.ID,
+		retries = 1
-		"group_name": group.Name,
-	}).Debug("Starting key validation")
-
-	isValid, validationErr := ch.ValidateKey(ctx, key.KeyValue)
-	if validationErr != nil {
-		logrus.WithFields(logrus.Fields{
-			"key_id":     key.ID,
-			"group_id":   group.ID,
-			"group_name": group.Name,
-			"error":      validationErr,
-		}).Debug("Key validation failed")
-		return false, validationErr
 	}
 
-	// 记录验证结果
+	var lastErr error
-	logrus.WithFields(logrus.Fields{
+	for range retries {
-		"key_id":     key.ID,
+		isValid, validationErr := ch.ValidateKey(ctx, key.KeyValue)
-		"group_id":   group.ID,
+		if validationErr == nil && isValid {
-		"group_name": group.Name,
+			logrus.WithFields(logrus.Fields{
-		"is_valid":   isValid,
+				"key_id":   key.ID,
-	}).Debug("Key validation completed")
+				"is_valid": isValid,
+			}).Debug("Key validation successful")
+			return true, nil
+		}
 
-	return isValid, nil
+		lastErr = validationErr
+	}
+
+	logrus.WithFields(logrus.Fields{
+		"key_id":      key.ID,
+		"group_id":    group.ID,
+		"max_retries": retries,
+	}).Debug("Key validation failed after all retries")
+
+	return false, lastErr
 }
 
 // TestMultipleKeys performs a synchronous validation for a list of key values within a specific group.
 func (s *KeyValidatorService) TestMultipleKeys(ctx context.Context, group *models.Group, keyValues []string) ([]KeyTestResult, error) {
 	results := make([]KeyTestResult, len(keyValues))
-	ch, err := s.channelFactory.GetChannel(group)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get channel for group %s: %w", group.Name, err)
-	}
 
 	// Find which of the provided keys actually exist in the database for this group
 	var existingKeys []models.APIKey
 	if err := s.DB.Where("group_id = ? AND key_value IN ?", group.ID, keyValues).Find(&existingKeys).Error; err != nil {
 		return nil, fmt.Errorf("failed to query keys from DB: %w", err)
 	}
-	existingKeyMap := make(map[string]bool)
+	existingKeyMap := make(map[string]models.APIKey)
 	for _, k := range existingKeys {
-		existingKeyMap[k.KeyValue] = true
+		existingKeyMap[k.KeyValue] = k
 	}
 
 	for i, kv := range keyValues {
-		// Pre-check: ensure the key belongs to the group to prevent unnecessary API calls
+		apiKey, exists := existingKeyMap[kv]
-		if !existingKeyMap[kv] {
+		if !exists {
 			results[i] = KeyTestResult{
 				KeyValue: kv,
 				IsValid:  false,
@@ -107,11 +105,11 @@ func (s *KeyValidatorService) TestMultipleKeys(ctx context.Context, group *model
 			continue
 		}
 
-		isValid, validationErr := ch.ValidateKey(ctx, kv)
+		isValid, validationErr := s.ValidateSingleKey(ctx, &apiKey, group)
 		results[i] = KeyTestResult{
 			KeyValue: kv,
 			IsValid:  isValid,
-			Error:    "", // Explicitly set error to empty string on success
+			Error:    "",
 		}
 		if validationErr != nil {
 			results[i].Error = validationErr.Error()