diff --git a/internal/web/actions/default/clusters/cluster/createBatch.go b/internal/web/actions/default/clusters/cluster/createBatch.go index 2d1aeff1..d1e8e00e 100644 --- a/internal/web/actions/default/clusters/cluster/createBatch.go +++ b/internal/web/actions/default/clusters/cluster/createBatch.go @@ -79,9 +79,9 @@ func (this *CreateBatchAction) RunPost(params struct { resp, err := this.RPC().NodeRPC().CreateNode(this.AdminContext(), &pb.CreateNodeRequest{ Name: ip, NodeClusterId: params.ClusterId, - GroupId: params.GroupId, - RegionId: params.RegionId, - Login: nil, + NodeGroupId: params.GroupId, + NodeRegionId: params.RegionId, + NodeLogin: nil, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/clusters/cluster/createNode.go b/internal/web/actions/default/clusters/cluster/createNode.go index c82fbf8e..1f0a09fa 100644 --- a/internal/web/actions/default/clusters/cluster/createNode.go +++ b/internal/web/actions/default/clusters/cluster/createNode.go @@ -133,9 +133,9 @@ func (this *CreateNodeAction) RunPost(params struct { createResp, err := this.RPC().NodeRPC().CreateNode(this.AdminContext(), &pb.CreateNodeRequest{ Name: params.Name, NodeClusterId: params.ClusterId, - GroupId: params.GroupId, - RegionId: params.RegionId, - Login: loginInfo, + NodeGroupId: params.GroupId, + NodeRegionId: params.RegionId, + NodeLogin: loginInfo, DnsDomainId: params.DnsDomainId, DnsRoutes: dnsRouteCodes, }) diff --git a/internal/web/actions/default/clusters/cluster/groups/createPopup.go b/internal/web/actions/default/clusters/cluster/groups/createPopup.go index 26d0be92..9d3bd926 100644 --- a/internal/web/actions/default/clusters/cluster/groups/createPopup.go +++ b/internal/web/actions/default/clusters/cluster/groups/createPopup.go @@ -43,12 +43,12 @@ func (this *CreatePopupAction) RunPost(params struct { } this.Data["group"] = maps.Map{ - "id": createResp.GroupId, + "id": createResp.NodeGroupId, "name": params.Name, } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建集群分组", createResp.GroupId) + defer this.CreateLog(oplogs.LevelInfo, "创建节点分组", createResp.NodeGroupId) this.Success() } diff --git a/internal/web/actions/default/clusters/cluster/groups/delete.go b/internal/web/actions/default/clusters/cluster/groups/delete.go index 9c24106f..58a960c0 100644 --- a/internal/web/actions/default/clusters/cluster/groups/delete.go +++ b/internal/web/actions/default/clusters/cluster/groups/delete.go @@ -24,7 +24,7 @@ func (this *DeleteAction) RunPost(params struct { this.Fail("此分组正在被使用不能删除，请修改节点后再删除") } - _, err = this.RPC().NodeGroupRPC().DeleteNodeGroup(this.AdminContext(), &pb.DeleteNodeGroupRequest{GroupId: params.GroupId}) + _, err = this.RPC().NodeGroupRPC().DeleteNodeGroup(this.AdminContext(), &pb.DeleteNodeGroupRequest{NodeGroupId: params.GroupId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/clusters/cluster/groups/index.go b/internal/web/actions/default/clusters/cluster/groups/index.go index 408ef63e..fa132e76 100644 --- a/internal/web/actions/default/clusters/cluster/groups/index.go +++ b/internal/web/actions/default/clusters/cluster/groups/index.go @@ -18,7 +18,7 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { ClusterId int64 }) { - groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{ + groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithNodeClusterIdRequest{ NodeClusterId: params.ClusterId, }) if err != nil { @@ -27,7 +27,7 @@ func (this *IndexAction) RunGet(params struct { } groupMaps := []maps.Map{} - for _, group := range groupsResp.Groups { + for _, group := range groupsResp.NodeGroups { countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGroupId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGroupIdRequest{NodeGroupId: group.Id}) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/clusters/cluster/groups/selectPopup.go b/internal/web/actions/default/clusters/cluster/groups/selectPopup.go index 7b3be452..db653127 100644 --- a/internal/web/actions/default/clusters/cluster/groups/selectPopup.go +++ b/internal/web/actions/default/clusters/cluster/groups/selectPopup.go @@ -18,13 +18,13 @@ func (this *SelectPopupAction) Init() { func (this *SelectPopupAction) RunGet(params struct { ClusterId int64 }) { - groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{NodeClusterId: params.ClusterId}) + groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithNodeClusterIdRequest{NodeClusterId: params.ClusterId}) if err != nil { this.ErrorPage(err) } groupMaps := []maps.Map{} - for _, group := range groupsResp.Groups { + for _, group := range groupsResp.NodeGroups { groupMaps = append(groupMaps, maps.Map{ "id": group.Id, "name": group.Name, @@ -44,12 +44,12 @@ func (this *SelectPopupAction) RunPost(params struct { this.Fail("请选择要使用的分组") } - groupResp, err := this.RPC().NodeGroupRPC().FindEnabledNodeGroup(this.AdminContext(), &pb.FindEnabledNodeGroupRequest{GroupId: params.GroupId}) + groupResp, err := this.RPC().NodeGroupRPC().FindEnabledNodeGroup(this.AdminContext(), &pb.FindEnabledNodeGroupRequest{NodeGroupId: params.GroupId}) if err != nil { this.ErrorPage(err) return } - group := groupResp.Group + group := groupResp.NodeGroup if group == nil { this.NotFound("nodeGroup", params.GroupId) return diff --git a/internal/web/actions/default/clusters/cluster/groups/sort.go b/internal/web/actions/default/clusters/cluster/groups/sort.go index ed2e68a5..a30d4c3a 100644 --- a/internal/web/actions/default/clusters/cluster/groups/sort.go +++ b/internal/web/actions/default/clusters/cluster/groups/sort.go @@ -13,7 +13,7 @@ type SortAction struct { func (this *SortAction) RunPost(params struct { GroupIds []int64 }) { - _, err := this.RPC().NodeGroupRPC().UpdateNodeGroupOrders(this.AdminContext(), &pb.UpdateNodeGroupOrdersRequest{GroupIds: params.GroupIds}) + _, err := this.RPC().NodeGroupRPC().UpdateNodeGroupOrders(this.AdminContext(), &pb.UpdateNodeGroupOrdersRequest{NodeGroupIds: params.GroupIds}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/clusters/cluster/groups/updatePopup.go b/internal/web/actions/default/clusters/cluster/groups/updatePopup.go index 30407c50..8d9b5eb7 100644 --- a/internal/web/actions/default/clusters/cluster/groups/updatePopup.go +++ b/internal/web/actions/default/clusters/cluster/groups/updatePopup.go @@ -19,12 +19,12 @@ func (this *UpdatePopupAction) Init() { func (this *UpdatePopupAction) RunGet(params struct { GroupId int64 }) { - groupResp, err := this.RPC().NodeGroupRPC().FindEnabledNodeGroup(this.AdminContext(), &pb.FindEnabledNodeGroupRequest{GroupId: params.GroupId}) + groupResp, err := this.RPC().NodeGroupRPC().FindEnabledNodeGroup(this.AdminContext(), &pb.FindEnabledNodeGroupRequest{NodeGroupId: params.GroupId}) if err != nil { this.ErrorPage(err) return } - group := groupResp.Group + group := groupResp.NodeGroup if group == nil { this.NotFound("nodeGroup", params.GroupId) return @@ -48,8 +48,8 @@ func (this *UpdatePopupAction) RunPost(params struct { Field("name", params.Name). Require("请输入分组名称") _, err := this.RPC().NodeGroupRPC().UpdateNodeGroup(this.AdminContext(), &pb.UpdateNodeGroupRequest{ - GroupId: params.GroupId, - Name: params.Name, + NodeGroupId: params.GroupId, + Name: params.Name, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/clusters/cluster/index.go b/internal/web/actions/default/clusters/cluster/index.go index 909dfeb5..79b0c853 100644 --- a/internal/web/actions/default/clusters/cluster/index.go +++ b/internal/web/actions/default/clusters/cluster/index.go @@ -47,8 +47,8 @@ func (this *IndexAction) RunGet(params struct { countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{ NodeClusterId: params.ClusterId, - GroupId: params.GroupId, - RegionId: params.RegionId, + NodeGroupId: params.GroupId, + NodeRegionId: params.RegionId, InstallState: types.Int32(params.InstalledState), ActiveState: types.Int32(params.ActiveState), Keyword: params.Keyword, @@ -65,8 +65,8 @@ func (this *IndexAction) RunGet(params struct { Offset: page.Offset, Size: page.Size, NodeClusterId: params.ClusterId, - GroupId: params.GroupId, - RegionId: params.RegionId, + NodeGroupId: params.GroupId, + NodeRegionId: params.RegionId, InstallState: types.Int32(params.InstalledState), ActiveState: types.Int32(params.ActiveState), Keyword: params.Keyword, @@ -104,19 +104,19 @@ func (this *IndexAction) RunGet(params struct { // 分组 var groupMap maps.Map = nil - if node.Group != nil { + if node.NodeGroup != nil { groupMap = maps.Map{ - "id": node.Group.Id, - "name": node.Group.Name, + "id": node.NodeGroup.Id, + "name": node.NodeGroup.Name, } } // 区域 var regionMap maps.Map = nil - if node.Region != nil { + if node.NodeRegion != nil { regionMap = maps.Map{ - "id": node.Region.Id, - "name": node.Region.Name, + "id": node.NodeRegion.Id, + "name": node.NodeRegion.Name, } } @@ -162,14 +162,14 @@ func (this *IndexAction) RunGet(params struct { // 所有分组 groupMaps := []maps.Map{} - groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{ + groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithNodeClusterIdRequest{ NodeClusterId: params.ClusterId, }) if err != nil { this.ErrorPage(err) return } - for _, group := range groupsResp.Groups { + for _, group := range groupsResp.NodeGroups { countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGroupId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGroupIdRequest{NodeGroupId: group.Id}) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/clusters/cluster/installManual.go b/internal/web/actions/default/clusters/cluster/installManual.go index 3d49bf1e..82aa129a 100644 --- a/internal/web/actions/default/clusters/cluster/installManual.go +++ b/internal/web/actions/default/clusters/cluster/installManual.go @@ -21,7 +21,7 @@ func (this *InstallManualAction) RunGet(params struct { }) { this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "manual") - nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: params.ClusterId}) + nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithNodeClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithNodeClusterIdRequest{NodeClusterId: params.ClusterId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/clusters/cluster/installRemote.go b/internal/web/actions/default/clusters/cluster/installRemote.go index a5d4fa32..a7361edc 100644 --- a/internal/web/actions/default/clusters/cluster/installRemote.go +++ b/internal/web/actions/default/clusters/cluster/installRemote.go @@ -23,7 +23,7 @@ func (this *InstallRemoteAction) RunGet(params struct { }) { this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "install") - nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: params.ClusterId}) + nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithNodeClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithNodeClusterIdRequest{NodeClusterId: params.ClusterId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/clusters/cluster/node/node.go b/internal/web/actions/default/clusters/cluster/node/node.go index 8fbc9f29..deaeae19 100644 --- a/internal/web/actions/default/clusters/cluster/node/node.go +++ b/internal/web/actions/default/clusters/cluster/node/node.go @@ -170,19 +170,19 @@ func (this *NodeAction) RunGet(params struct { // 分组 var groupMap maps.Map = nil - if node.Group != nil { + if node.NodeGroup != nil { groupMap = maps.Map{ - "id": node.Group.Id, - "name": node.Group.Name, + "id": node.NodeGroup.Id, + "name": node.NodeGroup.Name, } } // 区域 var regionMap maps.Map = nil - if node.Region != nil { + if node.NodeRegion != nil { regionMap = maps.Map{ - "id": node.Region.Id, - "name": node.Region.Name, + "id": node.NodeRegion.Id, + "name": node.NodeRegion.Name, } } diff --git a/internal/web/actions/default/clusters/cluster/node/update.go b/internal/web/actions/default/clusters/cluster/node/update.go index e724deeb..47b5ef1f 100644 --- a/internal/web/actions/default/clusters/cluster/node/update.go +++ b/internal/web/actions/default/clusters/cluster/node/update.go @@ -141,19 +141,19 @@ func (this *UpdateAction) RunGet(params struct { // 分组 var groupMap maps.Map = nil - if node.Group != nil { + if node.NodeGroup != nil { groupMap = maps.Map{ - "id": node.Group.Id, - "name": node.Group.Name, + "id": node.NodeGroup.Id, + "name": node.NodeGroup.Name, } } // 区域 var regionMap maps.Map = nil - if node.Region != nil { + if node.NodeRegion != nil { regionMap = maps.Map{ - "id": node.Region.Id, - "name": node.Region.Name, + "id": node.NodeRegion.Id, + "name": node.NodeRegion.Name, } } @@ -322,11 +322,11 @@ func (this *UpdateAction) RunPost(params struct { // 保存 _, err := this.RPC().NodeRPC().UpdateNode(this.AdminContext(), &pb.UpdateNodeRequest{ NodeId: params.NodeId, - GroupId: params.GroupId, - RegionId: params.RegionId, + NodeGroupId: params.GroupId, + NodeRegionId: params.RegionId, Name: params.Name, NodeClusterId: params.ClusterId, - Login: loginInfo, + NodeLogin: loginInfo, MaxCPU: params.MaxCPU, IsOn: params.IsOn, DnsDomainId: params.DnsDomainId, diff --git a/internal/web/actions/default/clusters/cluster/settings/index.go b/internal/web/actions/default/clusters/cluster/settings/index.go index 18579a5e..f5278b84 100644 --- a/internal/web/actions/default/clusters/cluster/settings/index.go +++ b/internal/web/actions/default/clusters/cluster/settings/index.go @@ -35,8 +35,8 @@ func (this *IndexAction) RunGet(params struct { // 认证 var grantMap interface{} = nil - if cluster.GrantId > 0 { - grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: cluster.GrantId}) + if cluster.NodeGrantId > 0 { + grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: cluster.NodeGrantId}) if err != nil { this.ErrorPage(err) return @@ -81,7 +81,7 @@ func (this *IndexAction) RunPost(params struct { _, err := this.RPC().NodeClusterRPC().UpdateNodeCluster(this.AdminContext(), &pb.UpdateNodeClusterRequest{ NodeClusterId: params.ClusterId, Name: params.Name, - GrantId: params.GrantId, + NodeGrantId: params.GrantId, InstallDir: params.InstallDir, }) if err != nil { diff --git a/internal/web/actions/default/clusters/cluster/updateNodeSSH.go b/internal/web/actions/default/clusters/cluster/updateNodeSSH.go index cb5a66c5..c1041cd8 100644 --- a/internal/web/actions/default/clusters/cluster/updateNodeSSH.go +++ b/internal/web/actions/default/clusters/cluster/updateNodeSSH.go @@ -108,8 +108,8 @@ func (this *UpdateNodeSSHAction) RunPost(params struct { } _, err := this.RPC().NodeRPC().UpdateNodeLogin(this.AdminContext(), &pb.UpdateNodeLoginRequest{ - NodeId: params.NodeId, - Login: login, + NodeId: params.NodeId, + NodeLogin: login, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/clusters/cluster/upgradeRemote.go b/internal/web/actions/default/clusters/cluster/upgradeRemote.go index 7259801b..2b180c50 100644 --- a/internal/web/actions/default/clusters/cluster/upgradeRemote.go +++ b/internal/web/actions/default/clusters/cluster/upgradeRemote.go @@ -24,7 +24,7 @@ func (this *UpgradeRemoteAction) RunGet(params struct { this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "upgrade") nodes := []maps.Map{} - resp, err := this.RPC().NodeRPC().FindAllUpgradeNodesWithClusterId(this.AdminContext(), &pb.FindAllUpgradeNodesWithClusterIdRequest{NodeClusterId: params.ClusterId}) + resp, err := this.RPC().NodeRPC().FindAllUpgradeNodesWithNodeClusterId(this.AdminContext(), &pb.FindAllUpgradeNodesWithNodeClusterIdRequest{NodeClusterId: params.ClusterId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/clusters/cluster/utils.go b/internal/web/actions/default/clusters/cluster/utils.go index 0e250917..6064dc07 100644 --- a/internal/web/actions/default/clusters/cluster/utils.go +++ b/internal/web/actions/default/clusters/cluster/utils.go @@ -9,20 +9,20 @@ import ( "strconv" ) -// 安装升级相关的左侧菜单 +// LeftMenuItemsForInstall 安装升级相关的左侧菜单 func LeftMenuItemsForInstall(ctx context.Context, clusterId int64, selectedItem string) []maps.Map { rpcClient, _ := rpc.SharedRPC() countNotInstalled := int64(0) countUpgrade := int64(0) if rpcClient != nil { { - resp, err := rpcClient.NodeRPC().CountAllNotInstalledNodesWithClusterId(ctx, &pb.CountAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: clusterId}) + resp, err := rpcClient.NodeRPC().CountAllNotInstalledNodesWithNodeClusterId(ctx, &pb.CountAllNotInstalledNodesWithNodeClusterIdRequest{NodeClusterId: clusterId}) if err == nil { countNotInstalled = resp.Count } } { - resp, err := rpcClient.NodeRPC().CountAllUpgradeNodesWithClusterId(ctx, &pb.CountAllUpgradeNodesWithClusterIdRequest{NodeClusterId: clusterId}) + resp, err := rpcClient.NodeRPC().CountAllUpgradeNodesWithNodeClusterId(ctx, &pb.CountAllUpgradeNodesWithNodeClusterIdRequest{NodeClusterId: clusterId}) if err == nil { countUpgrade = resp.Count } diff --git a/internal/web/actions/default/clusters/create.go b/internal/web/actions/default/clusters/create.go index 0d4bf4d5..a1a31a1a 100644 --- a/internal/web/actions/default/clusters/create.go +++ b/internal/web/actions/default/clusters/create.go @@ -97,7 +97,7 @@ func (this *CreateAction) RunPost(params struct { createResp, err := this.RPC().NodeClusterRPC().CreateNodeCluster(this.AdminContext(), &pb.CreateNodeClusterRequest{ Name: params.Name, - GrantId: params.GrantId, + NodeGrantId: params.GrantId, InstallDir: params.InstallDir, DnsDomainId: params.DnsDomainId, DnsName: params.DnsName, diff --git a/internal/web/actions/default/clusters/grants/delete.go b/internal/web/actions/default/clusters/grants/delete.go index dac24532..42e6a1c5 100644 --- a/internal/web/actions/default/clusters/grants/delete.go +++ b/internal/web/actions/default/clusters/grants/delete.go @@ -17,8 +17,8 @@ func (this *DeleteAction) RunPost(params struct { defer this.CreateLog(oplogs.LevelInfo, "删除SSH认证 %d", params.GrantId) // 检查是否有别的集群或节点正在使用 - countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithGrantId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithGrantIdRequest{ - GrantId: params.GrantId, + countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithNodeGrantId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithNodeGrantIdRequest{ + NodeGrantId: params.GrantId, }) if err != nil { this.ErrorPage(err) @@ -28,7 +28,7 @@ func (this *DeleteAction) RunPost(params struct { this.Fail("有集群正在使用此服务，请修改后再删除") } - countResp2, err := this.RPC().NodeRPC().CountAllEnabledNodesWithGrantId(this.AdminContext(), &pb.CountAllEnabledNodesWithGrantIdRequest{GrantId: params.GrantId}) + countResp2, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGrantId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGrantIdRequest{NodeGrantId: params.GrantId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/clusters/grants/grant.go b/internal/web/actions/default/clusters/grants/grant.go index 75a3af69..c47855a8 100644 --- a/internal/web/actions/default/clusters/grants/grant.go +++ b/internal/web/actions/default/clusters/grants/grant.go @@ -46,7 +46,7 @@ func (this *GrantAction) RunGet(params struct { // 使用此认证的集群 clusterMaps := []maps.Map{} - clustersResp, err := this.RPC().NodeClusterRPC().FindAllEnabledNodeClustersWithGrantId(this.AdminContext(), &pb.FindAllEnabledNodeClustersWithGrantIdRequest{GrantId: params.GrantId}) + clustersResp, err := this.RPC().NodeClusterRPC().FindAllEnabledNodeClustersWithNodeGrantId(this.AdminContext(), &pb.FindAllEnabledNodeClustersWithNodeGrantIdRequest{NodeGrantId: params.GrantId}) if err != nil { this.ErrorPage(err) return @@ -61,7 +61,7 @@ func (this *GrantAction) RunGet(params struct { // 使用此认证的节点 nodeMaps := []maps.Map{} - nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesWithGrantId(this.AdminContext(), &pb.FindAllEnabledNodesWithGrantIdRequest{GrantId: params.GrantId}) + nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesWithNodeGrantId(this.AdminContext(), &pb.FindAllEnabledNodesWithNodeGrantIdRequest{NodeGrantId: params.GrantId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/clusters/grants/index.go b/internal/web/actions/default/clusters/grants/index.go index 5574f1e1..09245557 100644 --- a/internal/web/actions/default/clusters/grants/index.go +++ b/internal/web/actions/default/clusters/grants/index.go @@ -42,7 +42,7 @@ func (this *IndexAction) RunGet(params struct { grantMaps := []maps.Map{} for _, grant := range grantsResp.NodeGrants { // 集群数 - countClustersResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithGrantId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithGrantIdRequest{GrantId: grant.Id}) + countClustersResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithNodeGrantId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithNodeGrantIdRequest{NodeGrantId: grant.Id}) if err != nil { this.ErrorPage(err) return @@ -50,7 +50,7 @@ func (this *IndexAction) RunGet(params struct { countClusters := countClustersResp.Count // 节点数 - countNodesResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithGrantId(this.AdminContext(), &pb.CountAllEnabledNodesWithGrantIdRequest{GrantId: grant.Id}) + countNodesResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGrantId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGrantIdRequest{NodeGrantId: grant.Id}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/clusters/index.go b/internal/web/actions/default/clusters/index.go index 10d7fe4b..e2bd9c15 100644 --- a/internal/web/actions/default/clusters/index.go +++ b/internal/web/actions/default/clusters/index.go @@ -96,7 +96,7 @@ func (this *IndexAction) RunGet(params struct { } // 需要升级的节点 - countUpgradeNodesResp, err := this.RPC().NodeRPC().CountAllUpgradeNodesWithClusterId(this.AdminContext(), &pb.CountAllUpgradeNodesWithClusterIdRequest{NodeClusterId: cluster.Id}) + countUpgradeNodesResp, err := this.RPC().NodeRPC().CountAllUpgradeNodesWithNodeClusterId(this.AdminContext(), &pb.CountAllUpgradeNodesWithNodeClusterIdRequest{NodeClusterId: cluster.Id}) if err != nil { this.ErrorPage(err) return @@ -203,19 +203,19 @@ func (this *IndexAction) searchNodes(keyword string) { // 分组 var groupMap maps.Map = nil - if node.Group != nil { + if node.NodeGroup != nil { groupMap = maps.Map{ - "id": node.Group.Id, - "name": node.Group.Name, + "id": node.NodeGroup.Id, + "name": node.NodeGroup.Name, } } // 区域 var regionMap maps.Map = nil - if node.Region != nil { + if node.NodeRegion != nil { regionMap = maps.Map{ - "id": node.Region.Id, - "name": node.Region.Name, + "id": node.NodeRegion.Id, + "name": node.NodeRegion.Name, } } diff --git a/internal/web/actions/default/dns/clusters/cluster.go b/internal/web/actions/default/dns/clusters/cluster.go index 37e52258..1bf7d0f9 100644 --- a/internal/web/actions/default/dns/clusters/cluster.go +++ b/internal/web/actions/default/dns/clusters/cluster.go @@ -62,7 +62,7 @@ func (this *ClusterAction) RunGet(params struct { this.Data["dnsInfo"] = dnsMap // 节点DNS解析记录 - nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesDNSWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodesDNSWithClusterIdRequest{NodeClusterId: params.ClusterId}) + nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesDNSWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodesDNSWithNodeClusterIdRequest{NodeClusterId: params.ClusterId}) if err != nil { this.ErrorPage(err) return @@ -117,7 +117,7 @@ func (this *ClusterAction) RunGet(params struct { this.Data["nodes"] = nodeMaps // 代理服务解析记录 - serversResp, err := this.RPC().ServerRPC().FindAllEnabledServersDNSWithClusterId(this.AdminContext(), &pb.FindAllEnabledServersDNSWithClusterIdRequest{NodeClusterId: params.ClusterId}) + serversResp, err := this.RPC().ServerRPC().FindAllEnabledServersDNSWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledServersDNSWithNodeClusterIdRequest{NodeClusterId: params.ClusterId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/dns/domains/nodesPopup.go b/internal/web/actions/default/dns/domains/nodesPopup.go index 33147258..b0a2cf4f 100644 --- a/internal/web/actions/default/dns/domains/nodesPopup.go +++ b/internal/web/actions/default/dns/domains/nodesPopup.go @@ -43,7 +43,7 @@ func (this *NodesPopupAction) RunGet(params struct { for _, cluster := range clustersResp.NodeClusters { // 节点DNS解析记录 - nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesDNSWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodesDNSWithClusterIdRequest{NodeClusterId: cluster.Id}) + nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesDNSWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodesDNSWithNodeClusterIdRequest{NodeClusterId: cluster.Id}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/dns/domains/serversPopup.go b/internal/web/actions/default/dns/domains/serversPopup.go index 889ab0db..103f7102 100644 --- a/internal/web/actions/default/dns/domains/serversPopup.go +++ b/internal/web/actions/default/dns/domains/serversPopup.go @@ -41,7 +41,7 @@ func (this *ServersPopupAction) RunGet(params struct { return } for _, cluster := range clustersResp.NodeClusters { - serversResp, err := this.RPC().ServerRPC().FindAllEnabledServersDNSWithClusterId(this.AdminContext(), &pb.FindAllEnabledServersDNSWithClusterIdRequest{NodeClusterId: cluster.Id}) + serversResp, err := this.RPC().ServerRPC().FindAllEnabledServersDNSWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledServersDNSWithNodeClusterIdRequest{NodeClusterId: cluster.Id}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/nodes/nodeutils/utils.go b/internal/web/actions/default/nodes/nodeutils/utils.go index 0fe5b86e..e59379f3 100644 --- a/internal/web/actions/default/nodes/nodeutils/utils.go +++ b/internal/web/actions/default/nodes/nodeutils/utils.go @@ -34,7 +34,7 @@ func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg } // 获取所有节点 - nodesResp, err := defaultRPCClient.NodeRPC().FindAllEnabledNodesWithClusterId(ctx, &pb.FindAllEnabledNodesWithClusterIdRequest{NodeClusterId: clusterId}) + nodesResp, err := defaultRPCClient.NodeRPC().FindAllEnabledNodesWithNodeClusterId(ctx, &pb.FindAllEnabledNodesWithNodeClusterIdRequest{NodeClusterId: clusterId}) if err != nil { return results, err } diff --git a/internal/web/actions/default/servers/components/groups/createPopup.go b/internal/web/actions/default/servers/components/groups/createPopup.go index 778bc391..dfd0c215 100644 --- a/internal/web/actions/default/servers/components/groups/createPopup.go +++ b/internal/web/actions/default/servers/components/groups/createPopup.go @@ -37,12 +37,12 @@ func (this *CreatePopupAction) RunPost(params struct { } this.Data["group"] = maps.Map{ - "id": createResp.GroupId, + "id": createResp.ServerGroupId, "name": params.Name, } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建代理服务分组 %d", createResp.GroupId) + defer this.CreateLog(oplogs.LevelInfo, "创建代理服务分组 %d", createResp.ServerGroupId) this.Success() } diff --git a/internal/web/actions/default/servers/components/groups/delete.go b/internal/web/actions/default/servers/components/groups/delete.go index a23f25e3..6b757841 100644 --- a/internal/web/actions/default/servers/components/groups/delete.go +++ b/internal/web/actions/default/servers/components/groups/delete.go @@ -17,7 +17,7 @@ func (this *DeleteAction) RunPost(params struct { defer this.CreateLog(oplogs.LevelInfo, "删除代理服务分组 %d", params.GroupId) // 检查是否正在使用 - countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithGroupId(this.AdminContext(), &pb.CountAllEnabledServersWithGroupIdRequest{GroupId: params.GroupId}) + countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithServerGroupId(this.AdminContext(), &pb.CountAllEnabledServersWithServerGroupIdRequest{ServerGroupId: params.GroupId}) if err != nil { this.ErrorPage(err) return @@ -27,7 +27,7 @@ func (this *DeleteAction) RunPost(params struct { this.Fail("此分组正在被使用不能删除，请修改相关服务后再删除") } - _, err = this.RPC().ServerGroupRPC().DeleteServerGroup(this.AdminContext(), &pb.DeleteServerGroupRequest{GroupId: params.GroupId}) + _, err = this.RPC().ServerGroupRPC().DeleteServerGroup(this.AdminContext(), &pb.DeleteServerGroupRequest{ServerGroupId: params.GroupId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/servers/components/groups/index.go b/internal/web/actions/default/servers/components/groups/index.go index 2e58351e..7aec1c86 100644 --- a/internal/web/actions/default/servers/components/groups/index.go +++ b/internal/web/actions/default/servers/components/groups/index.go @@ -23,8 +23,8 @@ func (this *IndexAction) RunGet(params struct{}) { } groupMaps := []maps.Map{} - for _, group := range groupsResp.Groups { - countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithGroupId(this.AdminContext(), &pb.CountAllEnabledServersWithGroupIdRequest{GroupId: group.Id}) + for _, group := range groupsResp.ServerGroups { + countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithServerGroupId(this.AdminContext(), &pb.CountAllEnabledServersWithServerGroupIdRequest{ServerGroupId: group.Id}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/servers/components/groups/selectPopup.go b/internal/web/actions/default/servers/components/groups/selectPopup.go index 3eb98c01..7dc914dc 100644 --- a/internal/web/actions/default/servers/components/groups/selectPopup.go +++ b/internal/web/actions/default/servers/components/groups/selectPopup.go @@ -34,7 +34,7 @@ func (this *SelectPopupAction) RunGet(params struct { } groupMaps := []maps.Map{} - for _, group := range groupsResp.Groups { + for _, group := range groupsResp.ServerGroups { // 已经选过的就跳过 if lists.ContainsInt64(selectedGroupIds, group.Id) { continue @@ -58,12 +58,12 @@ func (this *SelectPopupAction) RunPost(params struct { this.Fail("请选择要使用的分组") } - groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroup(this.AdminContext(), &pb.FindEnabledServerGroupRequest{GroupId: params.GroupId}) + groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroup(this.AdminContext(), &pb.FindEnabledServerGroupRequest{ServerGroupId: params.GroupId}) if err != nil { this.ErrorPage(err) return } - group := groupResp.Group + group := groupResp.ServerGroup if group == nil { this.NotFound("serverGroup", params.GroupId) return diff --git a/internal/web/actions/default/servers/components/groups/sort.go b/internal/web/actions/default/servers/components/groups/sort.go index ffe46395..998ee983 100644 --- a/internal/web/actions/default/servers/components/groups/sort.go +++ b/internal/web/actions/default/servers/components/groups/sort.go @@ -16,7 +16,7 @@ func (this *SortAction) RunPost(params struct { // 创建日志 defer this.CreateLog(oplogs.LevelInfo, "修改代理分组排序") - _, err := this.RPC().ServerGroupRPC().UpdateServerGroupOrders(this.AdminContext(), &pb.UpdateServerGroupOrdersRequest{GroupIds: params.GroupIds}) + _, err := this.RPC().ServerGroupRPC().UpdateServerGroupOrders(this.AdminContext(), &pb.UpdateServerGroupOrdersRequest{ServerGroupIds: params.GroupIds}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/servers/components/groups/updatePopup.go b/internal/web/actions/default/servers/components/groups/updatePopup.go index a131680d..0c803d06 100644 --- a/internal/web/actions/default/servers/components/groups/updatePopup.go +++ b/internal/web/actions/default/servers/components/groups/updatePopup.go @@ -19,12 +19,12 @@ func (this *UpdatePopupAction) Init() { func (this *UpdatePopupAction) RunGet(params struct { GroupId int64 }) { - groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroup(this.AdminContext(), &pb.FindEnabledServerGroupRequest{GroupId: params.GroupId}) + groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroup(this.AdminContext(), &pb.FindEnabledServerGroupRequest{ServerGroupId: params.GroupId}) if err != nil { this.ErrorPage(err) return } - group := groupResp.Group + group := groupResp.ServerGroup if group == nil { this.NotFound("serverGroup", params.GroupId) return @@ -51,8 +51,8 @@ func (this *UpdatePopupAction) RunPost(params struct { Field("name", params.Name). Require("请输入分组名称") _, err := this.RPC().ServerGroupRPC().UpdateServerGroup(this.AdminContext(), &pb.UpdateServerGroupRequest{ - GroupId: params.GroupId, - Name: params.Name, + ServerGroupId: params.GroupId, + Name: params.Name, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/create.go b/internal/web/actions/default/servers/create.go index 0c24df83..3d9aea1f 100644 --- a/internal/web/actions/default/servers/create.go +++ b/internal/web/actions/default/servers/create.go @@ -332,7 +332,7 @@ func (this *CreateAction) RunPost(params struct { ExcludeNodesJSON: excludeNodesJSON, WebId: webId, ReverseProxyJSON: reverseProxyRefJSON, - GroupIds: params.GroupIds, + ServerGroupIds: params.GroupIds, } if httpConfig != nil { data, err := json.Marshal(httpConfig) diff --git a/internal/web/actions/default/servers/index.go b/internal/web/actions/default/servers/index.go index 35908229..b491ff10 100644 --- a/internal/web/actions/default/servers/index.go +++ b/internal/web/actions/default/servers/index.go @@ -67,10 +67,10 @@ func (this *IndexAction) RunGet(params struct { // 全部数量 countResp, err := this.RPC().ServerRPC().CountAllEnabledServersMatch(this.AdminContext(), &pb.CountAllEnabledServersMatchRequest{ - ClusterId: params.ClusterId, - GroupId: params.GroupId, - Keyword: params.Keyword, - AuditingFlag: params.AuditingFlag, + NodeClusterId: params.ClusterId, + ServerGroupId: params.GroupId, + Keyword: params.Keyword, + AuditingFlag: params.AuditingFlag, }) if err != nil { this.ErrorPage(err) @@ -82,12 +82,12 @@ func (this *IndexAction) RunGet(params struct { // 服务列表 serversResp, err := this.RPC().ServerRPC().ListEnabledServersMatch(this.AdminContext(), &pb.ListEnabledServersMatchRequest{ - Offset: page.Offset, - Size: page.Size, - ClusterId: params.ClusterId, - GroupId: params.GroupId, - Keyword: params.Keyword, - AuditingFlag: params.AuditingFlag, + Offset: page.Offset, + Size: page.Size, + NodeClusterId: params.ClusterId, + ServerGroupId: params.GroupId, + Keyword: params.Keyword, + AuditingFlag: params.AuditingFlag, }) if err != nil { this.ErrorPage(err) @@ -155,8 +155,8 @@ func (this *IndexAction) RunGet(params struct { // 分组 groupMaps := []maps.Map{} - if len(server.Groups) > 0 { - for _, group := range server.Groups { + if len(server.ServerGroups) > 0 { + for _, group := range server.ServerGroups { groupMaps = append(groupMaps, maps.Map{ "id": group.Id, "name": group.Name, @@ -240,7 +240,7 @@ func (this *IndexAction) RunGet(params struct { return } groupMaps := []maps.Map{} - for _, group := range groupsResp.Groups { + for _, group := range groupsResp.ServerGroups { groupName := group.Name groupMaps = append(groupMaps, maps.Map{ "id": group.Id, diff --git a/internal/web/actions/default/servers/server/settings/index.go b/internal/web/actions/default/servers/server/settings/index.go index 92ad16a8..8b5bb850 100644 --- a/internal/web/actions/default/servers/server/settings/index.go +++ b/internal/web/actions/default/servers/server/settings/index.go @@ -74,8 +74,8 @@ func (this *IndexAction) RunGet(params struct { // 分组 groupMaps := []maps.Map{} - if len(server.Groups) > 0 { - for _, group := range server.Groups { + if len(server.ServerGroups) > 0 { + for _, group := range server.ServerGroups { groupMaps = append(groupMaps, maps.Map{ "id": group.Id, "name": group.Name, @@ -138,12 +138,12 @@ func (this *IndexAction) RunPost(params struct { } _, err := this.RPC().ServerRPC().UpdateServerBasic(this.AdminContext(), &pb.UpdateServerBasicRequest{ - ServerId: params.ServerId, - Name: params.Name, - Description: params.Description, - NodeClusterId: params.ClusterId, - IsOn: params.IsOn, - GroupIds: params.GroupIds, + ServerId: params.ServerId, + Name: params.Name, + Description: params.Description, + NodeClusterId: params.ClusterId, + IsOn: params.IsOn, + ServerGroupIds: params.GroupIds, }) if err != nil { this.ErrorPage(err)