换成单集群模式

EdgeAPI/internal/rpc/services/users/service_user.go

@@ -71,7 +71,7 @@ func (this *UserService) UpdateUser(ctx context.Context, req *pb.UpdateUserReque
 		return nil, err
 	}
 
-	err = models.SharedUserDAO.UpdateUser(tx, req.UserId, req.Username, req.Password, req.Fullname, req.Mobile, req.Tel, req.Email, req.Remark, req.IsOn, req.NodeClusterId, req.BandwidthAlgo)
+	err = models.SharedUserDAO.UpdateUser(tx, req.UserId, req.Username, req.Password, req.Fullname, req.Mobile, req.Tel, req.Email, req.Remark, req.IsOn, req.NodeClusterId, req.BandwidthAlgo, req.HttpdnsClusterIdsJSON)
 	if err != nil {
 		return nil, err
 	}
@@ -242,6 +242,20 @@ func (this *UserService) FindEnabledUser(ctx context.Context, req *pb.FindEnable
 		}
 	}
 
+	// 用户功能列表
+	var pbFeatures []*pb.UserFeature
+	userFeatures, err := models.SharedUserDAO.FindUserFeatures(tx, req.UserId)
+	if err != nil {
+		return nil, err
+	}
+	for _, f := range userFeatures {
+		pbFeatures = append(pbFeatures, &pb.UserFeature{
+			Name:        f.Name,
+			Code:        f.Code,
+			Description: f.Description,
+		})
+	}
+
 	return &pb.FindEnabledUserResponse{
 		User: &pb.User{
 			Id:                     int64(user.Id),
@@ -265,6 +279,8 @@ func (this *UserService) FindEnabledUser(ctx context.Context, req *pb.FindEnable
 			BandwidthAlgo:          user.BandwidthAlgo,
 			OtpLogin:               pbOtpAuth,
 			Lang:                   user.Lang,
+			Features:               pbFeatures,
+			HttpdnsClusterIdsJSON:  user.HttpdnsClusterIds,
 		},
 	}, nil
 }

EdgeAPI/internal/rpc/services/users/service_user_ext_plus.go

@@ -5,11 +5,13 @@ package users
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/userconfigs"
 	"github.com/iwind/TeaGo/dbs"
+	"github.com/iwind/TeaGo/lists"
 )
 
 // FindUserPriceInfo 读取用户计费信息
@@ -142,13 +144,27 @@ func (this *UserService) RegisterUser(ctx context.Context, req *pb.RegisterUserR
 			return errors.New("the username exists already")
 		}
 
+		features := registerConfig.Features
+		if registerConfig.HTTPDNSIsOn && !lists.ContainsString(features, userconfigs.UserFeatureCodeHTTPDNS) {
+			features = append(features, userconfigs.UserFeatureCodeHTTPDNS)
+		}
+
 		// 创建用户
-		userId, err := models.SharedUserDAO.CreateUser(tx, req.Username, req.Password, req.Fullname, req.Mobile, "", req.Email, "", req.Source, registerConfig.ClusterId, registerConfig.Features, req.Ip, !registerConfig.RequireVerification)
+		userId, err := models.SharedUserDAO.CreateUser(tx, req.Username, req.Password, req.Fullname, req.Mobile, "", req.Email, "", req.Source, registerConfig.ClusterId, features, req.Ip, !registerConfig.RequireVerification)
 		if err != nil {
 			return err
 		}
 		createdUserId = userId
 
+		// 自动关联默认 HTTPDNS 集群
+		if registerConfig.HTTPDNSIsOn && len(registerConfig.HTTPDNSDefaultClusterIds) > 0 {
+			httpdnsJSON, _ := json.Marshal(registerConfig.HTTPDNSDefaultClusterIds)
+			err = models.SharedUserDAO.UpdateUserHttpdnsClusterIds(tx, userId, httpdnsJSON)
+			if err != nil {
+				return err
+			}
+		}
+
 		// 发送激活邮件
 		if len(req.Email) > 0 && registerConfig.EmailVerification.IsOn {
 			_, err := models.SharedUserEmailVerificationDAO.CreateVerification(tx, userId, req.Email)