迁移配置表

internal/apps/openflare/integration/agent_protocol_test.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/agent"
 	ofnode "github.com/Rain-kl/Wavelet/internal/apps/openflare/node"
-	"github.com/Rain-kl/Wavelet/internal/apps/openflare/option"
 	"github.com/Rain-kl/Wavelet/internal/db"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
@@ -43,7 +42,7 @@ func setupProtocolTestEnv(t *testing.T) (*gin.Engine, func()) {
 	require.NoError(t, err)
 	require.NoError(t, sqliteDB.AutoMigrate(
 		&model.OpenFlareNode{},
-		&model.OpenFlareOption{},
+		&model.SystemConfig{},
 		&model.OpenFlareApplyLog{},
 		&model.OpenFlareNodeSystemProfile{},
 		&model.OpenFlareHealthEvent{},
@@ -51,7 +50,6 @@ func setupProtocolTestEnv(t *testing.T) (*gin.Engine, func()) {
 	))
 
 	db.SetDB(sqliteDB)
-	option.ResetInitializationForTest()
 	agent.ResetAuthCacheForTest()
 	resetAccessLogStore := model.SetAccessLogStoreForTest(model.NewMemoryAccessLogStore())
 	resetObservabilityStore := model.SetObservabilityStoreForTest(model.NewMemoryObservabilityStore())
@@ -63,7 +61,6 @@ func setupProtocolTestEnv(t *testing.T) (*gin.Engine, func()) {
 		resetObservabilityStore()
 		resetAccessLogStore()
 		db.SetDB(nil)
-		option.ResetInitializationForTest()
 		agent.ResetAuthCacheForTest()
 	}
 	return engine, cleanup

internal/apps/openflare/integration/auth_option_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/apps/admin"
 	"github.com/Rain-kl/Wavelet/internal/apps/cap"
 	"github.com/Rain-kl/Wavelet/internal/apps/oauth"
-	"github.com/Rain-kl/Wavelet/internal/apps/openflare/option"
 	"github.com/Rain-kl/Wavelet/internal/config"
 	"github.com/Rain-kl/Wavelet/internal/db/idgen"
 	"github.com/Rain-kl/Wavelet/internal/model"
@@ -28,7 +27,8 @@ import (
 )
 
 type statusPayload struct {
-	SystemName string `json:"system_name"`
+	Version       string `json:"version"`
+	ServerAddress string `json:"server_address"`
 }
 
 func setupAuthOptionIntegration(t *testing.T) (*gorm.DB, *gin.Engine) {
@@ -37,10 +37,6 @@ func setupAuthOptionIntegration(t *testing.T) (*gorm.DB, *gin.Engine) {
 	dbConn, _, cleanup := testhelper.SetupTestEnvironment(t)
 	t.Cleanup(cleanup)
 
-	require.NoError(t, dbConn.AutoMigrate(&model.OpenFlareOption{}))
-	option.ResetInitializationForTest()
-	t.Cleanup(option.ResetInitializationForTest)
-
 	require.NoError(t, dbConn.Model(&model.SystemConfig{}).
 		Where("key = ?", model.ConfigKeyCapLoginEnabled).
 		Update("value", "false").Error)
@@ -119,7 +115,7 @@ func TestGETStatusReturnsSuccessEnvelope(t *testing.T) {
 
 	var status statusPayload
 	unmarshalAPIData(t, resp.Data, &status)
-	assert.NotEmpty(t, status.SystemName)
+	assert.NotEmpty(t, status.Version)
 }
 
 func TestGETOptionRequiresAdminAuth(t *testing.T) {
@@ -175,30 +171,28 @@ func TestGETNodesWithAccessToken(t *testing.T) {
 	requireAPIOK(t, w)
 }
 
-func TestOptionHotReloadAfterUpdate(t *testing.T) {
+func TestOptionUpdatePersistsAndReflectsInStatus(t *testing.T) {
 	dbConn, r := setupAuthOptionIntegration(t)
 	adminToken := seedUserWithAccessToken(t, dbConn, "admin", "password123", true)
 
-	statusBefore := getStatusSystemName(t, r, nil)
-	assert.NotEmpty(t, statusBefore)
-
 	updateResp := performJSONRequest(t, r, http.MethodPost, apiPath("/option/update"), map[string]string{
-		"key":   "SystemName",
-		"value": "HotReloadIntegration",
+		"key":   model.ConfigKeyServerAddress,
+		"value": "https://hotreload.openflare.test",
 	}, adminAuthHeaders(adminToken))
 	assert.Equal(t, http.StatusOK, updateResp.Code)
 	requireAPIOK(t, updateResp)
 
-	statusAfter := getStatusSystemName(t, r, nil)
-	assert.Equal(t, "HotReloadIntegration", statusAfter)
-	assert.Equal(t, "HotReloadIntegration", model.SystemName)
+	statusAfter := getStatusServerAddress(t, r, nil)
+	assert.Equal(t, "https://hotreload.openflare.test", statusAfter)
 
+	// 验证已持久化到 SystemConfig
 	ctx := context.Background()
-	require.NoError(t, option.EnsureInitialized(ctx))
-	assert.Equal(t, "HotReloadIntegration", model.OptionValue("SystemName"))
+	saved, err := repository.GetSystemConfigByKey(ctx, model.ConfigKeyServerAddress)
+	require.NoError(t, err)
+	assert.Equal(t, "https://hotreload.openflare.test", saved.Value)
 }
 
-func getStatusSystemName(t *testing.T, r http.Handler, headers map[string]string) string {
+func getStatusServerAddress(t *testing.T, r http.Handler, headers map[string]string) string {
 	t.Helper()
 
 	w := performJSONRequest(t, r, http.MethodGet, apiPath("/status"), nil, headers)
@@ -207,5 +201,5 @@ func getStatusSystemName(t *testing.T, r http.Handler, headers map[string]string
 
 	var status statusPayload
 	unmarshalAPIData(t, resp.Data, &status)
-	return status.SystemName
-}
+	return status.ServerAddress
+}

internal/apps/openflare/integration/core_chain_test.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/agent"
-	"github.com/Rain-kl/Wavelet/internal/apps/openflare/option"
 	"github.com/Rain-kl/Wavelet/internal/db"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
@@ -48,12 +47,11 @@ func setupCoreChainTest(t *testing.T) (*gin.Engine, adminSeed, func()) {
 		&model.OpenFlareWAFRuleGroupBinding{},
 		&model.OpenFlareWAFIPGroup{},
 		&model.OpenFlareNode{},
-		&model.OpenFlareOption{},
+		&model.SystemConfig{},
 		&model.OpenFlareApplyLog{},
 	))
 
 	db.SetDB(sqliteDB)
-	option.ResetInitializationForTest()
 	agent.ResetAuthCacheForTest()
 
 	seed, err := seedAdminWithAccessToken(sqliteDB)
@@ -64,7 +62,6 @@ func setupCoreChainTest(t *testing.T) (*gin.Engine, adminSeed, func()) {
 
 	cleanup := func() {
 		db.SetDB(nil)
-		option.ResetInitializationForTest()
 		agent.ResetAuthCacheForTest()
 	}
 
@@ -272,4 +269,4 @@ func TestCoreChainMigrationFlow(t *testing.T) {
 		assert.Equal(t, configChecksum, nodeView["latest_apply_checksum"])
 		assert.Equal(t, float64(2), nodeView["latest_support_file_count"])
 	})
-}
+}

internal/apps/openflare/integration/security_test.go

@@ -15,7 +15,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Rain-kl/Wavelet/internal/apps/openflare/option"
 	"github.com/Rain-kl/Wavelet/internal/config"
 	"github.com/Rain-kl/Wavelet/internal/db"
 	"github.com/Rain-kl/Wavelet/internal/model"
@@ -46,10 +45,10 @@ func setupSecurityTest(t *testing.T) (*gin.Engine, adminSeed, func()) {
 		&model.ManagedDomain{},
 		&model.DNSAccount{},
 		&model.AcmeAccount{},
+		&model.SystemConfig{},
 	))
 
 	db.SetDB(sqliteDB)
-	option.ResetInitializationForTest()
 
 	seed, err := seedAdminWithAccessToken(sqliteDB)
 	require.NoError(t, err)
@@ -63,7 +62,6 @@ func setupSecurityTest(t *testing.T) (*gin.Engine, adminSeed, func()) {
 	cleanup := func() {
 		config.Config.App.SessionSecret = oldSecret
 		db.SetDB(nil)
-		option.ResetInitializationForTest()
 	}
 
 	return engine, seed, cleanup
@@ -357,4 +355,4 @@ func TestSecurityWAFTLSMigrationFlow(t *testing.T) {
 	_ = ipGroupID
 	_ = domainID
 	_ = dnsAccountID
-}
+}