优化结构

internal/data/config_store.go

@@ -182,8 +182,6 @@ func (d *Data) persistConfigValuesLocked(dataConfig *conf.Data, adminConfig *con
 	fileAdmin := cloneAdminConfig(adminConfig)
 	fileAdmin.Storage = nil
 	fileAdmin.Email = nil
-	fileAdmin.Websocket = nil
-	fileAdmin.Mq = nil
 	adminValue, err := protoMap(fileAdmin)
 	if err != nil {
 		return err
@@ -365,8 +363,6 @@ func (d *Data) reloadConfig(ctx context.Context) error {
 	}
 	legacyStorage := next.Admin.Storage
 	legacyEmail := next.Admin.Email
-	legacyWebSocket := next.Admin.Websocket
-	legacyMQ := next.Admin.Mq
 	currentAdmin := d.runtime.Admin()
 	if legacyStorage == nil {
 		if currentAdmin != nil {
@@ -376,12 +372,6 @@ func (d *Data) reloadConfig(ctx context.Context) error {
 	if legacyEmail == nil && currentAdmin != nil {
 		legacyEmail = currentAdmin.Email
 	}
-	if legacyWebSocket == nil && currentAdmin != nil {
-		legacyWebSocket = currentAdmin.Websocket
-	}
-	if legacyMQ == nil && currentAdmin != nil {
-		legacyMQ = currentAdmin.Mq
-	}
 	storageConfig, err := resolveStorageIntegrationConfig(candidateDB.WithContext(ctx), legacyStorage)
 	if err != nil {
 		return fmt.Errorf("reload storage configuration: %w", err)
@@ -392,16 +382,6 @@ func (d *Data) reloadConfig(ctx context.Context) error {
 		return fmt.Errorf("reload email configuration: %w", err)
 	}
 	next.Admin.Email = emailConfig
-	websocketConfig, err := resolveWebSocketIntegrationConfig(candidateDB.WithContext(ctx), legacyWebSocket)
-	if err != nil {
-		return fmt.Errorf("reload websocket configuration: %w", err)
-	}
-	next.Admin.Websocket = websocketConfig
-	mqConfig, err := resolveMQIntegrationConfig(candidateDB.WithContext(ctx), legacyMQ)
-	if err != nil {
-		return fmt.Errorf("reload mq configuration: %w", err)
-	}
-	next.Admin.Mq = mqConfig
 	candidateStorage, err := storage.New(next.Admin)
 	if err != nil {
 		return fmt.Errorf("reload storage: %w", err)
@@ -436,6 +416,9 @@ func (d *Data) reloadConfig(ctx context.Context) error {
 		mongoAccepted = true
 	}
 	d.runtime.Replace(next.Data, next.Admin)
+	if err = d.loadIntegrationRuntime(candidateDB); err != nil {
+		return fmt.Errorf("reload integration runtime: %w", err)
+	}
 	if d.storage != nil {
 		d.storage.Replace(candidateStorage)
 	}