From bfef7c4d6e7bdb7bb73d3e2f2c65fb44c2e4f2bd Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Fri, 5 Aug 2022 21:05:34 +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

---
 .../rpc/services/service_node_price_item.go    | 18 +++++++++---------
 internal/rpc/services/service_node_region.go   |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/internal/rpc/services/service_node_price_item.go b/internal/rpc/services/service_node_price_item.go
index ece31058..430834e1 100644
--- a/internal/rpc/services/service_node_price_item.go
+++ b/internal/rpc/services/service_node_price_item.go
@@ -6,12 +6,12 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
 
-// 节点区域价格相关服务
+// NodePriceItemService 节点区域价格相关服务
 type NodePriceItemService struct {
 	BaseService
 }
 
-// 创建区域价格
+// CreateNodePriceItem 创建区域价格
 func (this *NodePriceItemService) CreateNodePriceItem(ctx context.Context, req *pb.CreateNodePriceItemRequest) (*pb.CreateNodePriceItemResponse, error) {
 	_, err := this.ValidateAdmin(ctx)
 	if err != nil {
@@ -27,7 +27,7 @@ func (this *NodePriceItemService) CreateNodePriceItem(ctx context.Context, req *
 	return &pb.CreateNodePriceItemResponse{NodePriceItemId: itemId}, nil
 }
 
-// 修改区域价格
+// UpdateNodePriceItem 修改区域价格
 func (this *NodePriceItemService) UpdateNodePriceItem(ctx context.Context, req *pb.UpdateNodePriceItemRequest) (*pb.RPCSuccess, error) {
 	_, err := this.ValidateAdmin(ctx)
 	if err != nil {
@@ -43,7 +43,7 @@ func (this *NodePriceItemService) UpdateNodePriceItem(ctx context.Context, req *
 	return this.Success()
 }
 
-// 删除区域价格
+// DeleteNodePriceItem 删除区域价格
 func (this *NodePriceItemService) DeleteNodePriceItem(ctx context.Context, req *pb.DeleteNodePriceItemRequest) (*pb.RPCSuccess, error) {
 	_, err := this.ValidateAdmin(ctx)
 	if err != nil {
@@ -59,7 +59,7 @@ func (this *NodePriceItemService) DeleteNodePriceItem(ctx context.Context, req *
 	return this.Success()
 }
 
-// 查找所有区域价格
+// FindAllEnabledNodePriceItems 查找所有区域价格
 func (this *NodePriceItemService) FindAllEnabledNodePriceItems(ctx context.Context, req *pb.FindAllEnabledNodePriceItemsRequest) (*pb.FindAllEnabledNodePriceItemsResponse, error) {
 	_, err := this.ValidateAdmin(ctx)
 	if err != nil {
@@ -87,8 +87,8 @@ func (this *NodePriceItemService) FindAllEnabledNodePriceItems(ctx context.Conte
 	return &pb.FindAllEnabledNodePriceItemsResponse{NodePriceItems: result}, nil
 }
 
-// FindAllEnabledAndOnNodePriceItems 查找所有启用的区域价格
-func (this *NodePriceItemService) FindAllEnabledAndOnNodePriceItems(ctx context.Context, req *pb.FindAllEnabledAndOnNodePriceItemsRequest) (*pb.FindAllEnabledAndOnNodePriceItemsResponse, error) {
+// FindAllAvailableNodePriceItems 查找所有启用的区域价格
+func (this *NodePriceItemService) FindAllAvailableNodePriceItems(ctx context.Context, req *pb.FindAllAvailableNodePriceItemsRequest) (*pb.FindAllAvailableNodePriceItemsResponse, error) {
 	_, err := this.ValidateAdmin(ctx)
 	if err != nil {
 		return nil, err
@@ -112,10 +112,10 @@ func (this *NodePriceItemService) FindAllEnabledAndOnNodePriceItems(ctx context.
 		})
 	}
 
-	return &pb.FindAllEnabledAndOnNodePriceItemsResponse{NodePriceItems: result}, nil
+	return &pb.FindAllAvailableNodePriceItemsResponse{NodePriceItems: result}, nil
 }
 
-// 查找单个区域信息
+// FindEnabledNodePriceItem 查找单个区域信息
 func (this *NodePriceItemService) FindEnabledNodePriceItem(ctx context.Context, req *pb.FindEnabledNodePriceItemRequest) (*pb.FindEnabledNodePriceItemResponse, error) {
 	_, err := this.ValidateAdmin(ctx)
 	if err != nil {
diff --git a/internal/rpc/services/service_node_region.go b/internal/rpc/services/service_node_region.go
index efa60c61..6c3a8a2d 100644
--- a/internal/rpc/services/service_node_region.go
+++ b/internal/rpc/services/service_node_region.go
@@ -85,8 +85,8 @@ func (this *NodeRegionService) FindAllEnabledNodeRegions(ctx context.Context, re
 	return &pb.FindAllEnabledNodeRegionsResponse{NodeRegions: result}, nil
 }
 
-// FindAllEnabledAndOnNodeRegions 查找所有启用的区域
-func (this *NodeRegionService) FindAllEnabledAndOnNodeRegions(ctx context.Context, req *pb.FindAllEnabledAndOnNodeRegionsRequest) (*pb.FindAllEnabledAndOnNodeRegionsResponse, error) {
+// FindAllAvailableNodeRegions 查找所有启用的区域
+func (this *NodeRegionService) FindAllAvailableNodeRegions(ctx context.Context, req *pb.FindAllAvailableNodeRegionsRequest) (*pb.FindAllAvailableNodeRegionsResponse, error) {
 	_, err := this.ValidateAdmin(ctx)
 	if err != nil {
 		return nil, err
@@ -108,7 +108,7 @@ func (this *NodeRegionService) FindAllEnabledAndOnNodeRegions(ctx context.Contex
 			PricesJSON:  region.Prices,
 		})
 	}
-	return &pb.FindAllEnabledAndOnNodeRegionsResponse{NodeRegions: result}, nil
+	return &pb.FindAllAvailableNodeRegionsResponse{NodeRegions: result}, nil
 }
 
 // UpdateNodeRegionOrders 排序