优化结构

app/system/internal/data/initialization_backend.go

@@ -69,6 +69,12 @@ func (d *Data) PersistAdminConfig(ctx context.Context, raw []byte) error {
 	if next.Email == nil {
 		next.Email = currentAdmin.Email
 	}
+	if next.Websocket == nil {
+		next.Websocket = currentAdmin.Websocket
+	}
+	if next.Mq == nil {
+		next.Mq = currentAdmin.Mq
+	}
 	next.ConfigPath = currentAdmin.ConfigPath
 	candidateStorage, err := storage.New(next)
 	if err != nil {
@@ -80,6 +86,12 @@ func (d *Data) PersistAdminConfig(ctx context.Context, raw []byte) error {
 	if err := d.persistEmailIntegrationConfig(ctx, next.Email); err != nil {
 		return err
 	}
+	if err := d.PersistWebSocketConfig(ctx, next.Websocket); err != nil {
+		return err
+	}
+	if err := d.persistMQIntegrationConfig(ctx, next.Mq); err != nil {
+		return err
+	}
 	if err := d.persistConfigValues(currentData, next); err != nil {
 		return err
 	}
@@ -108,6 +120,12 @@ func (d *Data) PersistRuntimeConfig(ctx context.Context, dataRaw, adminRaw []byt
 	if nextAdmin.Email == nil {
 		nextAdmin.Email = currentAdmin.Email
 	}
+	if nextAdmin.Websocket == nil {
+		nextAdmin.Websocket = currentAdmin.Websocket
+	}
+	if nextAdmin.Mq == nil {
+		nextAdmin.Mq = currentAdmin.Mq
+	}
 	nextAdmin.ConfigPath = currentAdmin.ConfigPath
 	candidateStorage, err := storage.New(nextAdmin)
 	if err != nil {
@@ -119,6 +137,12 @@ func (d *Data) PersistRuntimeConfig(ctx context.Context, dataRaw, adminRaw []byt
 	if err := d.persistEmailIntegrationConfig(ctx, nextAdmin.Email); err != nil {
 		return err
 	}
+	if err := d.PersistWebSocketConfig(ctx, nextAdmin.Websocket); err != nil {
+		return err
+	}
+	if err := d.persistMQIntegrationConfig(ctx, nextAdmin.Mq); err != nil {
+		return err
+	}
 	if err := d.persistConfigValues(nextData, nextAdmin); err != nil {
 		return err
 	}
@@ -205,6 +229,14 @@ func (d *Data) InitializeDatabase(ctx context.Context, input *biz.DatabaseConfig
 	if err != nil {
 		return fmt.Errorf("initialize email integration configuration: %w", err)
 	}
+	var legacyWebSocket *conf.AdminBackend_WebSocket
+	if currentAdmin != nil {
+		legacyWebSocket = currentAdmin.Websocket
+	}
+	websocketConfig, err := resolveWebSocketIntegrationConfig(candidate.WithContext(ctx), legacyWebSocket)
+	if err != nil {
+		return fmt.Errorf("initialize websocket integration configuration: %w", err)
+	}
 	signingKey := uuid.NewString()
 	if err := d.persistDatabaseConfig(config, signingKey); err != nil {
 		return fmt.Errorf("persist database configuration: %w", err)
@@ -219,7 +251,13 @@ func (d *Data) InitializeDatabase(ctx context.Context, input *biz.DatabaseConfig
 	}
 	currentAdmin.Jwt.SigningKey = signingKey
 	currentAdmin.Storage = storageConfig
+	currentAdmin.Websocket = websocketConfig
 	currentAdmin.Email = emailConfig
+	mqConfig, err := resolveMQIntegrationConfig(candidate.WithContext(ctx), currentAdmin.Mq)
+	if err != nil {
+		return fmt.Errorf("initialize mq integration configuration: %w", err)
+	}
+	currentAdmin.Mq = mqConfig
 	d.runtime.Replace(currentData, currentAdmin)
 	activated = true
 	return nil