实现在服务中使用分组

internal/web/actions/default/clusters/cluster/groups/options.go

@@ -1,31 +0,0 @@
-package groups
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-)
-
-type OptionsAction struct {
-	actionutils.ParentAction
-}
-
-func (this *OptionsAction) RunPost(params struct {
-	ClusterId int64
-}) {
-	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{ClusterId: params.ClusterId})
-	if err != nil {
-		this.ErrorPage(err)
-	}
-
-	groupMaps := []maps.Map{}
-	for _, group := range groupsResp.Groups {
-		groupMaps = append(groupMaps, maps.Map{
-			"id":   group.Id,
-			"name": group.Name,
-		})
-	}
-	this.Data["groups"] = groupMaps
-
-	this.Success()
-}

internal/web/actions/default/clusters/cluster/init.go

@@ -42,7 +42,6 @@ func init() {
 			GetPost("/groups/updatePopup", new(groups.UpdatePopupAction)).
 			Post("/groups/delete", new(groups.DeleteAction)).
 			Post("/groups/sort", new(groups.SortAction)).
-			Post("/groups/options", new(groups.OptionsAction)).
 			GetPost("/groups/selectPopup", new(groups.SelectPopupAction)).
 
 			EndAll()

internal/web/actions/default/servers/components/groups/init.go

@@ -16,7 +16,6 @@ func init() {
 			Get("", new(IndexAction)).
 			GetPost("/createPopup", new(CreatePopupAction)).
 			GetPost("/updatePopup", new(UpdatePopupAction)).
-			Post("/options", new(OptionsAction)).
 			GetPost("/selectPopup", new(SelectPopupAction)).
 			Post("/delete", new(DeleteAction)).
 			Post("/sort", new(SortAction)).

internal/web/actions/default/servers/components/groups/options.go

@@ -1,11 +0,0 @@
-package groups
-
-import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-
-type OptionsAction struct {
-	actionutils.ParentAction
-}
-
-func (this *OptionsAction) RunPost(params struct{}) {
-	this.Success()
-}

internal/web/actions/default/servers/components/groups/selectPopup.go

@@ -1,6 +1,14 @@
 package groups
 
-import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/lists"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
+	"strings"
+)
 
 type SelectPopupAction struct {
 	actionutils.ParentAction
@@ -10,6 +18,61 @@ func (this *SelectPopupAction) Init() {
 	this.Nav("", "", "")
 }
 
-func (this *SelectPopupAction) RunGet(params struct{}) {
+func (this *SelectPopupAction) RunGet(params struct {
+	SelectedGroupIds string
+}) {
+	groupsResp, err := this.RPC().ServerGroupRPC().FindAllEnabledServerGroups(this.AdminContext(), &pb.FindAllEnabledServerGroupsRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+	}
+
+	selectedGroupIds := []int64{}
+	if len(params.SelectedGroupIds) > 0 {
+		for _, v := range strings.Split(params.SelectedGroupIds, ",") {
+			selectedGroupIds = append(selectedGroupIds, types.Int64(v))
+		}
+	}
+
+	groupMaps := []maps.Map{}
+	for _, group := range groupsResp.Groups {
+		// 已经选过的就跳过
+		if lists.ContainsInt64(selectedGroupIds, group.Id) {
+			continue
+		}
+		groupMaps = append(groupMaps, maps.Map{
+			"id":   group.Id,
+			"name": group.Name,
+		})
+	}
+	this.Data["groups"] = groupMaps
+
 	this.Show()
 }
+
+func (this *SelectPopupAction) RunPost(params struct {
+	GroupId int64
+
+	Must *actions.Must
+}) {
+	if params.GroupId <= 0 {
+		this.Fail("请选择要使用的分组")
+	}
+
+	groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroup(this.AdminContext(), &pb.FindEnabledServerGroupRequest{GroupId: params.GroupId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	group := groupResp.Group
+	if group == nil {
+		this.NotFound("serverGroup", params.GroupId)
+		return
+	}
+
+	this.Data["group"] = maps.Map{
+		"id":   group.Id,
+		"name": group.Name,
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/create.go

@@ -47,6 +47,7 @@ func (this *CreateAction) RunPost(params struct {
 	Name        string
 	Description string
 	ClusterId   int64
+	GroupIds    []int64
 
 	ServerType  string
 	Addresses   string
@@ -259,6 +260,7 @@ func (this *CreateAction) RunPost(params struct {
 		ExcludeNodesJSON: excludeNodesJSON,
 		WebId:            webId,
 		ReverseProxyJSON: reverseProxyRefJSON,
+		GroupIds:         params.GroupIds,
 	}
 	if httpConfig != nil {
 		data, err := json.Marshal(httpConfig)

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

@@ -95,6 +95,17 @@ func (this *IndexAction) RunGet(params struct{}) {
 			}
 		}
 
+		// 分组
+		groupMaps := []maps.Map{}
+		if len(server.Groups) > 0 {
+			for _, group := range server.Groups {
+				groupMaps = append(groupMaps, maps.Map{
+					"id":   group.Id,
+					"name": group.Name,
+				})
+			}
+		}
+
 		serverMaps = append(serverMaps, maps.Map{
 			"id":   server.Id,
 			"isOn": server.IsOn,
@@ -105,6 +116,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 			},
 			"ports":          portMaps,
 			"serverTypeName": serverconfigs.FindServerType(server.Type).GetString("name"),
+			"groups":         groupMaps,
 		})
 	}
 	this.Data["servers"] = serverMaps

internal/web/actions/default/servers/server/settings/index.go

@@ -57,6 +57,17 @@ func (this *IndexAction) RunGet(params struct {
 		clusterId = server.Cluster.Id
 	}
 
+	// 分组
+	groupMaps := []maps.Map{}
+	if len(server.Groups) > 0 {
+		for _, group := range server.Groups {
+			groupMaps = append(groupMaps, maps.Map{
+				"id":   group.Id,
+				"name": group.Name,
+			})
+		}
+	}
+
 	this.Data["server"] = maps.Map{
 		"id":          server.Id,
 		"clusterId":   clusterId,
@@ -64,6 +75,7 @@ func (this *IndexAction) RunGet(params struct {
 		"name":        server.Name,
 		"description": server.Description,
 		"isOn":        server.IsOn,
+		"groups":      groupMaps,
 	}
 
 	serverType := serverconfigs.FindServerType(server.Type)
@@ -84,6 +96,7 @@ func (this *IndexAction) RunPost(params struct {
 	Name        string
 	Description string
 	ClusterId   int64
+	GroupIds    []int64
 	IsOn        bool
 
 	Must *actions.Must
@@ -102,6 +115,7 @@ func (this *IndexAction) RunPost(params struct {
 		Description: params.Description,
 		ClusterId:   params.ClusterId,
 		IsOn:        params.IsOn,
+		GroupIds:    params.GroupIds,
 	})
 	if err != nil {
 		this.ErrorPage(err)