diff --git a/internal/web/actions/default/servers/server/settings/index.go b/internal/web/actions/default/servers/server/settings/index.go index a0fb636f..938950fe 100644 --- a/internal/web/actions/default/servers/server/settings/index.go +++ b/internal/web/actions/default/servers/server/settings/index.go @@ -121,6 +121,7 @@ func (this *IndexAction) RunGet(params struct { // RunPost 保存 func (this *IndexAction) RunPost(params struct { ServerId int64 + UserId int64 Name string Description string ClusterId int64 @@ -157,16 +158,28 @@ func (this *IndexAction) RunPost(params struct { return } - // 修改套餐 - if params.UserPlanId > 0 { - _, err = this.RPC().ServerRPC().UpdateServerUserPlan(this.AdminContext(), &pb.UpdateServerUserPlanRequest{ - ServerId: params.ServerId, - UserPlanId: params.UserPlanId, + // 修改用户 + if params.UserId > 0 { + _, err = this.RPC().ServerRPC().UpdateServerUser(this.AdminContext(), &pb.UpdateServerUserRequest{ + ServerId: params.ServerId, + UserId: params.UserId, }) if err != nil { this.ErrorPage(err) return } + } else { + // 修改套餐 + if params.UserPlanId > 0 { + _, err = this.RPC().ServerRPC().UpdateServerUserPlan(this.AdminContext(), &pb.UpdateServerUserPlanRequest{ + ServerId: params.ServerId, + UserPlanId: params.UserPlanId, + }) + if err != nil { + this.ErrorPage(err) + return + } + } } this.Success() diff --git a/web/views/@default/servers/server/settings/index.html b/web/views/@default/servers/server/settings/index.html index 9051279e..ab495671 100644 --- a/web/views/@default/servers/server/settings/index.html +++ b/web/views/@default/servers/server/settings/index.html @@ -10,7 +10,15 @@ 所属用户 {{user.fullname}} ({{user.username}}) - - +
+
+ 没有指定用户   [指定用户] +
+
+ +

修改服务所属用户时需要同时保证证书、域名等信息也属于该用户,否则可能产生难以预料的结果。

+
+
@@ -66,7 +74,7 @@ - 是否启用 + 启用当前服务
diff --git a/web/views/@default/servers/server/settings/index.js b/web/views/@default/servers/server/settings/index.js index 3189b9e5..4259c137 100644 --- a/web/views/@default/servers/server/settings/index.js +++ b/web/views/@default/servers/server/settings/index.js @@ -4,6 +4,12 @@ Tea.context(function () { /** * 用户相关 */ + this.userSelectorVisible = false + + this.showUserSelector = function () { + this.userSelectorVisible = !this.userSelectorVisible + } + this.userId = 0 this.plans = [] this.userPlanId = 0