迁移配置表

internal/apps/openflare/geoip/runtime.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/Rain-kl/Wavelet/internal/apps/agent/geoipdata"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	"github.com/Rain-kl/Wavelet/internal/repository"
 	pkggeoip "github.com/Rain-kl/Wavelet/pkg/geoip"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 )
@@ -30,30 +31,29 @@ var (
 	currentProvider   string
 )
 
-// EnsureRuntimeProvider loads OpenFlare options once and configures pkg/geoip.
+// EnsureRuntimeProvider loads GeoIP provider config from SystemConfig.
 func EnsureRuntimeProvider(ctx context.Context) error {
 	runtimeOnce.Do(func() {
-		if err := model.InitOptionMap(ctx); err != nil {
-			runtimeInitErr = err
-			return
-		}
-		runtimeInitErr = applyProviderFromModel(ctx)
+		runtimeInitErr = applyProviderFromSystemConfig(ctx)
 	})
 	return runtimeInitErr
 }
 
-// RefreshRuntimeProvider reapplies GeoIPProvider after option updates.
+// RefreshRuntimeProvider reapplies GeoIPProvider after config updates.
 func RefreshRuntimeProvider(ctx context.Context) error {
-	if err := model.InitOptionMap(ctx); err != nil {
-		return err
-	}
-	return applyProviderFromModel(ctx)
+	return applyProviderFromSystemConfig(ctx)
 }
 
-func applyProviderFromModel(ctx context.Context) error {
-	model.OptionMapRWMutex.RLock()
-	provider := strings.TrimSpace(model.GeoIPProvider)
-	model.OptionMapRWMutex.RUnlock()
+func applyProviderFromSystemConfig(ctx context.Context) error {
+	config, err := repository.GetSystemConfigByKey(ctx, model.ConfigKeyGeoIPProvider)
+	if err != nil {
+		// 降级到默认值
+		return ApplyProvider(ctx, "ipinfo")
+	}
+	provider := strings.TrimSpace(config.Value)
+	if provider == "" {
+		provider = "ipinfo"
+	}
 	return ApplyProvider(ctx, provider)
 }
 

internal/apps/openflare/geoip/runtime_test.go

@@ -16,21 +16,25 @@ func TestEnsureRuntimeProviderInitializesConfiguredProvider(t *testing.T) {
 	if err != nil {
 		t.Fatalf("open sqlite: %v", err)
 	}
-	if err := sqliteDB.AutoMigrate(&model.OpenFlareOption{}); err != nil {
+	if err := sqliteDB.AutoMigrate(&model.SystemConfig{}); err != nil {
 		t.Fatalf("migrate: %v", err)
 	}
 	db.SetDB(sqliteDB)
 	t.Cleanup(func() {
 		db.SetDB(nil)
-		model.ResetOptionMapForTest()
 		ResetRuntimeForTest()
 	})
 
 	ctx := context.Background()
-	model.ResetOptionMapForTest()
 	ResetRuntimeForTest()
-	if err := model.UpdateOpenFlareOption(ctx, "GeoIPProvider", pkggeoip.ProviderIPInfo); err != nil {
-		t.Fatalf("update option: %v", err)
+	// 通过 SystemConfig 设置 GeoIPProvider 配置
+	if err := db.DB(ctx).Create(&model.SystemConfig{
+		Key:        model.ConfigKeyGeoIPProvider,
+		Value:      pkggeoip.ProviderIPInfo,
+		Type:       "business",
+		Visibility: 0,
+	}).Error; err != nil {
+		t.Fatalf("create system config: %v", err)
 	}
 
 	if err := EnsureRuntimeProvider(ctx); err != nil {