diff --git a/internal/web/actions/default/users/createPopup.go b/internal/web/actions/default/users/createPopup.go index 41f7ad6d..e7ae5c0f 100644 --- a/internal/web/actions/default/users/createPopup.go +++ b/internal/web/actions/default/users/createPopup.go @@ -2,6 +2,7 @@ package users import ( "encoding/json" + teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -110,47 +111,49 @@ func (this *CreatePopupAction) RunPost(params struct { userId = createResp.UserId // 功能 - if params.FeaturesType == "default" { - resp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: systemconfigs.SettingCodeUserRegisterConfig}) - if err != nil { - this.ErrorPage(err) - return - } - - var config = userconfigs.DefaultUserRegisterConfig() - if len(resp.ValueJSON) > 0 { - err = json.Unmarshal(resp.ValueJSON, config) + if teaconst.IsPlus { + if params.FeaturesType == "default" { + resp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: systemconfigs.SettingCodeUserRegisterConfig}) if err != nil { this.ErrorPage(err) return } + + var config = userconfigs.DefaultUserRegisterConfig() + if len(resp.ValueJSON) > 0 { + err = json.Unmarshal(resp.ValueJSON, config) + if err != nil { + this.ErrorPage(err) + return + } + _, err = this.RPC().UserRPC().UpdateUserFeatures(this.AdminContext(), &pb.UpdateUserFeaturesRequest{ + UserId: userId, + FeatureCodes: config.Features, + }) + if err != nil { + this.ErrorPage(err) + return + } + } + } else if params.FeaturesType == "all" { + featuresResp, err := this.RPC().UserRPC().FindAllUserFeatureDefinitions(this.AdminContext(), &pb.FindAllUserFeatureDefinitionsRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + var featureCodes = []string{} + for _, def := range featuresResp.Features { + featureCodes = append(featureCodes, def.Code) + } _, err = this.RPC().UserRPC().UpdateUserFeatures(this.AdminContext(), &pb.UpdateUserFeaturesRequest{ UserId: userId, - FeatureCodes: config.Features, + FeatureCodes: featureCodes, }) if err != nil { this.ErrorPage(err) return } } - } else if params.FeaturesType == "all" { - featuresResp, err := this.RPC().UserRPC().FindAllUserFeatureDefinitions(this.AdminContext(), &pb.FindAllUserFeatureDefinitionsRequest{}) - if err != nil { - this.ErrorPage(err) - return - } - var featureCodes = []string{} - for _, def := range featuresResp.Features { - featureCodes = append(featureCodes, def.Code) - } - _, err = this.RPC().UserRPC().UpdateUserFeatures(this.AdminContext(), &pb.UpdateUserFeaturesRequest{ - UserId: userId, - FeatureCodes: featureCodes, - }) - if err != nil { - this.ErrorPage(err) - return - } } // OTP diff --git a/web/views/@default/users/createPopup.html b/web/views/@default/users/createPopup.html index b8e05733..38a37094 100644 --- a/web/views/@default/users/createPopup.html +++ b/web/views/@default/users/createPopup.html @@ -38,12 +38,13 @@

用户发布的网站服务会自动部署到此集群。

- + 开通功能 默认功能     全部功能 +

用户默认开通的功能可以在[这里]设置。