换成单集群模式

EdgeAPI/internal/rpc/services/httpdns/service_httpdns_app.go

@@ -2,12 +2,13 @@ package httpdns
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"github.com/TeaOSLab/EdgeAPI/internal/rpc/services"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/userconfigs"
 	"github.com/iwind/TeaGo/dbs"
-	"github.com/iwind/TeaGo/types"
 	"strings"
 	"time"
 
@@ -66,25 +67,35 @@ func (this *HTTPDNSAppService) CreateHTTPDNSApp(ctx context.Context, req *pb.Cre
 			return errors.New("appId already exists")
 		}
 
-		primaryClusterId := req.PrimaryClusterId
-		backupClusterId := req.BackupClusterId
-		if primaryClusterId <= 0 || backupClusterId <= 0 {
-			defaultPrimaryClusterId, defaultBackupClusterId, err := readHTTPDNSDefaultClusterIds(tx)
-			if err != nil {
-				return err
+		// 使用 clusterIdsJSON；若为空则优先从用户关联集群获取，再 fallback 到全局默认
+		clusterIdsJSON := req.ClusterIdsJSON
+		if len(clusterIdsJSON) == 0 || string(clusterIdsJSON) == "[]" || string(clusterIdsJSON) == "null" {
+			// 优先读取用户关联的 HTTPDNS 集群
+			if req.UserId > 0 {
+				user, userErr := models.SharedUserDAO.FindEnabledUser(tx, req.UserId, nil)
+				if userErr != nil {
+					return userErr
+				}
+				if user != nil && len(user.HttpdnsClusterIds) > 0 {
+					var userClusterIds []int64
+					if json.Unmarshal([]byte(user.HttpdnsClusterIds), &userClusterIds) == nil && len(userClusterIds) > 0 {
+						clusterIdsJSON, _ = json.Marshal(userClusterIds)
+					}
+				}
 			}
-			if primaryClusterId <= 0 {
-				primaryClusterId = defaultPrimaryClusterId
+			// fallback 到全局默认
+			if len(clusterIdsJSON) == 0 || string(clusterIdsJSON) == "[]" || string(clusterIdsJSON) == "null" {
+				defaultClusterIds, defaultErr := readHTTPDNSDefaultClusterIdList(tx)
+				if defaultErr != nil {
+					return defaultErr
+				}
+				if len(defaultClusterIds) > 0 {
+					clusterIdsJSON, _ = json.Marshal(defaultClusterIds)
+				}
 			}
-			if backupClusterId <= 0 {
-				backupClusterId = defaultBackupClusterId
-			}
-		}
-		if primaryClusterId > 0 && backupClusterId == primaryClusterId {
-			backupClusterId = 0
 		}
 
-		appDbId, err = models.SharedHTTPDNSAppDAO.CreateApp(tx, appName, appId, primaryClusterId, backupClusterId, req.IsOn, req.UserId)
+		appDbId, err = models.SharedHTTPDNSAppDAO.CreateApp(tx, appName, appId, clusterIdsJSON, req.IsOn, req.UserId)
 		if err != nil {
 			return err
 		}
@@ -100,44 +111,47 @@ func (this *HTTPDNSAppService) CreateHTTPDNSApp(ctx context.Context, req *pb.Cre
 	return &pb.CreateHTTPDNSAppResponse{AppDbId: appDbId}, nil
 }
 
-func readHTTPDNSDefaultClusterIds(tx *dbs.Tx) (primaryClusterId int64, backupClusterId int64, err error) {
-	primaryClusterId, err = models.SharedHTTPDNSClusterDAO.FindDefaultPrimaryClusterId(tx)
+// readHTTPDNSDefaultClusterIdList reads default cluster IDs from UserRegisterConfig.
+func readHTTPDNSDefaultClusterIdList(tx *dbs.Tx) ([]int64, error) {
+	// 优先从 UserRegisterConfig 中读取
+	configJSON, err := models.SharedSysSettingDAO.ReadSetting(tx, systemconfigs.SettingCodeUserRegisterConfig)
 	if err != nil {
-		return 0, 0, err
+		return nil, err
 	}
-
-	backupClusterId = 0
-	backupValueJSON, err := models.SharedSysSettingDAO.ReadSetting(tx, systemconfigs.SettingCodeHTTPDNSDefaultBackupClusterId)
-	if err != nil {
-		return 0, 0, err
-	}
-	if len(backupValueJSON) > 0 {
-		backupClusterId = types.Int64(string(backupValueJSON))
-	}
-	if backupClusterId > 0 {
-		backupCluster, err := models.SharedHTTPDNSClusterDAO.FindEnabledCluster(tx, backupClusterId)
-		if err != nil {
-			return 0, 0, err
-		}
-		if backupCluster == nil || !backupCluster.IsOn {
-			backupClusterId = 0
+	if len(configJSON) > 0 {
+		var config userconfigs.UserRegisterConfig
+		if err := json.Unmarshal(configJSON, &config); err == nil {
+			if len(config.HTTPDNSDefaultClusterIds) > 0 {
+				// 验证集群有效性
+				var validIds []int64
+				for _, id := range config.HTTPDNSDefaultClusterIds {
+					if id <= 0 {
+						continue
+					}
+					cluster, err := models.SharedHTTPDNSClusterDAO.FindEnabledCluster(tx, id)
+					if err != nil {
+						return nil, err
+					}
+					if cluster != nil && cluster.IsOn {
+						validIds = append(validIds, id)
+					}
+				}
+				if len(validIds) > 0 {
+					return validIds, nil
+				}
+			}
 		}
 	}
 
+	// fallback：默认主集群
+	primaryClusterId, err := models.SharedHTTPDNSClusterDAO.FindDefaultPrimaryClusterId(tx)
+	if err != nil {
+		return nil, err
+	}
 	if primaryClusterId > 0 {
-		primaryCluster, err := models.SharedHTTPDNSClusterDAO.FindEnabledCluster(tx, primaryClusterId)
-		if err != nil {
-			return 0, 0, err
-		}
-		if primaryCluster == nil || !primaryCluster.IsOn {
-			primaryClusterId = 0
-		}
+		return []int64{primaryClusterId}, nil
 	}
-
-	if primaryClusterId > 0 && backupClusterId == primaryClusterId {
-		backupClusterId = 0
-	}
-	return primaryClusterId, backupClusterId, nil
+	return nil, nil
 }
 
 func (this *HTTPDNSAppService) UpdateHTTPDNSApp(ctx context.Context, req *pb.UpdateHTTPDNSAppRequest) (*pb.RPCSuccess, error) {
@@ -161,13 +175,8 @@ func (this *HTTPDNSAppService) UpdateHTTPDNSApp(ctx context.Context, req *pb.Upd
 		if userId > 0 {
 			targetUserId = userId
 		}
-		primaryClusterId := req.PrimaryClusterId
-		backupClusterId := req.BackupClusterId
-		if primaryClusterId > 0 && backupClusterId == primaryClusterId {
-			backupClusterId = 0
-		}
 
-		err = models.SharedHTTPDNSAppDAO.UpdateApp(tx, req.AppDbId, req.Name, primaryClusterId, backupClusterId, req.IsOn, targetUserId)
+		err = models.SharedHTTPDNSAppDAO.UpdateApp(tx, req.AppDbId, req.Name, req.ClusterIdsJSON, req.IsOn, targetUserId)
 		if err != nil {
 			return err
 		}