From ee1e62aff01ed55e55372c7addd4e7bcf07c1be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Fri, 5 Aug 2022 21:05:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/web/actions/default/clusters/cluster/nodes.go | 2 +- internal/web/actions/default/clusters/nodes.go | 2 +- internal/web/actions/default/clusters/regions/prices.go | 2 +- internal/web/actions/default/clusters/regions/selectPopup.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/web/actions/default/clusters/cluster/nodes.go b/internal/web/actions/default/clusters/cluster/nodes.go index 9e25d693..e87a495e 100644 --- a/internal/web/actions/default/clusters/cluster/nodes.go +++ b/internal/web/actions/default/clusters/cluster/nodes.go @@ -282,7 +282,7 @@ func (this *NodesAction) RunGet(params struct { this.Data["groups"] = groupMaps // 所有区域 - regionsResp, err := this.RPC().NodeRegionRPC().FindAllEnabledAndOnNodeRegions(this.AdminContext(), &pb.FindAllEnabledAndOnNodeRegionsRequest{}) + regionsResp, err := this.RPC().NodeRegionRPC().FindAllAvailableNodeRegions(this.AdminContext(), &pb.FindAllAvailableNodeRegionsRequest{}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/clusters/nodes.go b/internal/web/actions/default/clusters/nodes.go index c316104d..5f86fb5d 100644 --- a/internal/web/actions/default/clusters/nodes.go +++ b/internal/web/actions/default/clusters/nodes.go @@ -258,7 +258,7 @@ func (this *NodesAction) RunGet(params struct { this.Data["groups"] = groupMaps // 所有区域 - regionsResp, err := this.RPC().NodeRegionRPC().FindAllEnabledAndOnNodeRegions(this.AdminContext(), &pb.FindAllEnabledAndOnNodeRegionsRequest{}) + regionsResp, err := this.RPC().NodeRegionRPC().FindAllAvailableNodeRegions(this.AdminContext(), &pb.FindAllAvailableNodeRegionsRequest{}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/clusters/regions/prices.go b/internal/web/actions/default/clusters/regions/prices.go index ea8e8c93..0c8a882c 100644 --- a/internal/web/actions/default/clusters/regions/prices.go +++ b/internal/web/actions/default/clusters/regions/prices.go @@ -20,7 +20,7 @@ func (this *PricesAction) Init() { func (this *PricesAction) RunGet(params struct{}) { // 所有价格项目 - itemsResp, err := this.RPC().NodePriceItemRPC().FindAllEnabledAndOnNodePriceItems(this.AdminContext(), &pb.FindAllEnabledAndOnNodePriceItemsRequest{Type: regionutils.PriceTypeTraffic}) + itemsResp, err := this.RPC().NodePriceItemRPC().FindAllAvailableNodePriceItems(this.AdminContext(), &pb.FindAllAvailableNodePriceItemsRequest{Type: regionutils.PriceTypeTraffic}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/clusters/regions/selectPopup.go b/internal/web/actions/default/clusters/regions/selectPopup.go index 6838d3e8..60e5c7d8 100644 --- a/internal/web/actions/default/clusters/regions/selectPopup.go +++ b/internal/web/actions/default/clusters/regions/selectPopup.go @@ -16,7 +16,7 @@ func (this *SelectPopupAction) Init() { } func (this *SelectPopupAction) RunGet(params struct{}) { - regionsResp, err := this.RPC().NodeRegionRPC().FindAllEnabledAndOnNodeRegions(this.AdminContext(), &pb.FindAllEnabledAndOnNodeRegionsRequest{}) + regionsResp, err := this.RPC().NodeRegionRPC().FindAllAvailableNodeRegions(this.AdminContext(), &pb.FindAllAvailableNodeRegionsRequest{}) if err != nil { this.ErrorPage(err) return