From cfc2ec5e4bc4aecf7b6ed6c333e648aa65bc2ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Tue, 23 May 2023 19:50:28 +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/rpc/services/service_node.go | 116 ---------------------- internal/rpc/services/service_node_ext.go | 12 +++ 2 files changed, 12 insertions(+), 116 deletions(-) diff --git a/internal/rpc/services/service_node.go b/internal/rpc/services/service_node.go index 9e46770b..c47deee1 100644 --- a/internal/rpc/services/service_node.go +++ b/internal/rpc/services/service_node.go @@ -2257,119 +2257,3 @@ func (this *NodeService) UpdateNodeAPIConfig(ctx context.Context, req *pb.Update return this.Success() } - -// FindNodeUAMPolicies 查找节点的UAM策略 -func (this *NodeService) FindNodeUAMPolicies(ctx context.Context, req *pb.FindNodeUAMPoliciesRequest) (*pb.FindNodeUAMPoliciesResponse, error) { - nodeId, err := this.ValidateNode(ctx) - if err != nil { - return nil, err - } - - var tx = this.NullTx() - clusterIds, err := models.SharedNodeDAO.FindEnabledAndOnNodeClusterIds(tx, nodeId) - if err != nil { - return nil, err - } - - var pbPolicies = []*pb.FindNodeUAMPoliciesResponse_UAMPolicy{} - for _, clusterId := range clusterIds { - policy, err := models.SharedNodeClusterDAO.FindClusterUAMPolicy(tx, clusterId, nil) - if err != nil { - return nil, err - } - if policy == nil { - continue - } - policyJSON, err := json.Marshal(policy) - if err != nil { - return nil, err - } - pbPolicies = append(pbPolicies, &pb.FindNodeUAMPoliciesResponse_UAMPolicy{ - NodeClusterId: clusterId, - UamPolicyJSON: policyJSON, - }) - } - return &pb.FindNodeUAMPoliciesResponse{ - UamPolicies: pbPolicies, - }, nil -} - -// FindNodeHTTPCCPolicies 查找节点的HTTP CC策略 -func (this *NodeService) FindNodeHTTPCCPolicies(ctx context.Context, req *pb.FindNodeHTTPCCPoliciesRequest) (*pb.FindNodeHTTPCCPoliciesResponse, error) { - nodeId, err := this.ValidateNode(ctx) - if err != nil { - return nil, err - } - - var tx = this.NullTx() - clusterIds, err := models.SharedNodeDAO.FindEnabledAndOnNodeClusterIds(tx, nodeId) - if err != nil { - return nil, err - } - - var pbPolicies = []*pb.FindNodeHTTPCCPoliciesResponse_HTTPCCPolicy{} - for _, clusterId := range clusterIds { - policy, err := models.SharedNodeClusterDAO.FindClusterHTTPCCPolicy(tx, clusterId, nil) - if err != nil { - return nil, err - } - if policy == nil { - continue - } - - // 集成默认设置 - for i := 0; i < len(serverconfigs.DefaultHTTPCCThresholds); i ++ { - if i < len(policy.Thresholds) { - policy.Thresholds[i].MergeIfEmpty(serverconfigs.DefaultHTTPCCThresholds[i]) - } - } - - policyJSON, err := json.Marshal(policy) - if err != nil { - return nil, err - } - pbPolicies = append(pbPolicies, &pb.FindNodeHTTPCCPoliciesResponse_HTTPCCPolicy{ - NodeClusterId: clusterId, - HttpCCPolicyJSON: policyJSON, - }) - } - return &pb.FindNodeHTTPCCPoliciesResponse{ - HttpCCPolicies: pbPolicies, - }, nil -} - -// FindNodeHTTPPagesPolicies 查找节点的自定义页面策略 -func (this *NodeService) FindNodeHTTPPagesPolicies(ctx context.Context, req *pb.FindNodeHTTPPagesPoliciesRequest) (*pb.FindNodeHTTPPagesPoliciesResponse, error) { - nodeId, err := this.ValidateNode(ctx) - if err != nil { - return nil, err - } - - var tx = this.NullTx() - clusterIds, err := models.SharedNodeDAO.FindEnabledAndOnNodeClusterIds(tx, nodeId) - if err != nil { - return nil, err - } - - var pbPolicies = []*pb.FindNodeHTTPPagesPoliciesResponse_HTTPPagesPolicy{} - for _, clusterId := range clusterIds { - policy, err := models.SharedNodeClusterDAO.FindClusterHTTPPagesPolicy(tx, clusterId, nil) - if err != nil { - return nil, err - } - if policy == nil { - continue - } - policyJSON, err := json.Marshal(policy) - if err != nil { - return nil, err - } - pbPolicies = append(pbPolicies, &pb.FindNodeHTTPPagesPoliciesResponse_HTTPPagesPolicy{ - NodeClusterId: clusterId, - HttpPagesPolicyJSON: policyJSON, - }) - } - return &pb.FindNodeHTTPPagesPoliciesResponse{ - HttpPagesPolicies: pbPolicies, - }, nil -} diff --git a/internal/rpc/services/service_node_ext.go b/internal/rpc/services/service_node_ext.go index 97884f53..0d6a455f 100644 --- a/internal/rpc/services/service_node_ext.go +++ b/internal/rpc/services/service_node_ext.go @@ -8,6 +8,18 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) +func (this *NodeService) FindNodeUAMPolicies(ctx context.Context, req *pb.FindNodeUAMPoliciesRequest) (*pb.FindNodeUAMPoliciesResponse, error) { + return nil, this.NotImplementedYet() +} + +func (this *NodeService) FindNodeHTTPCCPolicies(ctx context.Context, req *pb.FindNodeHTTPCCPoliciesRequest) (*pb.FindNodeHTTPCCPoliciesResponse, error) { + return nil, this.NotImplementedYet() +} + +func (this *NodeService) FindNodeHTTPPagesPolicies(ctx context.Context, req *pb.FindNodeHTTPPagesPoliciesRequest) (*pb.FindNodeHTTPPagesPoliciesResponse, error) { + return nil, this.NotImplementedYet() +} + func (this *NodeService) FindNodeScheduleInfo(ctx context.Context, req *pb.FindNodeScheduleInfoRequest) (*pb.FindNodeScheduleInfoResponse, error) { return nil, this.NotImplementedYet() }