增加用户系统界面管理、用户可以设置关联集群

internal/web/actions/default/users/createPopup.go

@@ -20,14 +20,15 @@ func (this *CreatePopupAction) RunGet(params struct{}) {
 }
 
 func (this *CreatePopupAction) RunPost(params struct {
-	Username string
-	Pass1    string
-	Pass2    string
-	Fullname string
-	Mobile   string
-	Tel      string
-	Email    string
-	Remark   string
+	Username  string
+	Pass1     string
+	Pass2     string
+	Fullname  string
+	Mobile    string
+	Tel       string
+	Email     string
+	Remark    string
+	ClusterId int64
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -60,6 +61,10 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Field("fullname", params.Fullname).
 		Require("请输入全名")
 
+	if params.ClusterId <= 0 {
+		this.Fail("请选择关联集群")
+	}
+
 	if len(params.Mobile) > 0 {
 		params.Must.
 			Field("mobile", params.Mobile).
@@ -72,14 +77,15 @@ func (this *CreatePopupAction) RunPost(params struct {
 	}
 
 	createResp, err := this.RPC().UserRPC().CreateUser(this.AdminContext(), &pb.CreateUserRequest{
-		Username: params.Username,
-		Password: params.Pass1,
-		Fullname: params.Fullname,
-		Mobile:   params.Mobile,
-		Tel:      params.Tel,
-		Email:    params.Email,
-		Remark:   params.Remark,
-		Source:   "admin:" + numberutils.FormatInt64(this.AdminId()),
+		Username:  params.Username,
+		Password:  params.Pass1,
+		Fullname:  params.Fullname,
+		Mobile:    params.Mobile,
+		Tel:       params.Tel,
+		Email:     params.Email,
+		Remark:    params.Remark,
+		Source:    "admin:" + numberutils.FormatInt64(this.AdminId()),
+		ClusterId: params.ClusterId,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/users/index.go

@@ -34,6 +34,13 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	userMaps := []maps.Map{}
 	for _, user := range usersResp.Users {
+		var clusterMap maps.Map = nil
+		if user.Cluster != nil {
+			clusterMap = maps.Map{
+				"id":   user.Cluster.Id,
+				"name": user.Cluster.Name,
+			}
+		}
 		userMaps = append(userMaps, maps.Map{
 			"id":          user.Id,
 			"username":    user.Username,
@@ -43,6 +50,7 @@ func (this *IndexAction) RunGet(params struct {
 			"mobile":      user.Mobile,
 			"tel":         user.Tel,
 			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", user.CreatedAt),
+			"cluster":     clusterMap,
 		})
 	}
 	this.Data["users"] = userMaps

internal/web/actions/default/users/update.go

@@ -47,20 +47,26 @@ func (this *UpdateAction) RunGet(params struct {
 		"isOn":     user.IsOn,
 	}
 
+	this.Data["clusterId"] = 0
+	if user.Cluster != nil {
+		this.Data["clusterId"] = user.Cluster.Id
+	}
+
 	this.Show()
 }
 
 func (this *UpdateAction) RunPost(params struct {
-	UserId   int64
-	Username string
-	Pass1    string
-	Pass2    string
-	Fullname string
-	Mobile   string
-	Tel      string
-	Email    string
-	Remark   string
-	IsOn     bool
+	UserId    int64
+	Username  string
+	Pass1     string
+	Pass2     string
+	Fullname  string
+	Mobile    string
+	Tel       string
+	Email     string
+	Remark    string
+	IsOn      bool
+	ClusterId int64
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -109,15 +115,16 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().UserRPC().UpdateUser(this.AdminContext(), &pb.UpdateUserRequest{
-		UserId:   params.UserId,
-		Username: params.Username,
-		Password: params.Pass1,
-		Fullname: params.Fullname,
-		Mobile:   params.Mobile,
-		Tel:      params.Tel,
-		Email:    params.Email,
-		Remark:   params.Remark,
-		IsOn:     params.IsOn,
+		UserId:    params.UserId,
+		Username:  params.Username,
+		Password:  params.Pass1,
+		Fullname:  params.Fullname,
+		Mobile:    params.Mobile,
+		Tel:       params.Tel,
+		Email:     params.Email,
+		Remark:    params.Remark,
+		IsOn:      params.IsOn,
+		ClusterId: params.ClusterId,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/users/user.go

@@ -35,6 +35,14 @@ func (this *UserAction) RunGet(params struct {
 		return
 	}
 
+	var clusterMap maps.Map = nil
+	if user.Cluster != nil {
+		clusterMap = maps.Map{
+			"id":   user.Cluster.Id,
+			"name": user.Cluster.Name,
+		}
+	}
+
 	this.Data["user"] = maps.Map{
 		"id":       user.Id,
 		"username": user.Username,
@@ -44,6 +52,7 @@ func (this *UserAction) RunGet(params struct {
 		"remark":   user.Remark,
 		"mobile":   user.Mobile,
 		"isOn":     user.IsOn,
+		"cluster":  clusterMap,
 	}
 
 	this.Show()