diff --git a/internal/const/const.go b/internal/const/const.go index 8b4ba51e..6eb2ee3d 100644 --- a/internal/const/const.go +++ b/internal/const/const.go @@ -19,7 +19,7 @@ const ( // 其他节点版本号,用来检测是否有需要升级的节点 NodeVersion = "0.4.10" - UserNodeVersion = "0.3.5" + UserNodeVersion = "0.3.6" AuthorityNodeVersion = "0.0.2" MonitorNodeVersion = "0.0.4" DNSNodeVersion = "0.2.4" diff --git a/internal/rpc/services/nameservers/service_ns.go b/internal/rpc/services/nameservers/service_ns.go index fccea9fa..448f3a77 100644 --- a/internal/rpc/services/nameservers/service_ns.go +++ b/internal/rpc/services/nameservers/service_ns.go @@ -20,7 +20,7 @@ type NSService struct { // ComposeNSBoard 组合看板数据 func (this *NSService) ComposeNSBoard(ctx context.Context, req *pb.ComposeNSBoardRequest) (*pb.ComposeNSBoardResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/nameservers/service_ns_cluster.go b/internal/rpc/services/nameservers/service_ns_cluster.go index 7ffa9ecd..03e95a4d 100644 --- a/internal/rpc/services/nameservers/service_ns_cluster.go +++ b/internal/rpc/services/nameservers/service_ns_cluster.go @@ -19,7 +19,7 @@ type NSClusterService struct { // CreateNSCluster 创建集群 func (this *NSClusterService) CreateNSCluster(ctx context.Context, req *pb.CreateNSClusterRequest) (*pb.CreateNSClusterResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -33,7 +33,7 @@ func (this *NSClusterService) CreateNSCluster(ctx context.Context, req *pb.Creat // UpdateNSCluster 修改集群 func (this *NSClusterService) UpdateNSCluster(ctx context.Context, req *pb.UpdateNSClusterRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -47,7 +47,7 @@ func (this *NSClusterService) UpdateNSCluster(ctx context.Context, req *pb.Updat // FindNSClusterAccessLog 查找集群访问日志配置 func (this *NSClusterService) FindNSClusterAccessLog(ctx context.Context, req *pb.FindNSClusterAccessLogRequest) (*pb.FindNSClusterAccessLogResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -62,7 +62,7 @@ func (this *NSClusterService) FindNSClusterAccessLog(ctx context.Context, req *p // UpdateNSClusterAccessLog 修改集群访问日志配置 func (this *NSClusterService) UpdateNSClusterAccessLog(ctx context.Context, req *pb.UpdateNSClusterAccessLogRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -77,7 +77,7 @@ func (this *NSClusterService) UpdateNSClusterAccessLog(ctx context.Context, req // DeleteNSCluster 删除集群 func (this *NSClusterService) DeleteNSCluster(ctx context.Context, req *pb.DeleteNSCluster) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -98,7 +98,7 @@ func (this *NSClusterService) DeleteNSCluster(ctx context.Context, req *pb.Delet // FindEnabledNSCluster 查找单个可用集群信息 func (this *NSClusterService) FindEnabledNSCluster(ctx context.Context, req *pb.FindEnabledNSClusterRequest) (*pb.FindEnabledNSClusterResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -120,7 +120,7 @@ func (this *NSClusterService) FindEnabledNSCluster(ctx context.Context, req *pb. // CountAllEnabledNSClusters 计算所有可用集群的数量 func (this *NSClusterService) CountAllEnabledNSClusters(ctx context.Context, req *pb.CountAllEnabledNSClustersRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -134,7 +134,7 @@ func (this *NSClusterService) CountAllEnabledNSClusters(ctx context.Context, req // ListEnabledNSClusters 列出单页可用集群 func (this *NSClusterService) ListEnabledNSClusters(ctx context.Context, req *pb.ListEnabledNSClustersRequest) (*pb.ListEnabledNSClustersResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -157,7 +157,7 @@ func (this *NSClusterService) ListEnabledNSClusters(ctx context.Context, req *pb // FindAllEnabledNSClusters 查找所有可用集群 func (this *NSClusterService) FindAllEnabledNSClusters(ctx context.Context, req *pb.FindAllEnabledNSClustersRequest) (*pb.FindAllEnabledNSClustersResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -180,7 +180,7 @@ func (this *NSClusterService) FindAllEnabledNSClusters(ctx context.Context, req // UpdateNSClusterRecursionConfig 设置递归DNS配置 func (this *NSClusterService) UpdateNSClusterRecursionConfig(ctx context.Context, req *pb.UpdateNSClusterRecursionConfigRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -202,7 +202,7 @@ func (this *NSClusterService) UpdateNSClusterRecursionConfig(ctx context.Context // FindNSClusterRecursionConfig 读取递归DNS配置 func (this *NSClusterService) FindNSClusterRecursionConfig(ctx context.Context, req *pb.FindNSClusterRecursionConfigRequest) (*pb.FindNSClusterRecursionConfigResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/nameservers/service_ns_domain.go b/internal/rpc/services/nameservers/service_ns_domain.go index 5bd50cb9..8df3fbb3 100644 --- a/internal/rpc/services/nameservers/service_ns_domain.go +++ b/internal/rpc/services/nameservers/service_ns_domain.go @@ -19,7 +19,7 @@ type NSDomainService struct { // CreateNSDomain 创建域名 func (this *NSDomainService) CreateNSDomain(ctx context.Context, req *pb.CreateNSDomainRequest) (*pb.CreateNSDomainResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -34,7 +34,7 @@ func (this *NSDomainService) CreateNSDomain(ctx context.Context, req *pb.CreateN // UpdateNSDomain 修改域名 func (this *NSDomainService) UpdateNSDomain(ctx context.Context, req *pb.UpdateNSDomainRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -49,7 +49,7 @@ func (this *NSDomainService) UpdateNSDomain(ctx context.Context, req *pb.UpdateN // DeleteNSDomain 删除域名 func (this *NSDomainService) DeleteNSDomain(ctx context.Context, req *pb.DeleteNSDomainRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -64,7 +64,7 @@ func (this *NSDomainService) DeleteNSDomain(ctx context.Context, req *pb.DeleteN // FindEnabledNSDomain 查找单个域名 func (this *NSDomainService) FindEnabledNSDomain(ctx context.Context, req *pb.FindEnabledNSDomainRequest) (*pb.FindEnabledNSDomainResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -123,7 +123,7 @@ func (this *NSDomainService) FindEnabledNSDomain(ctx context.Context, req *pb.Fi // CountAllEnabledNSDomains 计算域名数量 func (this *NSDomainService) CountAllEnabledNSDomains(ctx context.Context, req *pb.CountAllEnabledNSDomainsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -138,7 +138,7 @@ func (this *NSDomainService) CountAllEnabledNSDomains(ctx context.Context, req * // ListEnabledNSDomains 列出单页域名 func (this *NSDomainService) ListEnabledNSDomains(ctx context.Context, req *pb.ListEnabledNSDomainsRequest) (*pb.ListEnabledNSDomainsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -230,7 +230,7 @@ func (this *NSDomainService) ListNSDomainsAfterVersion(ctx context.Context, req // FindEnabledNSDomainTSIG 查找TSIG配置 func (this *NSDomainService) FindEnabledNSDomainTSIG(ctx context.Context, req *pb.FindEnabledNSDomainTSIGRequest) (*pb.FindEnabledNSDomainTSIGResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -245,7 +245,7 @@ func (this *NSDomainService) FindEnabledNSDomainTSIG(ctx context.Context, req *p // UpdateNSDomainTSIG 修改TSIG配置 func (this *NSDomainService) UpdateNSDomainTSIG(ctx context.Context, req *pb.UpdateNSDomainTSIGRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/nameservers/service_ns_key.go b/internal/rpc/services/nameservers/service_ns_key.go index c9e13832..2bcb4dc1 100644 --- a/internal/rpc/services/nameservers/service_ns_key.go +++ b/internal/rpc/services/nameservers/service_ns_key.go @@ -16,7 +16,7 @@ type NSKeyService struct { // CreateNSKey 创建密钥 func (this *NSKeyService) CreateNSKey(ctx context.Context, req *pb.CreateNSKeyRequest) (*pb.CreateNSKeyResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -31,7 +31,7 @@ func (this *NSKeyService) CreateNSKey(ctx context.Context, req *pb.CreateNSKeyRe // UpdateNSKey 修改密钥 func (this *NSKeyService) UpdateNSKey(ctx context.Context, req *pb.UpdateNSKeyRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -45,7 +45,7 @@ func (this *NSKeyService) UpdateNSKey(ctx context.Context, req *pb.UpdateNSKeyRe // DeleteNSKey 删除密钥 func (this *NSKeyService) DeleteNSKey(ctx context.Context, req *pb.DeleteNSKeyRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -60,7 +60,7 @@ func (this *NSKeyService) DeleteNSKey(ctx context.Context, req *pb.DeleteNSKeyRe // FindEnabledNSKey 查找单个密钥 func (this *NSKeyService) FindEnabledNSKey(ctx context.Context, req *pb.FindEnabledNSKeyRequest) (*pb.FindEnabledNSKeyResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -87,7 +87,7 @@ func (this *NSKeyService) FindEnabledNSKey(ctx context.Context, req *pb.FindEnab // CountAllEnabledNSKeys 计算密钥数量 func (this *NSKeyService) CountAllEnabledNSKeys(ctx context.Context, req *pb.CountAllEnabledNSKeysRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -102,7 +102,7 @@ func (this *NSKeyService) CountAllEnabledNSKeys(ctx context.Context, req *pb.Cou // ListEnabledNSKeys 列出单页密钥 func (this *NSKeyService) ListEnabledNSKeys(ctx context.Context, req *pb.ListEnabledNSKeysRequest) (*pb.ListEnabledNSKeysResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/nameservers/service_ns_node.go b/internal/rpc/services/nameservers/service_ns_node.go index c991b78e..dd9eab89 100644 --- a/internal/rpc/services/nameservers/service_ns_node.go +++ b/internal/rpc/services/nameservers/service_ns_node.go @@ -28,7 +28,7 @@ type NSNodeService struct { // FindAllEnabledNSNodesWithNSClusterId 根据集群查找所有节点 func (this *NSNodeService) FindAllEnabledNSNodesWithNSClusterId(ctx context.Context, req *pb.FindAllEnabledNSNodesWithNSClusterIdRequest) (*pb.FindAllEnabledNSNodesWithNSClusterIdResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -59,7 +59,7 @@ func (this *NSNodeService) FindAllEnabledNSNodesWithNSClusterId(ctx context.Cont // CountAllEnabledNSNodes 所有可用的节点数量 func (this *NSNodeService) CountAllEnabledNSNodes(ctx context.Context, req *pb.CountAllEnabledNSNodesRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -74,7 +74,7 @@ func (this *NSNodeService) CountAllEnabledNSNodes(ctx context.Context, req *pb.C // CountAllEnabledNSNodesMatch 计算匹配的节点数量 func (this *NSNodeService) CountAllEnabledNSNodesMatch(ctx context.Context, req *pb.CountAllEnabledNSNodesMatchRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -89,7 +89,7 @@ func (this *NSNodeService) CountAllEnabledNSNodesMatch(ctx context.Context, req // ListEnabledNSNodesMatch 列出单页节点 func (this *NSNodeService) ListEnabledNSNodesMatch(ctx context.Context, req *pb.ListEnabledNSNodesMatchRequest) (*pb.ListEnabledNSNodesMatchResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -139,7 +139,7 @@ func (this *NSNodeService) ListEnabledNSNodesMatch(ctx context.Context, req *pb. // CountAllUpgradeNSNodesWithNSClusterId 计算需要升级的节点数量 func (this *NSNodeService) CountAllUpgradeNSNodesWithNSClusterId(ctx context.Context, req *pb.CountAllUpgradeNSNodesWithNSClusterIdRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -161,7 +161,7 @@ func (this *NSNodeService) CountAllUpgradeNSNodesWithNSClusterId(ctx context.Con // CreateNSNode 创建节点 func (this *NSNodeService) CreateNSNode(ctx context.Context, req *pb.CreateNSNodeRequest) (*pb.CreateNSNodeResponse, error) { - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -188,7 +188,7 @@ func (this *NSNodeService) CreateNSNode(ctx context.Context, req *pb.CreateNSNod // DeleteNSNode 删除节点 func (this *NSNodeService) DeleteNSNode(ctx context.Context, req *pb.DeleteNSNodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -211,7 +211,7 @@ func (this *NSNodeService) DeleteNSNode(ctx context.Context, req *pb.DeleteNSNod // FindEnabledNSNode 查询单个节点信息 func (this *NSNodeService) FindEnabledNSNode(ctx context.Context, req *pb.FindEnabledNSNodeRequest) (*pb.FindEnabledNSNodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -285,7 +285,7 @@ func (this *NSNodeService) FindEnabledNSNode(ctx context.Context, req *pb.FindEn // UpdateNSNode 修改节点 func (this *NSNodeService) UpdateNSNode(ctx context.Context, req *pb.UpdateNSNodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -322,7 +322,7 @@ func (this *NSNodeService) UpdateNSNode(ctx context.Context, req *pb.UpdateNSNod // InstallNSNode 安装节点 func (this *NSNodeService) InstallNSNode(ctx context.Context, req *pb.InstallNSNodeRequest) (*pb.InstallNSNodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -340,7 +340,7 @@ func (this *NSNodeService) InstallNSNode(ctx context.Context, req *pb.InstallNSN // FindNSNodeInstallStatus 读取节点安装状态 func (this *NSNodeService) FindNSNodeInstallStatus(ctx context.Context, req *pb.FindNSNodeInstallStatusRequest) (*pb.FindNSNodeInstallStatusResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -368,7 +368,7 @@ func (this *NSNodeService) FindNSNodeInstallStatus(ctx context.Context, req *pb. // UpdateNSNodeIsInstalled 修改节点安装状态 func (this *NSNodeService) UpdateNSNodeIsInstalled(ctx context.Context, req *pb.UpdateNSNodeIsInstalledRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -515,7 +515,7 @@ func (this *NSNodeService) UpdateNSNodeConnectedAPINodes(ctx context.Context, re // UpdateNSNodeLogin 修改节点登录信息 func (this *NSNodeService) UpdateNSNodeLogin(ctx context.Context, req *pb.UpdateNSNodeLoginRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -537,7 +537,7 @@ func (this *NSNodeService) UpdateNSNodeLogin(ctx context.Context, req *pb.Update // StartNSNode 启动节点 func (this *NSNodeService) StartNSNode(ctx context.Context, req *pb.StartNSNodeRequest) (*pb.StartNSNodeResponse, error) { // 校验节点 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -563,7 +563,7 @@ func (this *NSNodeService) StartNSNode(ctx context.Context, req *pb.StartNSNodeR // StopNSNode 停止节点 func (this *NSNodeService) StopNSNode(ctx context.Context, req *pb.StopNSNodeRequest) (*pb.StopNSNodeResponse, error) { // 校验节点 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/nameservers/service_ns_question_option.go b/internal/rpc/services/nameservers/service_ns_question_option.go index 95c8b726..78b65ce3 100644 --- a/internal/rpc/services/nameservers/service_ns_question_option.go +++ b/internal/rpc/services/nameservers/service_ns_question_option.go @@ -18,7 +18,7 @@ type NSQuestionOptionService struct { // CreateNSQuestionOption 创建选项 func (this *NSQuestionOptionService) CreateNSQuestionOption(ctx context.Context, req *pb.CreateNSQuestionOptionRequest) (*pb.CreateNSQuestionOptionResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -63,7 +63,7 @@ func (this *NSQuestionOptionService) FindNSQuestionOption(ctx context.Context, r // DeleteNSQuestionOption 删除选项 func (this *NSQuestionOptionService) DeleteNSQuestionOption(ctx context.Context, req *pb.DeleteNSQuestionOptionRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/nameservers/service_ns_record.go b/internal/rpc/services/nameservers/service_ns_record.go index a18e7308..c4c1e19e 100644 --- a/internal/rpc/services/nameservers/service_ns_record.go +++ b/internal/rpc/services/nameservers/service_ns_record.go @@ -20,7 +20,7 @@ type NSRecordService struct { // CreateNSRecord 创建记录 func (this *NSRecordService) CreateNSRecord(ctx context.Context, req *pb.CreateNSRecordRequest) (*pb.CreateNSRecordResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -35,7 +35,7 @@ func (this *NSRecordService) CreateNSRecord(ctx context.Context, req *pb.CreateN // UpdateNSRecord 修改记录 func (this *NSRecordService) UpdateNSRecord(ctx context.Context, req *pb.UpdateNSRecordRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func (this *NSRecordService) UpdateNSRecord(ctx context.Context, req *pb.UpdateN // DeleteNSRecord 删除记录 func (this *NSRecordService) DeleteNSRecord(ctx context.Context, req *pb.DeleteNSRecordRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -65,7 +65,7 @@ func (this *NSRecordService) DeleteNSRecord(ctx context.Context, req *pb.DeleteN // CountAllEnabledNSRecords 计算记录数量 func (this *NSRecordService) CountAllEnabledNSRecords(ctx context.Context, req *pb.CountAllEnabledNSRecordsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -80,7 +80,7 @@ func (this *NSRecordService) CountAllEnabledNSRecords(ctx context.Context, req * // ListEnabledNSRecords 读取单页记录 func (this *NSRecordService) ListEnabledNSRecords(ctx context.Context, req *pb.ListEnabledNSRecordsRequest) (*pb.ListEnabledNSRecordsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -130,7 +130,7 @@ func (this *NSRecordService) ListEnabledNSRecords(ctx context.Context, req *pb.L // FindEnabledNSRecord 查询单个记录信息 func (this *NSRecordService) FindEnabledNSRecord(ctx context.Context, req *pb.FindEnabledNSRecordRequest) (*pb.FindEnabledNSRecordResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/nameservers/service_ns_route.go b/internal/rpc/services/nameservers/service_ns_route.go index d5bfd094..19935eac 100644 --- a/internal/rpc/services/nameservers/service_ns_route.go +++ b/internal/rpc/services/nameservers/service_ns_route.go @@ -18,7 +18,7 @@ type NSRouteService struct { // CreateNSRoute 创建线路 func (this *NSRouteService) CreateNSRoute(ctx context.Context, req *pb.CreateNSRouteRequest) (*pb.CreateNSRouteResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -32,7 +32,7 @@ func (this *NSRouteService) CreateNSRoute(ctx context.Context, req *pb.CreateNSR // UpdateNSRoute 修改线路 func (this *NSRouteService) UpdateNSRoute(ctx context.Context, req *pb.UpdateNSRouteRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -46,7 +46,7 @@ func (this *NSRouteService) UpdateNSRoute(ctx context.Context, req *pb.UpdateNSR // DeleteNSRoute 删除线路 func (this *NSRouteService) DeleteNSRoute(ctx context.Context, req *pb.DeleteNSRouteRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -60,7 +60,7 @@ func (this *NSRouteService) DeleteNSRoute(ctx context.Context, req *pb.DeleteNSR // FindEnabledNSRoute 获取单个路线信息 func (this *NSRouteService) FindEnabledNSRoute(ctx context.Context, req *pb.FindEnabledNSRouteRequest) (*pb.FindEnabledNSRouteResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -117,7 +117,7 @@ func (this *NSRouteService) FindEnabledNSRoute(ctx context.Context, req *pb.Find // FindAllEnabledNSRoutes 读取所有线路 func (this *NSRouteService) FindAllEnabledNSRoutes(ctx context.Context, req *pb.FindAllEnabledNSRoutesRequest) (*pb.FindAllEnabledNSRoutesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -174,7 +174,7 @@ func (this *NSRouteService) FindAllEnabledNSRoutes(ctx context.Context, req *pb. // UpdateNSRouteOrders 设置线路排序 func (this *NSRouteService) UpdateNSRouteOrders(ctx context.Context, req *pb.UpdateNSRouteOrdersRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_acme_provider.go b/internal/rpc/services/service_acme_provider.go index 7ec1a336..b9297cfe 100644 --- a/internal/rpc/services/service_acme_provider.go +++ b/internal/rpc/services/service_acme_provider.go @@ -15,7 +15,7 @@ type ACMEProviderService struct { // FindAllACMEProviders 查找所有的服务商 func (this *ACMEProviderService) FindAllACMEProviders(ctx context.Context, req *pb.FindAllACMEProvidersRequest) (*pb.FindAllACMEProvidersResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -37,7 +37,7 @@ func (this *ACMEProviderService) FindAllACMEProviders(ctx context.Context, req * // FindACMEProviderWithCode 根据代号查找服务商 func (this *ACMEProviderService) FindACMEProviderWithCode(ctx context.Context, req *pb.FindACMEProviderWithCodeRequest) (*pb.FindACMEProviderWithCodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_acme_provider_account.go b/internal/rpc/services/service_acme_provider_account.go index 0785a819..309fbc78 100644 --- a/internal/rpc/services/service_acme_provider_account.go +++ b/internal/rpc/services/service_acme_provider_account.go @@ -16,7 +16,7 @@ type ACMEProviderAccountService struct { // CreateACMEProviderAccount 创建服务商账号 func (this *ACMEProviderAccountService) CreateACMEProviderAccount(ctx context.Context, req *pb.CreateACMEProviderAccountRequest) (*pb.CreateACMEProviderAccountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -33,7 +33,7 @@ func (this *ACMEProviderAccountService) CreateACMEProviderAccount(ctx context.Co // FindAllACMEProviderAccountsWithProviderCode 使用代号查找服务商账号 func (this *ACMEProviderAccountService) FindAllACMEProviderAccountsWithProviderCode(ctx context.Context, req *pb.FindAllACMEProviderAccountsWithProviderCodeRequest) (*pb.FindAllACMEProviderAccountsWithProviderCodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -76,7 +76,7 @@ func (this *ACMEProviderAccountService) FindAllACMEProviderAccountsWithProviderC // UpdateACMEProviderAccount 修改服务商账号 func (this *ACMEProviderAccountService) UpdateACMEProviderAccount(ctx context.Context, req *pb.UpdateACMEProviderAccountRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -91,7 +91,7 @@ func (this *ACMEProviderAccountService) UpdateACMEProviderAccount(ctx context.Co // DeleteACMEProviderAccount 删除服务商账号 func (this *ACMEProviderAccountService) DeleteACMEProviderAccount(ctx context.Context, req *pb.DeleteACMEProviderAccountRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -106,7 +106,7 @@ func (this *ACMEProviderAccountService) DeleteACMEProviderAccount(ctx context.Co // FindEnabledACMEProviderAccount 查找单个服务商账号 func (this *ACMEProviderAccountService) FindEnabledACMEProviderAccount(ctx context.Context, req *pb.FindEnabledACMEProviderAccountRequest) (*pb.FindEnabledACMEProviderAccountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -147,7 +147,7 @@ func (this *ACMEProviderAccountService) FindEnabledACMEProviderAccount(ctx conte // CountAllEnabledACMEProviderAccounts 计算所有服务商账号数量 func (this *ACMEProviderAccountService) CountAllEnabledACMEProviderAccounts(ctx context.Context, req *pb.CountAllEnabledACMEProviderAccountsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -162,7 +162,7 @@ func (this *ACMEProviderAccountService) CountAllEnabledACMEProviderAccounts(ctx // ListEnabledACMEProviderAccounts 列出单页服务商账号 func (this *ACMEProviderAccountService) ListEnabledACMEProviderAccounts(ctx context.Context, req *pb.ListEnabledACMEProviderAccountsRequest) (*pb.ListEnabledACMEProviderAccountsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_admin.go b/internal/rpc/services/service_admin.go index 67cf6e94..b98913fd 100644 --- a/internal/rpc/services/service_admin.go +++ b/internal/rpc/services/service_admin.go @@ -65,7 +65,7 @@ func (this *AdminService) LoginAdmin(ctx context.Context, req *pb.LoginAdminRequ // CheckAdminExists 检查管理员是否存在 func (this *AdminService) CheckAdminExists(ctx context.Context, req *pb.CheckAdminExistsRequest) (*pb.CheckAdminExistsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -91,7 +91,7 @@ func (this *AdminService) CheckAdminExists(ctx context.Context, req *pb.CheckAdm // CheckAdminUsername 检查用户名是否存在 func (this *AdminService) CheckAdminUsername(ctx context.Context, req *pb.CheckAdminUsernameRequest) (*pb.CheckAdminUsernameResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -109,7 +109,7 @@ func (this *AdminService) CheckAdminUsername(ctx context.Context, req *pb.CheckA // FindAdminFullname 获取管理员名称 func (this *AdminService) FindAdminFullname(ctx context.Context, req *pb.FindAdminFullnameRequest) (*pb.FindAdminFullnameResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -129,7 +129,7 @@ func (this *AdminService) FindAdminFullname(ctx context.Context, req *pb.FindAdm // FindEnabledAdmin 获取管理员信息 func (this *AdminService) FindEnabledAdmin(ctx context.Context, req *pb.FindEnabledAdminRequest) (*pb.FindEnabledAdminResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -264,7 +264,7 @@ func (this *AdminService) UpdateAdminLogin(ctx context.Context, req *pb.UpdateAd // FindAllAdminModules 获取所有管理员的权限列表 func (this *AdminService) FindAllAdminModules(ctx context.Context, req *pb.FindAllAdminModulesRequest) (*pb.FindAllAdminModulesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -311,7 +311,7 @@ func (this *AdminService) FindAllAdminModules(ctx context.Context, req *pb.FindA // CreateAdmin 创建管理员 func (this *AdminService) CreateAdmin(ctx context.Context, req *pb.CreateAdminRequest) (*pb.CreateAdminResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -330,7 +330,7 @@ func (this *AdminService) CreateAdmin(ctx context.Context, req *pb.CreateAdminRe // UpdateAdmin 修改管理员 func (this *AdminService) UpdateAdmin(ctx context.Context, req *pb.UpdateAdminRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -349,7 +349,7 @@ func (this *AdminService) UpdateAdmin(ctx context.Context, req *pb.UpdateAdminRe // CountAllEnabledAdmins 计算管理员数量 func (this *AdminService) CountAllEnabledAdmins(ctx context.Context, req *pb.CountAllEnabledAdminsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -367,7 +367,7 @@ func (this *AdminService) CountAllEnabledAdmins(ctx context.Context, req *pb.Cou // ListEnabledAdmins 列出单页的管理员 func (this *AdminService) ListEnabledAdmins(ctx context.Context, req *pb.ListEnabledAdminsRequest) (*pb.ListEnabledAdminsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -416,7 +416,7 @@ func (this *AdminService) ListEnabledAdmins(ctx context.Context, req *pb.ListEna // DeleteAdmin 删除管理员 func (this *AdminService) DeleteAdmin(ctx context.Context, req *pb.DeleteAdminRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -437,7 +437,7 @@ func (this *AdminService) DeleteAdmin(ctx context.Context, req *pb.DeleteAdminRe // CheckAdminOTPWithUsername 检查是否需要输入OTP func (this *AdminService) CheckAdminOTPWithUsername(ctx context.Context, req *pb.CheckAdminOTPWithUsernameRequest) (*pb.CheckAdminOTPWithUsernameResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -465,7 +465,7 @@ func (this *AdminService) CheckAdminOTPWithUsername(ctx context.Context, req *pb // ComposeAdminDashboard 取得管理员Dashboard数据 func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.ComposeAdminDashboardRequest) (*pb.ComposeAdminDashboardResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -834,7 +834,7 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com // UpdateAdminTheme 修改管理员使用的界面风格 func (this *AdminService) UpdateAdminTheme(ctx context.Context, req *pb.UpdateAdminThemeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, req.AdminId) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_api_method_stat.go b/internal/rpc/services/service_api_method_stat.go index 7862a72a..e563cd89 100644 --- a/internal/rpc/services/service_api_method_stat.go +++ b/internal/rpc/services/service_api_method_stat.go @@ -17,7 +17,7 @@ type APIMethodStatService struct { // FindAPIMethodStatsWithDay 查找某天的统计 func (this *APIMethodStatService) FindAPIMethodStatsWithDay(ctx context.Context, req *pb.FindAPIMethodStatsWithDayRequest) (*pb.FindAPIMethodStatsWithDayResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -64,7 +64,7 @@ func (this *APIMethodStatService) FindAPIMethodStatsWithDay(ctx context.Context, // CountAPIMethodStatsWithDay 检查是否有统计数据 func (this *APIMethodStatService) CountAPIMethodStatsWithDay(ctx context.Context, req *pb.CountAPIMethodStatsWithDayRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_api_node.go b/internal/rpc/services/service_api_node.go index 2c915a8e..baf2f7c9 100644 --- a/internal/rpc/services/service_api_node.go +++ b/internal/rpc/services/service_api_node.go @@ -15,7 +15,7 @@ type APINodeService struct { // CreateAPINode 创建API节点 func (this *APINodeService) CreateAPINode(ctx context.Context, req *pb.CreateAPINodeRequest) (*pb.CreateAPINodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -32,7 +32,7 @@ func (this *APINodeService) CreateAPINode(ctx context.Context, req *pb.CreateAPI // UpdateAPINode 修改API节点 func (this *APINodeService) UpdateAPINode(ctx context.Context, req *pb.UpdateAPINodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -49,7 +49,7 @@ func (this *APINodeService) UpdateAPINode(ctx context.Context, req *pb.UpdateAPI // DeleteAPINode 删除API节点 func (this *APINodeService) DeleteAPINode(ctx context.Context, req *pb.DeleteAPINodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -106,7 +106,7 @@ func (this *APINodeService) FindAllEnabledAPINodes(ctx context.Context, req *pb. // CountAllEnabledAPINodes 计算API节点数量 func (this *APINodeService) CountAllEnabledAPINodes(ctx context.Context, req *pb.CountAllEnabledAPINodesRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -123,7 +123,7 @@ func (this *APINodeService) CountAllEnabledAPINodes(ctx context.Context, req *pb // CountAllEnabledAndOnAPINodes 计算API节点数量 func (this *APINodeService) CountAllEnabledAndOnAPINodes(ctx context.Context, req *pb.CountAllEnabledAndOnAPINodesRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -140,7 +140,7 @@ func (this *APINodeService) CountAllEnabledAndOnAPINodes(ctx context.Context, re // ListEnabledAPINodes 列出单页的API节点 func (this *APINodeService) ListEnabledAPINodes(ctx context.Context, req *pb.ListEnabledAPINodesRequest) (*pb.ListEnabledAPINodesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -238,7 +238,7 @@ func (this *APINodeService) FindCurrentAPINodeVersion(ctx context.Context, req * // FindCurrentAPINode 获取当前API节点的信息 func (this *APINodeService) FindCurrentAPINode(ctx context.Context, req *pb.FindCurrentAPINodeRequest) (*pb.FindCurrentAPINodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -281,7 +281,7 @@ func (this *APINodeService) FindCurrentAPINode(ctx context.Context, req *pb.Find // CountAllEnabledAPINodesWithSSLCertId 计算使用某个SSL证书的API节点数量 func (this *APINodeService) CountAllEnabledAPINodesWithSSLCertId(ctx context.Context, req *pb.CountAllEnabledAPINodesWithSSLCertIdRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -304,7 +304,7 @@ func (this *APINodeService) CountAllEnabledAPINodesWithSSLCertId(ctx context.Con // DebugAPINode 修改调试模式状态 func (this *APINodeService) DebugAPINode(ctx context.Context, req *pb.DebugAPINodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_authority_node.go b/internal/rpc/services/service_authority_node.go index 86848db6..45c7d609 100644 --- a/internal/rpc/services/service_authority_node.go +++ b/internal/rpc/services/service_authority_node.go @@ -18,7 +18,7 @@ type AuthorityNodeService struct { // CreateAuthorityNode 创建认证节点 func (this *AuthorityNodeService) CreateAuthorityNode(ctx context.Context, req *pb.CreateAuthorityNodeRequest) (*pb.CreateAuthorityNodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -35,7 +35,7 @@ func (this *AuthorityNodeService) CreateAuthorityNode(ctx context.Context, req * // UpdateAuthorityNode 修改认证节点 func (this *AuthorityNodeService) UpdateAuthorityNode(ctx context.Context, req *pb.UpdateAuthorityNodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -52,7 +52,7 @@ func (this *AuthorityNodeService) UpdateAuthorityNode(ctx context.Context, req * // DeleteAuthorityNode 删除认证节点 func (this *AuthorityNodeService) DeleteAuthorityNode(ctx context.Context, req *pb.DeleteAuthorityNodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -69,7 +69,7 @@ func (this *AuthorityNodeService) DeleteAuthorityNode(ctx context.Context, req * // FindAllEnabledAuthorityNodes 列出所有可用认证节点 func (this *AuthorityNodeService) FindAllEnabledAuthorityNodes(ctx context.Context, req *pb.FindAllEnabledAuthorityNodesRequest) (*pb.FindAllEnabledAuthorityNodesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -98,7 +98,7 @@ func (this *AuthorityNodeService) FindAllEnabledAuthorityNodes(ctx context.Conte // CountAllEnabledAuthorityNodes 计算认证节点数量 func (this *AuthorityNodeService) CountAllEnabledAuthorityNodes(ctx context.Context, req *pb.CountAllEnabledAuthorityNodesRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -115,7 +115,7 @@ func (this *AuthorityNodeService) CountAllEnabledAuthorityNodes(ctx context.Cont // ListEnabledAuthorityNodes 列出单页的认证节点 func (this *AuthorityNodeService) ListEnabledAuthorityNodes(ctx context.Context, req *pb.ListEnabledAuthorityNodesRequest) (*pb.ListEnabledAuthorityNodesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -145,7 +145,7 @@ func (this *AuthorityNodeService) ListEnabledAuthorityNodes(ctx context.Context, // FindEnabledAuthorityNode 根据ID查找节点 func (this *AuthorityNodeService) FindEnabledAuthorityNode(ctx context.Context, req *pb.FindEnabledAuthorityNodeRequest) (*pb.FindEnabledAuthorityNodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_base.go b/internal/rpc/services/service_base.go index 6bb54d4e..bd997a95 100644 --- a/internal/rpc/services/service_base.go +++ b/internal/rpc/services/service_base.go @@ -23,14 +23,11 @@ type BaseService struct { } // ValidateAdmin 校验管理员 -func (this *BaseService) ValidateAdmin(ctx context.Context, reqAdminId int64) (adminId int64, err error) { +func (this *BaseService) ValidateAdmin(ctx context.Context) (adminId int64, err error) { _, _, reqUserId, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin) if err != nil { return } - if reqAdminId > 0 && reqUserId != reqAdminId { - return 0, this.PermissionError() - } return reqUserId, nil } diff --git a/internal/rpc/services/service_db.go b/internal/rpc/services/service_db.go index ad38e098..bbb3e3e3 100644 --- a/internal/rpc/services/service_db.go +++ b/internal/rpc/services/service_db.go @@ -16,7 +16,7 @@ type DBService struct { // FindAllDBTables 获取所有表信息 func (this *DBService) FindAllDBTables(ctx context.Context, req *pb.FindAllDBTablesRequest) (*pb.FindAllDBTablesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -62,7 +62,7 @@ func (this *DBService) FindAllDBTables(ctx context.Context, req *pb.FindAllDBTab // DeleteDBTable 删除表 func (this *DBService) DeleteDBTable(ctx context.Context, req *pb.DeleteDBTableRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -86,7 +86,7 @@ func (this *DBService) DeleteDBTable(ctx context.Context, req *pb.DeleteDBTableR // TruncateDBTable 清空表 func (this *DBService) TruncateDBTable(ctx context.Context, req *pb.TruncateDBTableRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_db_node.go b/internal/rpc/services/service_db_node.go index 7be78e73..b8d48558 100644 --- a/internal/rpc/services/service_db_node.go +++ b/internal/rpc/services/service_db_node.go @@ -19,7 +19,7 @@ type DBNodeService struct { // CreateDBNode 创建数据库节点 func (this *DBNodeService) CreateDBNode(ctx context.Context, req *pb.CreateDBNodeRequest) (*pb.CreateDBNodeResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -36,7 +36,7 @@ func (this *DBNodeService) CreateDBNode(ctx context.Context, req *pb.CreateDBNod // UpdateDBNode 修改数据库节点 func (this *DBNodeService) UpdateDBNode(ctx context.Context, req *pb.UpdateDBNodeRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func (this *DBNodeService) UpdateDBNode(ctx context.Context, req *pb.UpdateDBNod // DeleteDBNode 删除节点 func (this *DBNodeService) DeleteDBNode(ctx context.Context, req *pb.DeleteDBNodeRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -70,7 +70,7 @@ func (this *DBNodeService) DeleteDBNode(ctx context.Context, req *pb.DeleteDBNod // CountAllEnabledDBNodes 计算可用的数据库节点数量 func (this *DBNodeService) CountAllEnabledDBNodes(ctx context.Context, req *pb.CountAllEnabledDBNodesRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -87,7 +87,7 @@ func (this *DBNodeService) CountAllEnabledDBNodes(ctx context.Context, req *pb.C // ListEnabledDBNodes 列出单页的数据库节点 func (this *DBNodeService) ListEnabledDBNodes(ctx context.Context, req *pb.ListEnabledDBNodesRequest) (*pb.ListEnabledDBNodesResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -148,7 +148,7 @@ func (this *DBNodeService) ListEnabledDBNodes(ctx context.Context, req *pb.ListE // FindEnabledDBNode 根据ID查找可用的数据库节点 func (this *DBNodeService) FindEnabledDBNode(ctx context.Context, req *pb.FindEnabledDBNodeRequest) (*pb.FindEnabledDBNodeResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -178,7 +178,7 @@ func (this *DBNodeService) FindEnabledDBNode(ctx context.Context, req *pb.FindEn // FindAllDBNodeTables 获取所有表信息 func (this *DBNodeService) FindAllDBNodeTables(ctx context.Context, req *pb.FindAllDBNodeTablesRequest) (*pb.FindAllDBNodeTablesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -236,7 +236,7 @@ func (this *DBNodeService) FindAllDBNodeTables(ctx context.Context, req *pb.Find // DeleteDBNodeTable 删除表 func (this *DBNodeService) DeleteDBNodeTable(ctx context.Context, req *pb.DeleteDBNodeTableRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -271,7 +271,7 @@ func (this *DBNodeService) DeleteDBNodeTable(ctx context.Context, req *pb.Delete // TruncateDBNodeTable 清空表 func (this *DBNodeService) TruncateDBNodeTable(ctx context.Context, req *pb.TruncateDBNodeTableRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -301,7 +301,7 @@ func (this *DBNodeService) TruncateDBNodeTable(ctx context.Context, req *pb.Trun // CheckDBNodeStatus 检查数据库节点状态 func (this *DBNodeService) CheckDBNodeStatus(ctx context.Context, req *pb.CheckDBNodeStatusRequest) (*pb.CheckDBNodeStatusResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_dns.go b/internal/rpc/services/service_dns.go index bf223391..57c88b02 100644 --- a/internal/rpc/services/service_dns.go +++ b/internal/rpc/services/service_dns.go @@ -15,7 +15,7 @@ type DNSService struct { // FindAllDNSIssues 查找问题 func (this *DNSService) FindAllDNSIssues(ctx context.Context, req *pb.FindAllDNSIssuesRequest) (*pb.FindAllDNSIssuesResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_dns_domain.go b/internal/rpc/services/service_dns_domain.go index 68876b50..90823e9e 100644 --- a/internal/rpc/services/service_dns_domain.go +++ b/internal/rpc/services/service_dns_domain.go @@ -99,7 +99,7 @@ func (this *DNSDomainService) CreateDNSDomain(ctx context.Context, req *pb.Creat // UpdateDNSDomain 修改域名 func (this *DNSDomainService) UpdateDNSDomain(ctx context.Context, req *pb.UpdateDNSDomainRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -116,7 +116,7 @@ func (this *DNSDomainService) UpdateDNSDomain(ctx context.Context, req *pb.Updat // DeleteDNSDomain 删除域名 func (this *DNSDomainService) DeleteDNSDomain(ctx context.Context, req *pb.DeleteDNSDomainRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -133,7 +133,7 @@ func (this *DNSDomainService) DeleteDNSDomain(ctx context.Context, req *pb.Delet // RecoverDNSDomain 恢复删除的域名 func (this *DNSDomainService) RecoverDNSDomain(ctx context.Context, req *pb.RecoverDNSDomainRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -150,7 +150,7 @@ func (this *DNSDomainService) RecoverDNSDomain(ctx context.Context, req *pb.Reco // FindEnabledDNSDomain 查询单个域名完整信息 func (this *DNSDomainService) FindEnabledDNSDomain(ctx context.Context, req *pb.FindEnabledDNSDomainRequest) (*pb.FindEnabledDNSDomainResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -172,7 +172,7 @@ func (this *DNSDomainService) FindEnabledDNSDomain(ctx context.Context, req *pb. // FindEnabledBasicDNSDomain 查询单个域名基础信息 func (this *DNSDomainService) FindEnabledBasicDNSDomain(ctx context.Context, req *pb.FindEnabledBasicDNSDomainRequest) (*pb.FindEnabledBasicDNSDomainResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -198,7 +198,7 @@ func (this *DNSDomainService) FindEnabledBasicDNSDomain(ctx context.Context, req // CountAllEnabledDNSDomainsWithDNSProviderId 计算服务商下的域名数量 func (this *DNSDomainService) CountAllEnabledDNSDomainsWithDNSProviderId(ctx context.Context, req *pb.CountAllEnabledDNSDomainsWithDNSProviderIdRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -215,7 +215,7 @@ func (this *DNSDomainService) CountAllEnabledDNSDomainsWithDNSProviderId(ctx con // FindAllEnabledDNSDomainsWithDNSProviderId 列出服务商下的所有域名 func (this *DNSDomainService) FindAllEnabledDNSDomainsWithDNSProviderId(ctx context.Context, req *pb.FindAllEnabledDNSDomainsWithDNSProviderIdRequest) (*pb.FindAllEnabledDNSDomainsWithDNSProviderIdResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -242,7 +242,7 @@ func (this *DNSDomainService) FindAllEnabledDNSDomainsWithDNSProviderId(ctx cont // FindAllEnabledBasicDNSDomainsWithDNSProviderId 列出服务商下的所有域名基本信息 func (this *DNSDomainService) FindAllEnabledBasicDNSDomainsWithDNSProviderId(ctx context.Context, req *pb.FindAllEnabledBasicDNSDomainsWithDNSProviderIdRequest) (*pb.FindAllEnabledBasicDNSDomainsWithDNSProviderIdResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -271,7 +271,7 @@ func (this *DNSDomainService) FindAllEnabledBasicDNSDomainsWithDNSProviderId(ctx // SyncDNSDomainData 同步域名数据 func (this *DNSDomainService) SyncDNSDomainData(ctx context.Context, req *pb.SyncDNSDomainDataRequest) (*pb.SyncDNSDomainDataResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -281,7 +281,7 @@ func (this *DNSDomainService) SyncDNSDomainData(ctx context.Context, req *pb.Syn // FindAllDNSDomainRoutes 查看支持的线路 func (this *DNSDomainService) FindAllDNSDomainRoutes(ctx context.Context, req *pb.FindAllDNSDomainRoutesRequest) (*pb.FindAllDNSDomainRoutesResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -307,7 +307,7 @@ func (this *DNSDomainService) FindAllDNSDomainRoutes(ctx context.Context, req *p // ExistAvailableDomains 判断是否有域名可选 func (this *DNSDomainService) ExistAvailableDomains(ctx context.Context, req *pb.ExistAvailableDomainsRequest) (*pb.ExistAvailableDomainsResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_dns_provider.go b/internal/rpc/services/service_dns_provider.go index 50f7c4d0..502e5ce6 100644 --- a/internal/rpc/services/service_dns_provider.go +++ b/internal/rpc/services/service_dns_provider.go @@ -148,7 +148,7 @@ func (this *DNSProviderService) DeleteDNSProvider(ctx context.Context, req *pb.D // FindEnabledDNSProvider 查找单个服务商 func (this *DNSProviderService) FindEnabledDNSProvider(ctx context.Context, req *pb.FindEnabledDNSProviderRequest) (*pb.FindEnabledDNSProviderResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -176,7 +176,7 @@ func (this *DNSProviderService) FindEnabledDNSProvider(ctx context.Context, req // FindAllDNSProviderTypes 取得所有服务商类型 func (this *DNSProviderService) FindAllDNSProviderTypes(ctx context.Context, req *pb.FindAllDNSProviderTypesRequest) (*pb.FindAllDNSProviderTypesResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -195,7 +195,7 @@ func (this *DNSProviderService) FindAllDNSProviderTypes(ctx context.Context, req // FindAllEnabledDNSProvidersWithType 取得某个类型的所有服务商 func (this *DNSProviderService) FindAllEnabledDNSProvidersWithType(ctx context.Context, req *pb.FindAllEnabledDNSProvidersWithTypeRequest) (*pb.FindAllEnabledDNSProvidersWithTypeResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_dns_task.go b/internal/rpc/services/service_dns_task.go index 2859ee18..8496862a 100644 --- a/internal/rpc/services/service_dns_task.go +++ b/internal/rpc/services/service_dns_task.go @@ -15,7 +15,7 @@ type DNSTaskService struct { // ExistsDNSTasks 检查是否有正在执行的任务 func (this *DNSTaskService) ExistsDNSTasks(ctx context.Context, req *pb.ExistsDNSTasksRequest) (*pb.ExistsDNSTasksResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -39,7 +39,7 @@ func (this *DNSTaskService) ExistsDNSTasks(ctx context.Context, req *pb.ExistsDN // FindAllDoingDNSTasks 查找正在执行的所有任务 func (this *DNSTaskService) FindAllDoingDNSTasks(ctx context.Context, req *pb.FindAllDoingDNSTasksRequest) (*pb.FindAllDoingDNSTasksResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -106,7 +106,7 @@ func (this *DNSTaskService) FindAllDoingDNSTasks(ctx context.Context, req *pb.Fi // DeleteDNSTask 删除任务 func (this *DNSTaskService) DeleteDNSTask(ctx context.Context, req *pb.DeleteDNSTaskRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_file.go b/internal/rpc/services/service_file.go index 1774fe07..6c3a97d1 100644 --- a/internal/rpc/services/service_file.go +++ b/internal/rpc/services/service_file.go @@ -6,18 +6,20 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" ) -// 文件相关服务 +// FileService 文件相关服务 type FileService struct { BaseService } -// 查找文件 +// FindEnabledFile 查找文件 func (this *FileService) FindEnabledFile(ctx context.Context, req *pb.FindEnabledFileRequest) (*pb.FindEnabledFileResponse, error) { _, userId, err := this.ValidateAdminAndUser(ctx, 0, -1) if err != nil { return nil, err } + // TODO 检查用户权限 + var tx = this.NullTx() file, err := models.SharedFileDAO.FindEnabledFile(tx, req.FileId) if err != nil { @@ -45,7 +47,7 @@ func (this *FileService) FindEnabledFile(ctx context.Context, req *pb.FindEnable }, nil } -// 创建文件 +// CreateFile 创建文件 func (this *FileService) CreateFile(ctx context.Context, req *pb.CreateFileRequest) (*pb.CreateFileResponse, error) { adminId, userId, err := this.ValidateAdminAndUser(ctx, 0, 0) if err != nil { @@ -61,9 +63,9 @@ func (this *FileService) CreateFile(ctx context.Context, req *pb.CreateFileReque return &pb.CreateFileResponse{FileId: fileId}, nil } -// 将文件置为已完成 +// UpdateFileFinished 将文件置为已完成 func (this *FileService) UpdateFileFinished(ctx context.Context, req *pb.UpdateFileFinishedRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_file_chunk.go b/internal/rpc/services/service_file_chunk.go index b27ce1f3..85d2434b 100644 --- a/internal/rpc/services/service_file_chunk.go +++ b/internal/rpc/services/service_file_chunk.go @@ -15,7 +15,7 @@ type FileChunkService struct { // CreateFileChunk 创建文件片段 func (this *FileChunkService) CreateFileChunk(ctx context.Context, req *pb.CreateFileChunkRequest) (*pb.CreateFileChunkResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_firewall.go b/internal/rpc/services/service_firewall.go index 26ec824e..431fea67 100644 --- a/internal/rpc/services/service_firewall.go +++ b/internal/rpc/services/service_firewall.go @@ -24,7 +24,7 @@ type FirewallService struct { // ComposeFirewallGlobalBoard 组合看板数据 func (this *FirewallService) ComposeFirewallGlobalBoard(ctx context.Context, req *pb.ComposeFirewallGlobalBoardRequest) (*pb.ComposeFirewallGlobalBoardResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -322,7 +322,7 @@ func (this *FirewallService) NotifyHTTPFirewallEvent(ctx context.Context, req *p // CountFirewallDailyBlocks 读取当前Block动作次数 func (this *FirewallService) CountFirewallDailyBlocks(ctx context.Context, req *pb.CountFirewallDailyBlocksRequest) (*pb.CountFirewallDailyBlocksResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_access_log.go b/internal/rpc/services/service_http_access_log.go index 5490b10a..0e7bbe66 100644 --- a/internal/rpc/services/service_http_access_log.go +++ b/internal/rpc/services/service_http_access_log.go @@ -173,7 +173,7 @@ func (this *HTTPAccessLogService) FindHTTPAccessLog(ctx context.Context, req *pb // FindHTTPAccessLogPartitions 查找日志分区 func (this *HTTPAccessLogService) FindHTTPAccessLogPartitions(ctx context.Context, req *pb.FindHTTPAccessLogPartitionsRequest) (*pb.FindHTTPAccessLogPartitionsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_access_log_policy.go b/internal/rpc/services/service_http_access_log_policy.go index c43feb02..b9d4b458 100644 --- a/internal/rpc/services/service_http_access_log_policy.go +++ b/internal/rpc/services/service_http_access_log_policy.go @@ -13,7 +13,7 @@ type HTTPAccessLogPolicyService struct { // CountAllEnabledHTTPAccessLogPolicies 计算访问日志策略数量 func (this *HTTPAccessLogPolicyService) CountAllEnabledHTTPAccessLogPolicies(ctx context.Context, req *pb.CountAllEnabledHTTPAccessLogPoliciesRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -28,7 +28,7 @@ func (this *HTTPAccessLogPolicyService) CountAllEnabledHTTPAccessLogPolicies(ctx // ListEnabledHTTPAccessLogPolicies 列出单页访问日志策略 func (this *HTTPAccessLogPolicyService) ListEnabledHTTPAccessLogPolicies(ctx context.Context, req *pb.ListEnabledHTTPAccessLogPoliciesRequest) (*pb.ListEnabledHTTPAccessLogPoliciesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -56,7 +56,7 @@ func (this *HTTPAccessLogPolicyService) ListEnabledHTTPAccessLogPolicies(ctx con // CreateHTTPAccessLogPolicy 创建访问日志策略 func (this *HTTPAccessLogPolicyService) CreateHTTPAccessLogPolicy(ctx context.Context, req *pb.CreateHTTPAccessLogPolicyRequest) (*pb.CreateHTTPAccessLogPolicyResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -81,7 +81,7 @@ func (this *HTTPAccessLogPolicyService) CreateHTTPAccessLogPolicy(ctx context.Co // UpdateHTTPAccessLogPolicy 修改访问日志策略 func (this *HTTPAccessLogPolicyService) UpdateHTTPAccessLogPolicy(ctx context.Context, req *pb.UpdateHTTPAccessLogPolicyRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -106,7 +106,7 @@ func (this *HTTPAccessLogPolicyService) UpdateHTTPAccessLogPolicy(ctx context.Co // FindEnabledHTTPAccessLogPolicy 查找单个访问日志策略 func (this *HTTPAccessLogPolicyService) FindEnabledHTTPAccessLogPolicy(ctx context.Context, req *pb.FindEnabledHTTPAccessLogPolicyRequest) (*pb.FindEnabledHTTPAccessLogPolicyResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -133,7 +133,7 @@ func (this *HTTPAccessLogPolicyService) FindEnabledHTTPAccessLogPolicy(ctx conte // DeleteHTTPAccessLogPolicy 删除访问日志策略 func (this *HTTPAccessLogPolicyService) DeleteHTTPAccessLogPolicy(ctx context.Context, req *pb.DeleteHTTPAccessLogPolicyRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -148,7 +148,7 @@ func (this *HTTPAccessLogPolicyService) DeleteHTTPAccessLogPolicy(ctx context.Co // WriteHTTPAccessLogPolicy 测试写入某个访问日志策略 func (this *HTTPAccessLogPolicyService) WriteHTTPAccessLogPolicy(ctx context.Context, req *pb.WriteHTTPAccessLogPolicyRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_auth_policy.go b/internal/rpc/services/service_http_auth_policy.go index e2554f8e..0dbd7a45 100644 --- a/internal/rpc/services/service_http_auth_policy.go +++ b/internal/rpc/services/service_http_auth_policy.go @@ -15,7 +15,7 @@ type HTTPAuthPolicyService struct { // CreateHTTPAuthPolicy 创建策略 func (this *HTTPAuthPolicyService) CreateHTTPAuthPolicy(ctx context.Context, req *pb.CreateHTTPAuthPolicyRequest) (*pb.CreateHTTPAuthPolicyResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -30,7 +30,7 @@ func (this *HTTPAuthPolicyService) CreateHTTPAuthPolicy(ctx context.Context, req // UpdateHTTPAuthPolicy 修改策略 func (this *HTTPAuthPolicyService) UpdateHTTPAuthPolicy(ctx context.Context, req *pb.UpdateHTTPAuthPolicyRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -45,7 +45,7 @@ func (this *HTTPAuthPolicyService) UpdateHTTPAuthPolicy(ctx context.Context, req // FindEnabledHTTPAuthPolicy 查找策略信息 func (this *HTTPAuthPolicyService) FindEnabledHTTPAuthPolicy(ctx context.Context, req *pb.FindEnabledHTTPAuthPolicyRequest) (*pb.FindEnabledHTTPAuthPolicyResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_cache_policy.go b/internal/rpc/services/service_http_cache_policy.go index 87eff3ff..062c76d5 100644 --- a/internal/rpc/services/service_http_cache_policy.go +++ b/internal/rpc/services/service_http_cache_policy.go @@ -14,7 +14,7 @@ type HTTPCachePolicyService struct { // FindAllEnabledHTTPCachePolicies 获取所有可用策略 func (this *HTTPCachePolicyService) FindAllEnabledHTTPCachePolicies(ctx context.Context, req *pb.FindAllEnabledHTTPCachePoliciesRequest) (*pb.FindAllEnabledHTTPCachePoliciesResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -39,7 +39,7 @@ func (this *HTTPCachePolicyService) FindAllEnabledHTTPCachePolicies(ctx context. // CreateHTTPCachePolicy 创建缓存策略 func (this *HTTPCachePolicyService) CreateHTTPCachePolicy(ctx context.Context, req *pb.CreateHTTPCachePolicyRequest) (*pb.CreateHTTPCachePolicyResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -56,7 +56,7 @@ func (this *HTTPCachePolicyService) CreateHTTPCachePolicy(ctx context.Context, r // UpdateHTTPCachePolicy 修改缓存策略 func (this *HTTPCachePolicyService) UpdateHTTPCachePolicy(ctx context.Context, req *pb.UpdateHTTPCachePolicyRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -74,7 +74,7 @@ func (this *HTTPCachePolicyService) UpdateHTTPCachePolicy(ctx context.Context, r // DeleteHTTPCachePolicy 删除缓存策略 func (this *HTTPCachePolicyService) DeleteHTTPCachePolicy(ctx context.Context, req *pb.DeleteHTTPCachePolicyRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -92,7 +92,7 @@ func (this *HTTPCachePolicyService) DeleteHTTPCachePolicy(ctx context.Context, r // CountAllEnabledHTTPCachePolicies 计算缓存策略数量 func (this *HTTPCachePolicyService) CountAllEnabledHTTPCachePolicies(ctx context.Context, req *pb.CountAllEnabledHTTPCachePoliciesRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -109,7 +109,7 @@ func (this *HTTPCachePolicyService) CountAllEnabledHTTPCachePolicies(ctx context // ListEnabledHTTPCachePolicies 列出单页的缓存策略 func (this *HTTPCachePolicyService) ListEnabledHTTPCachePolicies(ctx context.Context, req *pb.ListEnabledHTTPCachePoliciesRequest) (*pb.ListEnabledHTTPCachePoliciesResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -147,7 +147,7 @@ func (this *HTTPCachePolicyService) FindEnabledHTTPCachePolicyConfig(ctx context // FindEnabledHTTPCachePolicy 查找单个缓存策略信息 func (this *HTTPCachePolicyService) FindEnabledHTTPCachePolicy(ctx context.Context, req *pb.FindEnabledHTTPCachePolicyRequest) (*pb.FindEnabledHTTPCachePolicyResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -170,7 +170,7 @@ func (this *HTTPCachePolicyService) FindEnabledHTTPCachePolicy(ctx context.Conte // UpdateHTTPCachePolicyRefs 设置缓存策略的默认条件 func (this *HTTPCachePolicyService) UpdateHTTPCachePolicyRefs(ctx context.Context, req *pb.UpdateHTTPCachePolicyRefsRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_cache_task.go b/internal/rpc/services/service_http_cache_task.go index 225afdde..483e03f6 100644 --- a/internal/rpc/services/service_http_cache_task.go +++ b/internal/rpc/services/service_http_cache_task.go @@ -360,7 +360,7 @@ func (this *HTTPCacheTaskService) DeleteHTTPCacheTask(ctx context.Context, req * // ResetHTTPCacheTask 重置任务状态 // 只允许管理员重置,用于调试 func (this *HTTPCacheTaskService) ResetHTTPCacheTask(ctx context.Context, req *pb.ResetHTTPCacheTaskRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_firewall_policy.go b/internal/rpc/services/service_http_firewall_policy.go index 860e227e..c7eeee61 100644 --- a/internal/rpc/services/service_http_firewall_policy.go +++ b/internal/rpc/services/service_http_firewall_policy.go @@ -22,7 +22,7 @@ type HTTPFirewallPolicyService struct { // FindAllEnabledHTTPFirewallPolicies 获取所有可用策略 func (this *HTTPFirewallPolicyService) FindAllEnabledHTTPFirewallPolicies(ctx context.Context, req *pb.FindAllEnabledHTTPFirewallPoliciesRequest) (*pb.FindAllEnabledHTTPFirewallPoliciesResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -168,7 +168,7 @@ func (this *HTTPFirewallPolicyService) CreateEmptyHTTPFirewallPolicy(ctx context // UpdateHTTPFirewallPolicy 修改防火墙策略 func (this *HTTPFirewallPolicyService) UpdateHTTPFirewallPolicy(ctx context.Context, req *pb.UpdateHTTPFirewallPolicyRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -362,7 +362,7 @@ func (this *HTTPFirewallPolicyService) UpdateHTTPFirewallInboundConfig(ctx conte // CountAllEnabledHTTPFirewallPolicies 计算可用的防火墙策略数量 func (this *HTTPFirewallPolicyService) CountAllEnabledHTTPFirewallPolicies(ctx context.Context, req *pb.CountAllEnabledHTTPFirewallPoliciesRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -379,7 +379,7 @@ func (this *HTTPFirewallPolicyService) CountAllEnabledHTTPFirewallPolicies(ctx c // ListEnabledHTTPFirewallPolicies 列出单页的防火墙策略 func (this *HTTPFirewallPolicyService) ListEnabledHTTPFirewallPolicies(ctx context.Context, req *pb.ListEnabledHTTPFirewallPoliciesRequest) (*pb.ListEnabledHTTPFirewallPoliciesResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -411,7 +411,7 @@ func (this *HTTPFirewallPolicyService) ListEnabledHTTPFirewallPolicies(ctx conte // DeleteHTTPFirewallPolicy 删除某个防火墙策略 func (this *HTTPFirewallPolicyService) DeleteHTTPFirewallPolicy(ctx context.Context, req *pb.DeleteHTTPFirewallPolicyRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -499,7 +499,7 @@ func (this *HTTPFirewallPolicyService) FindEnabledHTTPFirewallPolicy(ctx context // ImportHTTPFirewallPolicy 导入策略数据 func (this *HTTPFirewallPolicyService) ImportHTTPFirewallPolicy(ctx context.Context, req *pb.ImportHTTPFirewallPolicyRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -655,7 +655,7 @@ func (this *HTTPFirewallPolicyService) ImportHTTPFirewallPolicy(ctx context.Cont // CheckHTTPFirewallPolicyIPStatus 检查IP状态 func (this *HTTPFirewallPolicyService) CheckHTTPFirewallPolicyIPStatus(ctx context.Context, req *pb.CheckHTTPFirewallPolicyIPStatusRequest) (*pb.CheckHTTPFirewallPolicyIPStatusResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_location.go b/internal/rpc/services/service_http_location.go index ab3a11b7..af4834cc 100644 --- a/internal/rpc/services/service_http_location.go +++ b/internal/rpc/services/service_http_location.go @@ -17,7 +17,7 @@ type HTTPLocationService struct { // CreateHTTPLocation 创建路由规则 func (this *HTTPLocationService) CreateHTTPLocation(ctx context.Context, req *pb.CreateHTTPLocationRequest) (*pb.CreateHTTPLocationResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -35,7 +35,7 @@ func (this *HTTPLocationService) CreateHTTPLocation(ctx context.Context, req *pb // UpdateHTTPLocation 修改路由规则 func (this *HTTPLocationService) UpdateHTTPLocation(ctx context.Context, req *pb.UpdateHTTPLocationRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -53,7 +53,7 @@ func (this *HTTPLocationService) UpdateHTTPLocation(ctx context.Context, req *pb // FindEnabledHTTPLocationConfig 查找路由规则配置 func (this *HTTPLocationService) FindEnabledHTTPLocationConfig(ctx context.Context, req *pb.FindEnabledHTTPLocationConfigRequest) (*pb.FindEnabledHTTPLocationConfigResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -74,7 +74,7 @@ func (this *HTTPLocationService) FindEnabledHTTPLocationConfig(ctx context.Conte // DeleteHTTPLocation 删除路由规则 func (this *HTTPLocationService) DeleteHTTPLocation(ctx context.Context, req *pb.DeleteHTTPLocationRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -183,7 +183,7 @@ func (this *HTTPLocationService) FindAndInitHTTPLocationWebConfig(ctx context.Co // UpdateHTTPLocationReverseProxy 修改反向代理设置 func (this *HTTPLocationService) UpdateHTTPLocationReverseProxy(ctx context.Context, req *pb.UpdateHTTPLocationReverseProxyRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_rewrite_rule.go b/internal/rpc/services/service_http_rewrite_rule.go index 638d43ea..243d316d 100644 --- a/internal/rpc/services/service_http_rewrite_rule.go +++ b/internal/rpc/services/service_http_rewrite_rule.go @@ -15,7 +15,7 @@ type HTTPRewriteRuleService struct { // CreateHTTPRewriteRule 创建重写规则 func (this *HTTPRewriteRuleService) CreateHTTPRewriteRule(ctx context.Context, req *pb.CreateHTTPRewriteRuleRequest) (*pb.CreateHTTPRewriteRuleResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -33,7 +33,7 @@ func (this *HTTPRewriteRuleService) CreateHTTPRewriteRule(ctx context.Context, r // UpdateHTTPRewriteRule 修改重写规则 func (this *HTTPRewriteRuleService) UpdateHTTPRewriteRule(ctx context.Context, req *pb.UpdateHTTPRewriteRuleRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_http_web.go b/internal/rpc/services/service_http_web.go index a312c188..10576cfa 100644 --- a/internal/rpc/services/service_http_web.go +++ b/internal/rpc/services/service_http_web.go @@ -663,7 +663,7 @@ func (this *HTTPWebService) UpdateHTTPWebCommon(ctx context.Context, req *pb.Upd // UpdateHTTPWebRequestLimit 修改请求限制 func (this *HTTPWebService) UpdateHTTPWebRequestLimit(ctx context.Context, req *pb.UpdateHTTPWebRequestLimitRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -686,7 +686,7 @@ func (this *HTTPWebService) UpdateHTTPWebRequestLimit(ctx context.Context, req * // FindHTTPWebRequestLimit 查找请求限制 func (this *HTTPWebService) FindHTTPWebRequestLimit(ctx context.Context, req *pb.FindHTTPWebRequestLimitRequest) (*pb.FindHTTPWebRequestLimitResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -707,7 +707,7 @@ func (this *HTTPWebService) FindHTTPWebRequestLimit(ctx context.Context, req *pb // UpdateHTTPWebRequestScripts 修改请求脚本 func (this *HTTPWebService) UpdateHTTPWebRequestScripts(ctx context.Context, req *pb.UpdateHTTPWebRequestScriptsRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -729,7 +729,7 @@ func (this *HTTPWebService) UpdateHTTPWebRequestScripts(ctx context.Context, req // FindHTTPWebRequestScripts 查找请求脚本 func (this *HTTPWebService) FindHTTPWebRequestScripts(ctx context.Context, req *pb.FindHTTPWebRequestScriptsRequest) (*pb.FindHTTPWebRequestScriptsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_ip_item.go b/internal/rpc/services/service_ip_item.go index e9f6e982..81c75a57 100644 --- a/internal/rpc/services/service_ip_item.go +++ b/internal/rpc/services/service_ip_item.go @@ -157,7 +157,7 @@ func (this *IPItemService) DeleteIPItem(ctx context.Context, req *pb.DeleteIPIte // DeleteIPItems 批量删除IP func (this *IPItemService) DeleteIPItems(ctx context.Context, req *pb.DeleteIPItemsRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -413,7 +413,7 @@ func (this *IPItemService) ListIPItemsAfterVersion(ctx context.Context, req *pb. // CheckIPItemStatus 检查IP状态 func (this *IPItemService) CheckIPItemStatus(ctx context.Context, req *pb.CheckIPItemStatusRequest) (*pb.CheckIPItemStatusResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -478,7 +478,7 @@ func (this *IPItemService) CheckIPItemStatus(ctx context.Context, req *pb.CheckI // ExistsEnabledIPItem 检查IP是否存在 func (this *IPItemService) ExistsEnabledIPItem(ctx context.Context, req *pb.ExistsEnabledIPItemRequest) (*pb.ExistsEnabledIPItemResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -493,7 +493,7 @@ func (this *IPItemService) ExistsEnabledIPItem(ctx context.Context, req *pb.Exis // CountAllEnabledIPItems 计算所有IP数量 func (this *IPItemService) CountAllEnabledIPItems(ctx context.Context, req *pb.CountAllEnabledIPItemsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -512,7 +512,7 @@ func (this *IPItemService) CountAllEnabledIPItems(ctx context.Context, req *pb.C // ListAllEnabledIPItems 搜索IP func (this *IPItemService) ListAllEnabledIPItems(ctx context.Context, req *pb.ListAllEnabledIPItemsRequest) (*pb.ListAllEnabledIPItemsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -697,7 +697,7 @@ func (this *IPItemService) ListAllEnabledIPItems(ctx context.Context, req *pb.Li // UpdateIPItemsRead 设置所有为已读 func (this *IPItemService) UpdateIPItemsRead(ctx context.Context, req *pb.UpdateIPItemsReadRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_ip_library.go b/internal/rpc/services/service_ip_library.go index 378abc1d..0c6d33ab 100644 --- a/internal/rpc/services/service_ip_library.go +++ b/internal/rpc/services/service_ip_library.go @@ -161,7 +161,7 @@ func (this *IPLibraryService) FindAllEnabledIPLibrariesWithType(ctx context.Cont // DeleteIPLibrary 删除IP库 func (this *IPLibraryService) DeleteIPLibrary(ctx context.Context, req *pb.DeleteIPLibraryRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_ip_list.go b/internal/rpc/services/service_ip_list.go index f5100782..2e449ad1 100644 --- a/internal/rpc/services/service_ip_list.go +++ b/internal/rpc/services/service_ip_list.go @@ -44,7 +44,7 @@ func (this *IPListService) CreateIPList(ctx context.Context, req *pb.CreateIPLis // UpdateIPList 修改IP列表 func (this *IPListService) UpdateIPList(ctx context.Context, req *pb.UpdateIPListRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -95,7 +95,7 @@ func (this *IPListService) FindEnabledIPList(ctx context.Context, req *pb.FindEn // CountAllEnabledIPLists 计算名单数量 func (this *IPListService) CountAllEnabledIPLists(ctx context.Context, req *pb.CountAllEnabledIPListsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -110,7 +110,7 @@ func (this *IPListService) CountAllEnabledIPLists(ctx context.Context, req *pb.C // ListEnabledIPLists 列出单页名单 func (this *IPListService) ListEnabledIPLists(ctx context.Context, req *pb.ListEnabledIPListsRequest) (*pb.ListEnabledIPListsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -139,7 +139,7 @@ func (this *IPListService) ListEnabledIPLists(ctx context.Context, req *pb.ListE // DeleteIPList 删除IP名单 func (this *IPListService) DeleteIPList(ctx context.Context, req *pb.DeleteIPListRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -161,7 +161,7 @@ func (this *IPListService) DeleteIPList(ctx context.Context, req *pb.DeleteIPLis // ExistsEnabledIPList 检查IPList是否存在 func (this *IPListService) ExistsEnabledIPList(ctx context.Context, req *pb.ExistsEnabledIPListRequest) (*pb.ExistsEnabledIPListResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -176,7 +176,7 @@ func (this *IPListService) ExistsEnabledIPList(ctx context.Context, req *pb.Exis // FindEnabledIPListContainsIP 根据IP来搜索IP名单 func (this *IPListService) FindEnabledIPListContainsIP(ctx context.Context, req *pb.FindEnabledIPListContainsIPRequest) (*pb.FindEnabledIPListContainsIPResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_latest_item.go b/internal/rpc/services/service_latest_item.go index 75d31273..6995068c 100644 --- a/internal/rpc/services/service_latest_item.go +++ b/internal/rpc/services/service_latest_item.go @@ -15,7 +15,7 @@ type LatestItemService struct { // IncreaseLatestItem 记录最近使用的条目 func (this *LatestItemService) IncreaseLatestItem(ctx context.Context, req *pb.IncreaseLatestItemRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_log.go b/internal/rpc/services/service_log.go index 2dbbe3a2..386aa4ea 100644 --- a/internal/rpc/services/service_log.go +++ b/internal/rpc/services/service_log.go @@ -32,7 +32,7 @@ func (this *LogService) CreateLog(ctx context.Context, req *pb.CreateLogRequest) // CountLogs 计算日志数量 func (this *LogService) CountLogs(ctx context.Context, req *pb.CountLogRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -49,7 +49,7 @@ func (this *LogService) CountLogs(ctx context.Context, req *pb.CountLogRequest) // ListLogs 列出单页日志 func (this *LogService) ListLogs(ctx context.Context, req *pb.ListLogsRequest) (*pb.ListLogsResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -96,7 +96,7 @@ func (this *LogService) ListLogs(ctx context.Context, req *pb.ListLogsRequest) ( // DeleteLogPermanently 删除单条 func (this *LogService) DeleteLogPermanently(ctx context.Context, req *pb.DeleteLogPermanentlyRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -116,7 +116,7 @@ func (this *LogService) DeleteLogPermanently(ctx context.Context, req *pb.Delete // DeleteLogsPermanently 批量删除 func (this *LogService) DeleteLogsPermanently(ctx context.Context, req *pb.DeleteLogsPermanentlyRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -138,7 +138,7 @@ func (this *LogService) DeleteLogsPermanently(ctx context.Context, req *pb.Delet // CleanLogsPermanently 清理日志 func (this *LogService) CleanLogsPermanently(ctx context.Context, req *pb.CleanLogsPermanentlyRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -164,7 +164,7 @@ func (this *LogService) CleanLogsPermanently(ctx context.Context, req *pb.CleanL // SumLogsSize 计算日志容量大小 func (this *LogService) SumLogsSize(ctx context.Context, req *pb.SumLogsSizeRequest) (*pb.SumLogsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_login.go b/internal/rpc/services/service_login.go index 67145d1b..080eeffd 100644 --- a/internal/rpc/services/service_login.go +++ b/internal/rpc/services/service_login.go @@ -16,7 +16,7 @@ type LoginService struct { // FindEnabledLogin 查找认证 func (this *LoginService) FindEnabledLogin(ctx context.Context, req *pb.FindEnabledLoginRequest) (*pb.FindEnabledLoginResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -42,7 +42,7 @@ func (this *LoginService) FindEnabledLogin(ctx context.Context, req *pb.FindEnab // UpdateLogin 修改认证 func (this *LoginService) UpdateLogin(ctx context.Context, req *pb.UpdateLoginRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_message_media.go b/internal/rpc/services/service_message_media.go index 980302ad..d3df4664 100644 --- a/internal/rpc/services/service_message_media.go +++ b/internal/rpc/services/service_message_media.go @@ -14,7 +14,7 @@ type MessageMediaService struct { // FindAllMessageMedias 获取所有支持的媒介 func (this *MessageMediaService) FindAllMessageMedias(ctx context.Context, req *pb.FindAllMessageMediasRequest) (*pb.FindAllMessageMediasResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_message_media_instance.go b/internal/rpc/services/service_message_media_instance.go index 3e570507..b3178a56 100644 --- a/internal/rpc/services/service_message_media_instance.go +++ b/internal/rpc/services/service_message_media_instance.go @@ -17,7 +17,7 @@ type MessageMediaInstanceService struct { // CreateMessageMediaInstance 创建消息媒介实例 func (this *MessageMediaInstanceService) CreateMessageMediaInstance(ctx context.Context, req *pb.CreateMessageMediaInstanceRequest) (*pb.CreateMessageMediaInstanceResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -42,7 +42,7 @@ func (this *MessageMediaInstanceService) CreateMessageMediaInstance(ctx context. // UpdateMessageMediaInstance 修改消息实例 func (this *MessageMediaInstanceService) UpdateMessageMediaInstance(ctx context.Context, req *pb.UpdateMessageMediaInstanceRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -66,7 +66,7 @@ func (this *MessageMediaInstanceService) UpdateMessageMediaInstance(ctx context. // DeleteMessageMediaInstance 删除媒介实例 func (this *MessageMediaInstanceService) DeleteMessageMediaInstance(ctx context.Context, req *pb.DeleteMessageMediaInstanceRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -81,7 +81,7 @@ func (this *MessageMediaInstanceService) DeleteMessageMediaInstance(ctx context. // CountAllEnabledMessageMediaInstances 计算媒介实例数量 func (this *MessageMediaInstanceService) CountAllEnabledMessageMediaInstances(ctx context.Context, req *pb.CountAllEnabledMessageMediaInstancesRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -97,7 +97,7 @@ func (this *MessageMediaInstanceService) CountAllEnabledMessageMediaInstances(ct // ListEnabledMessageMediaInstances 列出单页媒介实例 func (this *MessageMediaInstanceService) ListEnabledMessageMediaInstances(ctx context.Context, req *pb.ListEnabledMessageMediaInstancesRequest) (*pb.ListEnabledMessageMediaInstancesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -142,7 +142,7 @@ func (this *MessageMediaInstanceService) ListEnabledMessageMediaInstances(ctx co // FindEnabledMessageMediaInstance 查找单个媒介实例信息 func (this *MessageMediaInstanceService) FindEnabledMessageMediaInstance(ctx context.Context, req *pb.FindEnabledMessageMediaInstanceRequest) (*pb.FindEnabledMessageMediaInstanceResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_message_receiver.go b/internal/rpc/services/service_message_receiver.go index ce9122f6..a7a90812 100644 --- a/internal/rpc/services/service_message_receiver.go +++ b/internal/rpc/services/service_message_receiver.go @@ -18,7 +18,7 @@ type MessageReceiverService struct { // UpdateMessageReceivers 创建接收者 func (this *MessageReceiverService) UpdateMessageReceivers(ctx context.Context, req *pb.UpdateMessageReceiversRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -60,7 +60,7 @@ func (this *MessageReceiverService) UpdateMessageReceivers(ctx context.Context, // FindAllEnabledMessageReceivers 查找接收者 func (this *MessageReceiverService) FindAllEnabledMessageReceivers(ctx context.Context, req *pb.FindAllEnabledMessageReceiversRequest) (*pb.FindAllEnabledMessageReceiversResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -160,7 +160,7 @@ func (this *MessageReceiverService) FindAllEnabledMessageReceivers(ctx context.C // DeleteMessageReceiver 删除接收者 func (this *MessageReceiverService) DeleteMessageReceiver(ctx context.Context, req *pb.DeleteMessageReceiverRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -175,7 +175,7 @@ func (this *MessageReceiverService) DeleteMessageReceiver(ctx context.Context, r // CountAllEnabledMessageReceivers 计算接收者数量 func (this *MessageReceiverService) CountAllEnabledMessageReceivers(ctx context.Context, req *pb.CountAllEnabledMessageReceiversRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_message_recipient.go b/internal/rpc/services/service_message_recipient.go index 40c932c6..61fdbc69 100644 --- a/internal/rpc/services/service_message_recipient.go +++ b/internal/rpc/services/service_message_recipient.go @@ -14,7 +14,7 @@ type MessageRecipientService struct { // CreateMessageRecipient 创建接收人 func (this *MessageRecipientService) CreateMessageRecipient(ctx context.Context, req *pb.CreateMessageRecipientRequest) (*pb.CreateMessageRecipientResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -30,7 +30,7 @@ func (this *MessageRecipientService) CreateMessageRecipient(ctx context.Context, // UpdateMessageRecipient 修改接收人 func (this *MessageRecipientService) UpdateMessageRecipient(ctx context.Context, req *pb.UpdateMessageRecipientRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -46,7 +46,7 @@ func (this *MessageRecipientService) UpdateMessageRecipient(ctx context.Context, // DeleteMessageRecipient 删除接收人 func (this *MessageRecipientService) DeleteMessageRecipient(ctx context.Context, req *pb.DeleteMessageRecipientRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -61,7 +61,7 @@ func (this *MessageRecipientService) DeleteMessageRecipient(ctx context.Context, // CountAllEnabledMessageRecipients 计算接收人数量 func (this *MessageRecipientService) CountAllEnabledMessageRecipients(ctx context.Context, req *pb.CountAllEnabledMessageRecipientsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -77,7 +77,7 @@ func (this *MessageRecipientService) CountAllEnabledMessageRecipients(ctx contex // ListEnabledMessageRecipients 列出单页接收人 func (this *MessageRecipientService) ListEnabledMessageRecipients(ctx context.Context, req *pb.ListEnabledMessageRecipientsRequest) (*pb.ListEnabledMessageRecipientsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -157,7 +157,7 @@ func (this *MessageRecipientService) ListEnabledMessageRecipients(ctx context.Co // FindEnabledMessageRecipient 查找单个接收人信息 func (this *MessageRecipientService) FindEnabledMessageRecipient(ctx context.Context, req *pb.FindEnabledMessageRecipientRequest) (*pb.FindEnabledMessageRecipientResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_message_recipient_group.go b/internal/rpc/services/service_message_recipient_group.go index ebd47c94..e90cf0de 100644 --- a/internal/rpc/services/service_message_recipient_group.go +++ b/internal/rpc/services/service_message_recipient_group.go @@ -13,7 +13,7 @@ type MessageRecipientGroupService struct { // 创建分组 func (this *MessageRecipientGroupService) CreateMessageRecipientGroup(ctx context.Context, req *pb.CreateMessageRecipientGroupRequest) (*pb.CreateMessageRecipientGroupResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -29,7 +29,7 @@ func (this *MessageRecipientGroupService) CreateMessageRecipientGroup(ctx contex // 修改分组 func (this *MessageRecipientGroupService) UpdateMessageRecipientGroup(ctx context.Context, req *pb.UpdateMessageRecipientGroupRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -45,7 +45,7 @@ func (this *MessageRecipientGroupService) UpdateMessageRecipientGroup(ctx contex // 查找所有可用的分组 func (this *MessageRecipientGroupService) FindAllEnabledMessageRecipientGroups(ctx context.Context, req *pb.FindAllEnabledMessageRecipientGroupsRequest) (*pb.FindAllEnabledMessageRecipientGroupsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -69,7 +69,7 @@ func (this *MessageRecipientGroupService) FindAllEnabledMessageRecipientGroups(c // 删除分组 func (this *MessageRecipientGroupService) DeleteMessageRecipientGroup(ctx context.Context, req *pb.DeleteMessageRecipientGroupRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -84,7 +84,7 @@ func (this *MessageRecipientGroupService) DeleteMessageRecipientGroup(ctx contex // 查找单个分组信息 func (this *MessageRecipientGroupService) FindEnabledMessageRecipientGroup(ctx context.Context, req *pb.FindEnabledMessageRecipientGroupRequest) (*pb.FindEnabledMessageRecipientGroupResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_message_task.go b/internal/rpc/services/service_message_task.go index 785dcf8b..c623b948 100644 --- a/internal/rpc/services/service_message_task.go +++ b/internal/rpc/services/service_message_task.go @@ -17,7 +17,7 @@ type MessageTaskService struct { // CreateMessageTask 创建任务 func (this *MessageTaskService) CreateMessageTask(ctx context.Context, req *pb.CreateMessageTaskRequest) (*pb.CreateMessageTaskResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -165,7 +165,7 @@ func (this *MessageTaskService) UpdateMessageTaskStatus(ctx context.Context, req // DeleteMessageTask 删除消息任务 func (this *MessageTaskService) DeleteMessageTask(ctx context.Context, req *pb.DeleteMessageTaskRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -181,7 +181,7 @@ func (this *MessageTaskService) DeleteMessageTask(ctx context.Context, req *pb.D // FindEnabledMessageTask 读取消息任务状态 func (this *MessageTaskService) FindEnabledMessageTask(ctx context.Context, req *pb.FindEnabledMessageTaskRequest) (*pb.FindEnabledMessageTaskResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -284,7 +284,7 @@ func (this *MessageTaskService) FindEnabledMessageTask(ctx context.Context, req // CountMessageTasksWithStatus 计算某个状态的消息任务数量 func (this *MessageTaskService) CountMessageTasksWithStatus(ctx context.Context, req *pb.CountMessageTasksWithStatusRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -300,7 +300,7 @@ func (this *MessageTaskService) CountMessageTasksWithStatus(ctx context.Context, // ListMessageTasksWithStatus 根据状态列出某页任务 func (this *MessageTaskService) ListMessageTasksWithStatus(ctx context.Context, req *pb.ListMessageTasksWithStatusRequest) (*pb.ListMessageTasksWithStatusResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_message_task_log.go b/internal/rpc/services/service_message_task_log.go index 0956ed56..897e4400 100644 --- a/internal/rpc/services/service_message_task_log.go +++ b/internal/rpc/services/service_message_task_log.go @@ -14,7 +14,7 @@ type MessageTaskLogService struct { // CountMessageTaskLogs 计算日志数量 func (this *MessageTaskLogService) CountMessageTaskLogs(ctx context.Context, req *pb.CountMessageTaskLogsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -28,7 +28,7 @@ func (this *MessageTaskLogService) CountMessageTaskLogs(ctx context.Context, req // ListMessageTaskLogs 列出当页日志 func (this *MessageTaskLogService) ListMessageTaskLogs(ctx context.Context, req *pb.ListMessageTaskLogsRequest) (*pb.ListMessageTaskLogsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_metric_chart.go b/internal/rpc/services/service_metric_chart.go index 1f0ce16c..28bd19e9 100644 --- a/internal/rpc/services/service_metric_chart.go +++ b/internal/rpc/services/service_metric_chart.go @@ -18,7 +18,7 @@ type MetricChartService struct { // CreateMetricChart 创建图表 func (this *MetricChartService) CreateMetricChart(ctx context.Context, req *pb.CreateMetricChartRequest) (*pb.CreateMetricChartResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -40,7 +40,7 @@ func (this *MetricChartService) CreateMetricChart(ctx context.Context, req *pb.C // UpdateMetricChart 修改图表 func (this *MetricChartService) UpdateMetricChart(ctx context.Context, req *pb.UpdateMetricChartRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -62,7 +62,7 @@ func (this *MetricChartService) UpdateMetricChart(ctx context.Context, req *pb.U // FindEnabledMetricChart 查找单个图表 func (this *MetricChartService) FindEnabledMetricChart(ctx context.Context, req *pb.FindEnabledMetricChartRequest) (*pb.FindEnabledMetricChartResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -93,7 +93,7 @@ func (this *MetricChartService) FindEnabledMetricChart(ctx context.Context, req // CountEnabledMetricCharts 计算图表数量 func (this *MetricChartService) CountEnabledMetricCharts(ctx context.Context, req *pb.CountEnabledMetricChartsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -108,7 +108,7 @@ func (this *MetricChartService) CountEnabledMetricCharts(ctx context.Context, re // ListEnabledMetricCharts 列出单页图表 func (this *MetricChartService) ListEnabledMetricCharts(ctx context.Context, req *pb.ListEnabledMetricChartsRequest) (*pb.ListEnabledMetricChartsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -137,7 +137,7 @@ func (this *MetricChartService) ListEnabledMetricCharts(ctx context.Context, req // DeleteMetricChart 删除图表 func (this *MetricChartService) DeleteMetricChart(ctx context.Context, req *pb.DeleteMetricChartRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_metric_item.go b/internal/rpc/services/service_metric_item.go index df6d171a..fadff622 100644 --- a/internal/rpc/services/service_metric_item.go +++ b/internal/rpc/services/service_metric_item.go @@ -16,7 +16,7 @@ type MetricItemService struct { // CreateMetricItem 创建指标 func (this *MetricItemService) CreateMetricItem(ctx context.Context, req *pb.CreateMetricItemRequest) (*pb.CreateMetricItemResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -31,7 +31,7 @@ func (this *MetricItemService) CreateMetricItem(ctx context.Context, req *pb.Cre // UpdateMetricItem 修改指标 func (this *MetricItemService) UpdateMetricItem(ctx context.Context, req *pb.UpdateMetricItemRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -46,7 +46,7 @@ func (this *MetricItemService) UpdateMetricItem(ctx context.Context, req *pb.Upd // FindEnabledMetricItem 查找单个指标信息 func (this *MetricItemService) FindEnabledMetricItem(ctx context.Context, req *pb.FindEnabledMetricItemRequest) (*pb.FindEnabledMetricItemResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -76,7 +76,7 @@ func (this *MetricItemService) FindEnabledMetricItem(ctx context.Context, req *p // CountAllEnabledMetricItems 计算指标数量 func (this *MetricItemService) CountAllEnabledMetricItems(ctx context.Context, req *pb.CountAllEnabledMetricItemsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -91,7 +91,7 @@ func (this *MetricItemService) CountAllEnabledMetricItems(ctx context.Context, r // ListEnabledMetricItems 列出单页指标 func (this *MetricItemService) ListEnabledMetricItems(ctx context.Context, req *pb.ListEnabledMetricItemsRequest) (*pb.ListEnabledMetricItemsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -123,7 +123,7 @@ func (this *MetricItemService) ListEnabledMetricItems(ctx context.Context, req * // DeleteMetricItem 删除指标 func (this *MetricItemService) DeleteMetricItem(ctx context.Context, req *pb.DeleteMetricItemRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_metric_stat.go b/internal/rpc/services/service_metric_stat.go index d2e1be27..2e998a4f 100644 --- a/internal/rpc/services/service_metric_stat.go +++ b/internal/rpc/services/service_metric_stat.go @@ -116,7 +116,7 @@ func (this *MetricStatService) UploadMetricStats(ctx context.Context, req *pb.Up // CountMetricStats 计算指标数据数量 func (this *MetricStatService) CountMetricStats(ctx context.Context, req *pb.CountMetricStatsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -134,7 +134,7 @@ func (this *MetricStatService) CountMetricStats(ctx context.Context, req *pb.Cou // ListMetricStats 读取单页指标数据 func (this *MetricStatService) ListMetricStats(ctx context.Context, req *pb.ListMetricStatsRequest) (*pb.ListMetricStatsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_monitor_node.go b/internal/rpc/services/service_monitor_node.go index 0420f41e..935ce151 100644 --- a/internal/rpc/services/service_monitor_node.go +++ b/internal/rpc/services/service_monitor_node.go @@ -15,7 +15,7 @@ type MonitorNodeService struct { // CreateMonitorNode 创建监控节点 func (this *MonitorNodeService) CreateMonitorNode(ctx context.Context, req *pb.CreateMonitorNodeRequest) (*pb.CreateMonitorNodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -32,7 +32,7 @@ func (this *MonitorNodeService) CreateMonitorNode(ctx context.Context, req *pb.C // UpdateMonitorNode 修改监控节点 func (this *MonitorNodeService) UpdateMonitorNode(ctx context.Context, req *pb.UpdateMonitorNodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -49,7 +49,7 @@ func (this *MonitorNodeService) UpdateMonitorNode(ctx context.Context, req *pb.U // DeleteMonitorNode 删除监控节点 func (this *MonitorNodeService) DeleteMonitorNode(ctx context.Context, req *pb.DeleteMonitorNodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -66,7 +66,7 @@ func (this *MonitorNodeService) DeleteMonitorNode(ctx context.Context, req *pb.D // FindAllEnabledMonitorNodes 列出所有可用监控节点 func (this *MonitorNodeService) FindAllEnabledMonitorNodes(ctx context.Context, req *pb.FindAllEnabledMonitorNodesRequest) (*pb.FindAllEnabledMonitorNodesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -95,7 +95,7 @@ func (this *MonitorNodeService) FindAllEnabledMonitorNodes(ctx context.Context, // CountAllEnabledMonitorNodes 计算监控节点数量 func (this *MonitorNodeService) CountAllEnabledMonitorNodes(ctx context.Context, req *pb.CountAllEnabledMonitorNodesRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -112,7 +112,7 @@ func (this *MonitorNodeService) CountAllEnabledMonitorNodes(ctx context.Context, // ListEnabledMonitorNodes 列出单页的监控节点 func (this *MonitorNodeService) ListEnabledMonitorNodes(ctx context.Context, req *pb.ListEnabledMonitorNodesRequest) (*pb.ListEnabledMonitorNodesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -142,7 +142,7 @@ func (this *MonitorNodeService) ListEnabledMonitorNodes(ctx context.Context, req // FindEnabledMonitorNode 根据ID查找节点 func (this *MonitorNodeService) FindEnabledMonitorNode(ctx context.Context, req *pb.FindEnabledMonitorNodeRequest) (*pb.FindEnabledMonitorNodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node.go b/internal/rpc/services/service_node.go index 7128484b..3b511e40 100644 --- a/internal/rpc/services/service_node.go +++ b/internal/rpc/services/service_node.go @@ -47,7 +47,7 @@ type NodeService struct { // CreateNode 创建节点 func (this *NodeService) CreateNode(ctx context.Context, req *pb.CreateNodeRequest) (*pb.CreateNodeResponse, error) { - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -143,7 +143,7 @@ func (this *NodeService) RegisterClusterNode(ctx context.Context, req *pb.Regist // CountAllEnabledNodes 计算节点数量 func (this *NodeService) CountAllEnabledNodes(ctx context.Context, req *pb.CountAllEnabledNodesRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -160,7 +160,7 @@ func (this *NodeService) CountAllEnabledNodes(ctx context.Context, req *pb.Count // CountAllEnabledNodesMatch 计算匹配的节点数量 func (this *NodeService) CountAllEnabledNodesMatch(ctx context.Context, req *pb.CountAllEnabledNodesMatchRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -176,7 +176,7 @@ func (this *NodeService) CountAllEnabledNodesMatch(ctx context.Context, req *pb. // ListEnabledNodesMatch 列出单页的节点 func (this *NodeService) ListEnabledNodesMatch(ctx context.Context, req *pb.ListEnabledNodesMatchRequest) (*pb.ListEnabledNodesMatchResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -429,7 +429,7 @@ func (this *NodeService) FindAllEnabledNodesWithNodeClusterId(ctx context.Contex // DeleteNode 删除节点 func (this *NodeService) DeleteNode(ctx context.Context, req *pb.DeleteNodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -452,7 +452,7 @@ func (this *NodeService) DeleteNode(ctx context.Context, req *pb.DeleteNodeReque // DeleteNodeFromNodeCluster 从集群中删除节点 func (this *NodeService) DeleteNodeFromNodeCluster(ctx context.Context, req *pb.DeleteNodeFromNodeClusterRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -468,7 +468,7 @@ func (this *NodeService) DeleteNodeFromNodeCluster(ctx context.Context, req *pb. // UpdateNode 修改节点 func (this *NodeService) UpdateNode(ctx context.Context, req *pb.UpdateNodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -485,7 +485,7 @@ func (this *NodeService) UpdateNode(ctx context.Context, req *pb.UpdateNodeReque // FindEnabledNode 查询单个节点信息 func (this *NodeService) FindEnabledNode(ctx context.Context, req *pb.FindEnabledNodeRequest) (*pb.FindEnabledNodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -679,7 +679,7 @@ func (this *NodeService) FindEnabledNode(ctx context.Context, req *pb.FindEnable // FindEnabledBasicNode 获取单个节点基本信息 func (this *NodeService) FindEnabledBasicNode(ctx context.Context, req *pb.FindEnabledBasicNodeRequest) (*pb.FindEnabledBasicNodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -808,7 +808,7 @@ func (this *NodeService) UpdateNodeStatus(ctx context.Context, req *pb.UpdateNod // UpdateNodeIsInstalled 修改节点安装状态 func (this *NodeService) UpdateNodeIsInstalled(ctx context.Context, req *pb.UpdateNodeIsInstalledRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -826,7 +826,7 @@ func (this *NodeService) UpdateNodeIsInstalled(ctx context.Context, req *pb.Upda // InstallNode 安装节点 func (this *NodeService) InstallNode(ctx context.Context, req *pb.InstallNodeRequest) (*pb.InstallNodeResponse, error) { // 校验节点 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -844,7 +844,7 @@ func (this *NodeService) InstallNode(ctx context.Context, req *pb.InstallNodeReq // UpgradeNode 升级节点 func (this *NodeService) UpgradeNode(ctx context.Context, req *pb.UpgradeNodeRequest) (*pb.UpgradeNodeResponse, error) { // 校验节点 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -884,7 +884,7 @@ func (this *NodeService) UpgradeNode(ctx context.Context, req *pb.UpgradeNodeReq // StartNode 启动节点 func (this *NodeService) StartNode(ctx context.Context, req *pb.StartNodeRequest) (*pb.StartNodeResponse, error) { // 校验节点 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -903,7 +903,7 @@ func (this *NodeService) StartNode(ctx context.Context, req *pb.StartNodeRequest // StopNode 停止节点 func (this *NodeService) StopNode(ctx context.Context, req *pb.StopNodeRequest) (*pb.StopNodeResponse, error) { // 校验节点 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -940,7 +940,7 @@ func (this *NodeService) UpdateNodeConnectedAPINodes(ctx context.Context, req *p // CountAllEnabledNodesWithNodeGrantId 计算使用某个认证的节点数量 func (this *NodeService) CountAllEnabledNodesWithNodeGrantId(ctx context.Context, req *pb.CountAllEnabledNodesWithNodeGrantIdRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -957,7 +957,7 @@ func (this *NodeService) CountAllEnabledNodesWithNodeGrantId(ctx context.Context // FindAllEnabledNodesWithNodeGrantId 查找使用某个认证的所有节点 func (this *NodeService) FindAllEnabledNodesWithNodeGrantId(ctx context.Context, req *pb.FindAllEnabledNodesWithNodeGrantIdRequest) (*pb.FindAllEnabledNodesWithNodeGrantIdResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -996,7 +996,7 @@ func (this *NodeService) FindAllEnabledNodesWithNodeGrantId(ctx context.Context, // CountAllNotInstalledNodesWithNodeClusterId 计算没有安装的节点数量 func (this *NodeService) CountAllNotInstalledNodesWithNodeClusterId(ctx context.Context, req *pb.CountAllNotInstalledNodesWithNodeClusterIdRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1010,7 +1010,7 @@ func (this *NodeService) CountAllNotInstalledNodesWithNodeClusterId(ctx context. // FindAllNotInstalledNodesWithNodeClusterId 列出所有未安装的节点 func (this *NodeService) FindAllNotInstalledNodesWithNodeClusterId(ctx context.Context, req *pb.FindAllNotInstalledNodesWithNodeClusterIdRequest) (*pb.FindAllNotInstalledNodesWithNodeClusterIdResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1093,7 +1093,7 @@ func (this *NodeService) FindAllNotInstalledNodesWithNodeClusterId(ctx context.C // CountAllUpgradeNodesWithNodeClusterId 计算需要升级的节点数量 func (this *NodeService) CountAllUpgradeNodesWithNodeClusterId(ctx context.Context, req *pb.CountAllUpgradeNodesWithNodeClusterIdRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1116,7 +1116,7 @@ func (this *NodeService) CountAllUpgradeNodesWithNodeClusterId(ctx context.Conte // FindAllUpgradeNodesWithNodeClusterId 列出所有需要升级的节点 func (this *NodeService) FindAllUpgradeNodesWithNodeClusterId(ctx context.Context, req *pb.FindAllUpgradeNodesWithNodeClusterIdRequest) (*pb.FindAllUpgradeNodesWithNodeClusterIdResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1222,7 +1222,7 @@ func (this *NodeService) FindAllUpgradeNodesWithNodeClusterId(ctx context.Contex // FindNodeInstallStatus 读取节点安装状态 func (this *NodeService) FindNodeInstallStatus(ctx context.Context, req *pb.FindNodeInstallStatusRequest) (*pb.FindNodeInstallStatusResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1251,7 +1251,7 @@ func (this *NodeService) FindNodeInstallStatus(ctx context.Context, req *pb.Find // UpdateNodeLogin 修改节点登录信息 func (this *NodeService) UpdateNodeLogin(ctx context.Context, req *pb.UpdateNodeLoginRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1273,7 +1273,7 @@ func (this *NodeService) UpdateNodeLogin(ctx context.Context, req *pb.UpdateNode // CountAllEnabledNodesWithNodeGroupId 计算某个节点分组内的节点数量 func (this *NodeService) CountAllEnabledNodesWithNodeGroupId(ctx context.Context, req *pb.CountAllEnabledNodesWithNodeGroupIdRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1290,7 +1290,7 @@ func (this *NodeService) CountAllEnabledNodesWithNodeGroupId(ctx context.Context // FindAllEnabledNodesDNSWithNodeClusterId 取得某个集群下的所有节点 func (this *NodeService) FindAllEnabledNodesDNSWithNodeClusterId(ctx context.Context, req *pb.FindAllEnabledNodesDNSWithNodeClusterIdRequest) (*pb.FindAllEnabledNodesDNSWithNodeClusterIdResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1363,7 +1363,7 @@ func (this *NodeService) FindAllEnabledNodesDNSWithNodeClusterId(ctx context.Con // FindEnabledNodeDNS 查找单个节点的域名解析信息 func (this *NodeService) FindEnabledNodeDNS(ctx context.Context, req *pb.FindEnabledNodeDNSRequest) (*pb.FindEnabledNodeDNSResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1439,7 +1439,7 @@ func (this *NodeService) FindEnabledNodeDNS(ctx context.Context, req *pb.FindEna // UpdateNodeDNS 修改节点的DNS解析信息 func (this *NodeService) UpdateNodeDNS(ctx context.Context, req *pb.UpdateNodeDNSRequest) (*pb.RPCSuccess, error) { // 校验请求 - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1522,7 +1522,7 @@ func (this *NodeService) UpdateNodeDNS(ctx context.Context, req *pb.UpdateNodeDN // CountAllEnabledNodesWithNodeRegionId 计算某个区域下的节点数量 func (this *NodeService) CountAllEnabledNodesWithNodeRegionId(ctx context.Context, req *pb.CountAllEnabledNodesWithNodeRegionIdRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1538,7 +1538,7 @@ func (this *NodeService) CountAllEnabledNodesWithNodeRegionId(ctx context.Contex // FindEnabledNodesWithIds 根据一组ID获取节点信息 func (this *NodeService) FindEnabledNodesWithIds(ctx context.Context, req *pb.FindEnabledNodesWithIdsRequest) (*pb.FindEnabledNodesWithIdsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1567,7 +1567,7 @@ func (this *NodeService) FindEnabledNodesWithIds(ctx context.Context, req *pb.Fi // CheckNodeLatestVersion 检查新版本 func (this *NodeService) CheckNodeLatestVersion(ctx context.Context, req *pb.CheckNodeLatestVersionRequest) (*pb.CheckNodeLatestVersionResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1586,7 +1586,7 @@ func (this *NodeService) CheckNodeLatestVersion(ctx context.Context, req *pb.Che // UpdateNodeUp 设置节点上线状态 func (this *NodeService) UpdateNodeUp(ctx context.Context, req *pb.UpdateNodeUpRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1636,7 +1636,7 @@ func (this *NodeService) DownloadNodeInstallationFile(ctx context.Context, req * // UpdateNodeSystem 修改节点系统信息 func (this *NodeService) UpdateNodeSystem(ctx context.Context, req *pb.UpdateNodeSystemRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1651,7 +1651,7 @@ func (this *NodeService) UpdateNodeSystem(ctx context.Context, req *pb.UpdateNod // UpdateNodeCache 修改节点缓存设置 func (this *NodeService) UpdateNodeCache(ctx context.Context, req *pb.UpdateNodeCacheRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1763,7 +1763,7 @@ func (this *NodeService) FindNodeLevelInfo(ctx context.Context, req *pb.FindNode // FindNodeDNSResolver 读取节点DNS Resolver func (this *NodeService) FindNodeDNSResolver(ctx context.Context, req *pb.FindNodeDNSResolverRequest) (*pb.FindNodeDNSResolverResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1785,7 +1785,7 @@ func (this *NodeService) FindNodeDNSResolver(ctx context.Context, req *pb.FindNo // UpdateNodeDNSResolver 修改DNS Resolver func (this *NodeService) UpdateNodeDNSResolver(ctx context.Context, req *pb.UpdateNodeDNSResolverRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1809,7 +1809,7 @@ func (this *NodeService) FindNodeDDoSProtection(ctx context.Context, req *pb.Fin var nodeId = req.NodeId var isFromNode = false - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { // 检查是否来自节点 currentNodeId, err2 := this.ValidateNode(ctx) @@ -1870,7 +1870,7 @@ func (this *NodeService) FindNodeDDoSProtection(ctx context.Context, req *pb.Fin // UpdateNodeDDoSProtection 修改集群的DDOS设置 func (this *NodeService) UpdateNodeDDoSProtection(ctx context.Context, req *pb.UpdateNodeDDoSProtectionRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1891,7 +1891,7 @@ func (this *NodeService) UpdateNodeDDoSProtection(ctx context.Context, req *pb.U // FindEnabledNodeConfigInfo 取得节点的配置概要信息 func (this *NodeService) FindEnabledNodeConfigInfo(ctx context.Context, req *pb.FindEnabledNodeConfigInfoRequest) (*pb.FindEnabledNodeConfigInfoResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_cluster.go b/internal/rpc/services/service_node_cluster.go index ef50e7a6..f750d120 100644 --- a/internal/rpc/services/service_node_cluster.go +++ b/internal/rpc/services/service_node_cluster.go @@ -27,7 +27,7 @@ type NodeClusterService struct { // CreateNodeCluster 创建集群 func (this *NodeClusterService) CreateNodeCluster(ctx context.Context, req *pb.CreateNodeClusterRequest) (*pb.CreateNodeClusterResponse, error) { - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -77,7 +77,7 @@ func (this *NodeClusterService) CreateNodeCluster(ctx context.Context, req *pb.C // UpdateNodeCluster 修改集群 func (this *NodeClusterService) UpdateNodeCluster(ctx context.Context, req *pb.UpdateNodeClusterRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -94,7 +94,7 @@ func (this *NodeClusterService) UpdateNodeCluster(ctx context.Context, req *pb.U // DeleteNodeCluster 禁用集群 func (this *NodeClusterService) DeleteNodeCluster(ctx context.Context, req *pb.DeleteNodeClusterRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -170,7 +170,7 @@ func (this *NodeClusterService) FindEnabledNodeCluster(ctx context.Context, req // FindAPINodesWithNodeCluster 查找集群的API节点信息 func (this *NodeClusterService) FindAPINodesWithNodeCluster(ctx context.Context, req *pb.FindAPINodesWithNodeClusterRequest) (*pb.FindAPINodesWithNodeClusterResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -224,7 +224,7 @@ func (this *NodeClusterService) FindAPINodesWithNodeCluster(ctx context.Context, // FindAllEnabledNodeClusters 查找所有可用的集群 func (this *NodeClusterService) FindAllEnabledNodeClusters(ctx context.Context, req *pb.FindAllEnabledNodeClustersRequest) (*pb.FindAllEnabledNodeClustersResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -255,7 +255,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClusters(ctx context.Context, // CountAllEnabledNodeClusters 计算所有集群数量 func (this *NodeClusterService) CountAllEnabledNodeClusters(ctx context.Context, req *pb.CountAllEnabledNodeClustersRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -272,7 +272,7 @@ func (this *NodeClusterService) CountAllEnabledNodeClusters(ctx context.Context, // ListEnabledNodeClusters 列出单页集群 func (this *NodeClusterService) ListEnabledNodeClusters(ctx context.Context, req *pb.ListEnabledNodeClustersRequest) (*pb.ListEnabledNodeClustersResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -308,7 +308,7 @@ func (this *NodeClusterService) ListEnabledNodeClusters(ctx context.Context, req // FindNodeClusterHealthCheckConfig 查找集群的健康检查配置 func (this *NodeClusterService) FindNodeClusterHealthCheckConfig(ctx context.Context, req *pb.FindNodeClusterHealthCheckConfigRequest) (*pb.FindNodeClusterHealthCheckConfigResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -332,7 +332,7 @@ func (this *NodeClusterService) FindNodeClusterHealthCheckConfig(ctx context.Con // UpdateNodeClusterHealthCheck 修改集群健康检查设置 func (this *NodeClusterService) UpdateNodeClusterHealthCheck(ctx context.Context, req *pb.UpdateNodeClusterHealthCheckRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -349,7 +349,7 @@ func (this *NodeClusterService) UpdateNodeClusterHealthCheck(ctx context.Context // ExecuteNodeClusterHealthCheck 执行健康检查 func (this *NodeClusterService) ExecuteNodeClusterHealthCheck(ctx context.Context, req *pb.ExecuteNodeClusterHealthCheckRequest) (*pb.ExecuteNodeClusterHealthCheckResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -378,7 +378,7 @@ func (this *NodeClusterService) ExecuteNodeClusterHealthCheck(ctx context.Contex // CountAllEnabledNodeClustersWithNodeGrantId 计算使用某个认证的集群数量 func (this *NodeClusterService) CountAllEnabledNodeClustersWithNodeGrantId(ctx context.Context, req *pb.CountAllEnabledNodeClustersWithNodeGrantIdRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -395,7 +395,7 @@ func (this *NodeClusterService) CountAllEnabledNodeClustersWithNodeGrantId(ctx c // FindAllEnabledNodeClustersWithNodeGrantId 查找使用某个认证的所有集群 func (this *NodeClusterService) FindAllEnabledNodeClustersWithNodeGrantId(ctx context.Context, req *pb.FindAllEnabledNodeClustersWithNodeGrantIdRequest) (*pb.FindAllEnabledNodeClustersWithNodeGrantIdResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -524,7 +524,7 @@ func (this *NodeClusterService) FindEnabledNodeClusterDNS(ctx context.Context, r // CountAllEnabledNodeClustersWithDNSProviderId 计算使用某个DNS服务商的集群数量 func (this *NodeClusterService) CountAllEnabledNodeClustersWithDNSProviderId(ctx context.Context, req *pb.CountAllEnabledNodeClustersWithDNSProviderIdRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -541,7 +541,7 @@ func (this *NodeClusterService) CountAllEnabledNodeClustersWithDNSProviderId(ctx // CountAllEnabledNodeClustersWithDNSDomainId 计算使用某个DNS域名的集群数量 func (this *NodeClusterService) CountAllEnabledNodeClustersWithDNSDomainId(ctx context.Context, req *pb.CountAllEnabledNodeClustersWithDNSDomainIdRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -558,7 +558,7 @@ func (this *NodeClusterService) CountAllEnabledNodeClustersWithDNSDomainId(ctx c // FindAllEnabledNodeClustersWithDNSDomainId 查找使用某个域名的所有集群 func (this *NodeClusterService) FindAllEnabledNodeClustersWithDNSDomainId(ctx context.Context, req *pb.FindAllEnabledNodeClustersWithDNSDomainIdRequest) (*pb.FindAllEnabledNodeClustersWithDNSDomainIdResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -586,7 +586,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClustersWithDNSDomainId(ctx co // CheckNodeClusterDNSName 检查集群域名是否已经被使用 func (this *NodeClusterService) CheckNodeClusterDNSName(ctx context.Context, req *pb.CheckNodeClusterDNSNameRequest) (*pb.CheckNodeClusterDNSNameResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -603,7 +603,7 @@ func (this *NodeClusterService) CheckNodeClusterDNSName(ctx context.Context, req // UpdateNodeClusterDNS 修改集群的域名设置 func (this *NodeClusterService) UpdateNodeClusterDNS(ctx context.Context, req *pb.UpdateNodeClusterDNSRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -620,7 +620,7 @@ func (this *NodeClusterService) UpdateNodeClusterDNS(ctx context.Context, req *p // CheckNodeClusterDNSChanges 检查集群的DNS是否有变化 func (this *NodeClusterService) CheckNodeClusterDNSChanges(ctx context.Context, req *pb.CheckNodeClusterDNSChangesRequest) (*pb.CheckNodeClusterDNSChangesResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -665,7 +665,7 @@ func (this *NodeClusterService) CheckNodeClusterDNSChanges(ctx context.Context, // FindEnabledNodeClusterTOA 查找集群的TOA配置 func (this *NodeClusterService) FindEnabledNodeClusterTOA(ctx context.Context, req *pb.FindEnabledNodeClusterTOARequest) (*pb.FindEnabledNodeClusterTOAResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -687,7 +687,7 @@ func (this *NodeClusterService) FindEnabledNodeClusterTOA(ctx context.Context, r // UpdateNodeClusterTOA 修改集群的TOA设置 func (this *NodeClusterService) UpdateNodeClusterTOA(ctx context.Context, req *pb.UpdateNodeClusterTOARequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -706,7 +706,7 @@ func (this *NodeClusterService) UpdateNodeClusterTOA(ctx context.Context, req *p // CountAllEnabledNodeClustersWithHTTPCachePolicyId 计算使用某个缓存策略的集群数量 func (this *NodeClusterService) CountAllEnabledNodeClustersWithHTTPCachePolicyId(ctx context.Context, req *pb.CountAllEnabledNodeClustersWithHTTPCachePolicyIdRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -722,7 +722,7 @@ func (this *NodeClusterService) CountAllEnabledNodeClustersWithHTTPCachePolicyId // FindAllEnabledNodeClustersWithHTTPCachePolicyId 查找使用缓存策略的所有集群 func (this *NodeClusterService) FindAllEnabledNodeClustersWithHTTPCachePolicyId(ctx context.Context, req *pb.FindAllEnabledNodeClustersWithHTTPCachePolicyIdRequest) (*pb.FindAllEnabledNodeClustersWithHTTPCachePolicyIdResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -748,7 +748,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClustersWithHTTPCachePolicyId( // CountAllEnabledNodeClustersWithHTTPFirewallPolicyId 计算使用某个WAF策略的集群数量 func (this *NodeClusterService) CountAllEnabledNodeClustersWithHTTPFirewallPolicyId(ctx context.Context, req *pb.CountAllEnabledNodeClustersWithHTTPFirewallPolicyIdRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -764,7 +764,7 @@ func (this *NodeClusterService) CountAllEnabledNodeClustersWithHTTPFirewallPolic // FindAllEnabledNodeClustersWithHTTPFirewallPolicyId 查找使用WAF策略的所有集群 func (this *NodeClusterService) FindAllEnabledNodeClustersWithHTTPFirewallPolicyId(ctx context.Context, req *pb.FindAllEnabledNodeClustersWithHTTPFirewallPolicyIdRequest) (*pb.FindAllEnabledNodeClustersWithHTTPFirewallPolicyIdResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -790,7 +790,7 @@ func (this *NodeClusterService) FindAllEnabledNodeClustersWithHTTPFirewallPolicy // UpdateNodeClusterHTTPCachePolicyId 修改集群的缓存策略 func (this *NodeClusterService) UpdateNodeClusterHTTPCachePolicyId(ctx context.Context, req *pb.UpdateNodeClusterHTTPCachePolicyIdRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -807,7 +807,7 @@ func (this *NodeClusterService) UpdateNodeClusterHTTPCachePolicyId(ctx context.C // UpdateNodeClusterHTTPFirewallPolicyId 修改集群的WAF策略 func (this *NodeClusterService) UpdateNodeClusterHTTPFirewallPolicyId(ctx context.Context, req *pb.UpdateNodeClusterHTTPFirewallPolicyIdRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -824,7 +824,7 @@ func (this *NodeClusterService) UpdateNodeClusterHTTPFirewallPolicyId(ctx contex // UpdateNodeClusterSystemService 修改集群的系统服务设置 func (this *NodeClusterService) UpdateNodeClusterSystemService(ctx context.Context, req *pb.UpdateNodeClusterSystemServiceRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -848,7 +848,7 @@ func (this *NodeClusterService) UpdateNodeClusterSystemService(ctx context.Conte // FindNodeClusterSystemService 查找集群的系统服务设置 func (this *NodeClusterService) FindNodeClusterSystemService(ctx context.Context, req *pb.FindNodeClusterSystemServiceRequest) (*pb.FindNodeClusterSystemServiceResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -943,7 +943,7 @@ func (this *NodeClusterService) CheckPortIsUsingInNodeCluster(ctx context.Contex // FindLatestNodeClusters 查找最近访问的集群 func (this *NodeClusterService) FindLatestNodeClusters(ctx context.Context, req *pb.FindLatestNodeClustersRequest) (*pb.FindLatestNodeClustersResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -966,7 +966,7 @@ func (this *NodeClusterService) FindLatestNodeClusters(ctx context.Context, req // FindEnabledNodeClusterConfigInfo 取得集群的配置概要信息 func (this *NodeClusterService) FindEnabledNodeClusterConfigInfo(ctx context.Context, req *pb.FindEnabledNodeClusterConfigInfoRequest) (*pb.FindEnabledNodeClusterConfigInfoResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1076,7 +1076,7 @@ func (this *NodeClusterService) FindEnabledNodeClusterConfigInfo(ctx context.Con // UpdateNodeClusterPinned 设置集群是否置顶 func (this *NodeClusterService) UpdateNodeClusterPinned(ctx context.Context, req *pb.UpdateNodeClusterPinnedRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1113,7 +1113,7 @@ func (this *NodeClusterService) FindEnabledNodeClusterWebPPolicy(ctx context.Con // UpdateNodeClusterWebPPolicy 设置集群WebP策略 func (this *NodeClusterService) UpdateNodeClusterWebPPolicy(ctx context.Context, req *pb.UpdateNodeClusterWebPPolicyRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1160,7 +1160,7 @@ func (this *NodeClusterService) FindEnabledNodeClusterUAMPolicy(ctx context.Cont // UpdateNodeClusterUAMPolicy 设置集群的UAM策略 func (this *NodeClusterService) UpdateNodeClusterUAMPolicy(ctx context.Context, req *pb.UpdateNodeClusterUAMPolicyRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1186,7 +1186,7 @@ func (this *NodeClusterService) UpdateNodeClusterUAMPolicy(ctx context.Context, // FindNodeClusterDDoSProtection 获取集群的DDOS设置 func (this *NodeClusterService) FindNodeClusterDDoSProtection(ctx context.Context, req *pb.FindNodeClusterDDoSProtectionRequest) (*pb.FindNodeClusterDDoSProtectionResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1213,7 +1213,7 @@ func (this *NodeClusterService) FindNodeClusterDDoSProtection(ctx context.Contex // UpdateNodeClusterDDoSProtection 修改集群的DDOS设置 func (this *NodeClusterService) UpdateNodeClusterDDoSProtection(ctx context.Context, req *pb.UpdateNodeClusterDDoSProtectionRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_cluster_firewall_action.go b/internal/rpc/services/service_node_cluster_firewall_action.go index 73abd81d..a3efeb87 100644 --- a/internal/rpc/services/service_node_cluster_firewall_action.go +++ b/internal/rpc/services/service_node_cluster_firewall_action.go @@ -15,7 +15,7 @@ type NodeClusterFirewallActionService struct { // CreateNodeClusterFirewallAction 创建动作 func (this *NodeClusterFirewallActionService) CreateNodeClusterFirewallAction(ctx context.Context, req *pb.CreateNodeClusterFirewallActionRequest) (*pb.NodeClusterFirewallActionResponse, error) { - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -38,7 +38,7 @@ func (this *NodeClusterFirewallActionService) CreateNodeClusterFirewallAction(ct // UpdateNodeClusterFirewallAction 修改动作 func (this *NodeClusterFirewallActionService) UpdateNodeClusterFirewallAction(ctx context.Context, req *pb.UpdateNodeClusterFirewallActionRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -61,7 +61,7 @@ func (this *NodeClusterFirewallActionService) UpdateNodeClusterFirewallAction(ct // DeleteNodeClusterFirewallAction 删除动作 func (this *NodeClusterFirewallActionService) DeleteNodeClusterFirewallAction(ctx context.Context, req *pb.DeleteNodeClusterFirewallActionRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -76,7 +76,7 @@ func (this *NodeClusterFirewallActionService) DeleteNodeClusterFirewallAction(ct // FindAllEnabledNodeClusterFirewallActions 查询集群的所有动作 func (this *NodeClusterFirewallActionService) FindAllEnabledNodeClusterFirewallActions(ctx context.Context, req *pb.FindAllEnabledNodeClusterFirewallActionsRequest) (*pb.FindAllEnabledNodeClusterFirewallActionsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -102,7 +102,7 @@ func (this *NodeClusterFirewallActionService) FindAllEnabledNodeClusterFirewallA // FindEnabledNodeClusterFirewallAction 查询单个动作 func (this *NodeClusterFirewallActionService) FindEnabledNodeClusterFirewallAction(ctx context.Context, req *pb.FindEnabledNodeClusterFirewallActionRequest) (*pb.FindEnabledNodeClusterFirewallActionResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -127,7 +127,7 @@ func (this *NodeClusterFirewallActionService) FindEnabledNodeClusterFirewallActi // CountAllEnabledNodeClusterFirewallActions 计算动作数量 func (this *NodeClusterFirewallActionService) CountAllEnabledNodeClusterFirewallActions(ctx context.Context, req *pb.CountAllEnabledNodeClusterFirewallActionsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_cluster_metric_item.go b/internal/rpc/services/service_node_cluster_metric_item.go index 86745ac1..11ca54f3 100644 --- a/internal/rpc/services/service_node_cluster_metric_item.go +++ b/internal/rpc/services/service_node_cluster_metric_item.go @@ -16,7 +16,7 @@ type NodeClusterMetricItemService struct { // EnableNodeClusterMetricItem 启用某个指标 func (this *NodeClusterMetricItemService) EnableNodeClusterMetricItem(ctx context.Context, req *pb.EnableNodeClusterMetricItemRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -37,7 +37,7 @@ func (this *NodeClusterMetricItemService) EnableNodeClusterMetricItem(ctx contex // DisableNodeClusterMetricItem 禁用某个指标 func (this *NodeClusterMetricItemService) DisableNodeClusterMetricItem(ctx context.Context, req *pb.DisableNodeClusterMetricItemRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -52,7 +52,7 @@ func (this *NodeClusterMetricItemService) DisableNodeClusterMetricItem(ctx conte // FindAllNodeClusterMetricItems 查找集群中所有指标 func (this *NodeClusterMetricItemService) FindAllNodeClusterMetricItems(ctx context.Context, req *pb.FindAllNodeClusterMetricItemsRequest) (*pb.FindAllNodeClusterMetricItemsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -88,7 +88,7 @@ func (this *NodeClusterMetricItemService) FindAllNodeClusterMetricItems(ctx cont // ExistsNodeClusterMetricItem 检查是否已添加某个指标 func (this *NodeClusterMetricItemService) ExistsNodeClusterMetricItem(ctx context.Context, req *pb.ExistsNodeClusterMetricItemRequest) (*pb.RPCExists, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -103,7 +103,7 @@ func (this *NodeClusterMetricItemService) ExistsNodeClusterMetricItem(ctx contex // FindAllNodeClustersWithMetricItemId 查找使用指标的集群 func (this *NodeClusterMetricItemService) FindAllNodeClustersWithMetricItemId(ctx context.Context, req *pb.FindAllNodeClustersWithMetricItemIdRequest) (*pb.FindAllNodeClustersWithMetricItemIdResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_grant.go b/internal/rpc/services/service_node_grant.go index 7979865d..8d967b58 100644 --- a/internal/rpc/services/service_node_grant.go +++ b/internal/rpc/services/service_node_grant.go @@ -19,7 +19,7 @@ type NodeGrantService struct { // CreateNodeGrant 创建认证 func (this *NodeGrantService) CreateNodeGrant(ctx context.Context, req *pb.CreateNodeGrantRequest) (*pb.CreateNodeGrantResponse, error) { - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -37,7 +37,7 @@ func (this *NodeGrantService) CreateNodeGrant(ctx context.Context, req *pb.Creat // UpdateNodeGrant 修改认证 func (this *NodeGrantService) UpdateNodeGrant(ctx context.Context, req *pb.UpdateNodeGrantRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -54,7 +54,7 @@ func (this *NodeGrantService) UpdateNodeGrant(ctx context.Context, req *pb.Updat // DisableNodeGrant 禁用认证 func (this *NodeGrantService) DisableNodeGrant(ctx context.Context, req *pb.DisableNodeGrantRequest) (*pb.DisableNodeGrantResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -67,7 +67,7 @@ func (this *NodeGrantService) DisableNodeGrant(ctx context.Context, req *pb.Disa // CountAllEnabledNodeGrants 计算认证的数量 func (this *NodeGrantService) CountAllEnabledNodeGrants(ctx context.Context, req *pb.CountAllEnabledNodeGrantsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -83,7 +83,7 @@ func (this *NodeGrantService) CountAllEnabledNodeGrants(ctx context.Context, req // ListEnabledNodeGrants 列出单页认证 func (this *NodeGrantService) ListEnabledNodeGrants(ctx context.Context, req *pb.ListEnabledNodeGrantsRequest) (*pb.ListEnabledNodeGrantsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -114,7 +114,7 @@ func (this *NodeGrantService) ListEnabledNodeGrants(ctx context.Context, req *pb // FindAllEnabledNodeGrants 列出所有认证信息 func (this *NodeGrantService) FindAllEnabledNodeGrants(ctx context.Context, req *pb.FindAllEnabledNodeGrantsRequest) (*pb.FindAllEnabledNodeGrantsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -142,7 +142,7 @@ func (this *NodeGrantService) FindAllEnabledNodeGrants(ctx context.Context, req // FindEnabledNodeGrant 获取单个认证信息 func (this *NodeGrantService) FindEnabledNodeGrant(ctx context.Context, req *pb.FindEnabledNodeGrantRequest) (*pb.FindEnabledNodeGrantResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -170,7 +170,7 @@ func (this *NodeGrantService) FindEnabledNodeGrant(ctx context.Context, req *pb. // TestNodeGrant 测试连接 func (this *NodeGrantService) TestNodeGrant(ctx context.Context, req *pb.TestNodeGrantRequest) (*pb.TestNodeGrantResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -274,7 +274,7 @@ func (this *NodeGrantService) TestNodeGrant(ctx context.Context, req *pb.TestNod // FindSuggestNodeGrants 查找集群推荐的认证 func (this *NodeGrantService) FindSuggestNodeGrants(ctx context.Context, req *pb.FindSuggestNodeGrantsRequest) (*pb.FindSuggestNodeGrantsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_group.go b/internal/rpc/services/service_node_group.go index 21922c0d..a1aa0a7c 100644 --- a/internal/rpc/services/service_node_group.go +++ b/internal/rpc/services/service_node_group.go @@ -14,7 +14,7 @@ type NodeGroupService struct { // CreateNodeGroup 创建分组 func (this *NodeGroupService) CreateNodeGroup(ctx context.Context, req *pb.CreateNodeGroupRequest) (*pb.CreateNodeGroupResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -31,7 +31,7 @@ func (this *NodeGroupService) CreateNodeGroup(ctx context.Context, req *pb.Creat // UpdateNodeGroup 修改分组 func (this *NodeGroupService) UpdateNodeGroup(ctx context.Context, req *pb.UpdateNodeGroupRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -49,7 +49,7 @@ func (this *NodeGroupService) UpdateNodeGroup(ctx context.Context, req *pb.Updat // DeleteNodeGroup 删除分组 func (this *NodeGroupService) DeleteNodeGroup(ctx context.Context, req *pb.DeleteNodeGroupRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -67,7 +67,7 @@ func (this *NodeGroupService) DeleteNodeGroup(ctx context.Context, req *pb.Delet // FindAllEnabledNodeGroupsWithNodeClusterId 查询所有分组 func (this *NodeGroupService) FindAllEnabledNodeGroupsWithNodeClusterId(ctx context.Context, req *pb.FindAllEnabledNodeGroupsWithNodeClusterIdRequest) (*pb.FindAllEnabledNodeGroupsWithNodeClusterIdResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -91,7 +91,7 @@ func (this *NodeGroupService) FindAllEnabledNodeGroupsWithNodeClusterId(ctx cont // UpdateNodeGroupOrders 修改分组排序 func (this *NodeGroupService) UpdateNodeGroupOrders(ctx context.Context, req *pb.UpdateNodeGroupOrdersRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -108,7 +108,7 @@ func (this *NodeGroupService) UpdateNodeGroupOrders(ctx context.Context, req *pb // FindEnabledNodeGroup 查找单个分组信息 func (this *NodeGroupService) FindEnabledNodeGroup(ctx context.Context, req *pb.FindEnabledNodeGroupRequest) (*pb.FindEnabledNodeGroupResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_ip_address.go b/internal/rpc/services/service_node_ip_address.go index 6f5e4176..393b8573 100644 --- a/internal/rpc/services/service_node_ip_address.go +++ b/internal/rpc/services/service_node_ip_address.go @@ -14,7 +14,7 @@ type NodeIPAddressService struct { // CreateNodeIPAddress 创建IP地址 func (this *NodeIPAddressService) CreateNodeIPAddress(ctx context.Context, req *pb.CreateNodeIPAddressRequest) (*pb.CreateNodeIPAddressResponse, error) { // 校验请求 - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -32,7 +32,7 @@ func (this *NodeIPAddressService) CreateNodeIPAddress(ctx context.Context, req * // CreateNodeIPAddresses 批量创建IP地址 func (this *NodeIPAddressService) CreateNodeIPAddresses(ctx context.Context, req *pb.CreateNodeIPAddressesRequest) (*pb.CreateNodeIPAddressesResponse, error) { // 校验请求 - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -60,7 +60,7 @@ func (this *NodeIPAddressService) CreateNodeIPAddresses(ctx context.Context, req // UpdateNodeIPAddress 修改IP地址 func (this *NodeIPAddressService) UpdateNodeIPAddress(ctx context.Context, req *pb.UpdateNodeIPAddressRequest) (*pb.RPCSuccess, error) { // 校验请求 - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -78,7 +78,7 @@ func (this *NodeIPAddressService) UpdateNodeIPAddress(ctx context.Context, req * // UpdateNodeIPAddressNodeId 修改IP地址所属节点 func (this *NodeIPAddressService) UpdateNodeIPAddressNodeId(ctx context.Context, req *pb.UpdateNodeIPAddressNodeIdRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -96,7 +96,7 @@ func (this *NodeIPAddressService) UpdateNodeIPAddressNodeId(ctx context.Context, // DisableNodeIPAddress 禁用单个IP地址 func (this *NodeIPAddressService) DisableNodeIPAddress(ctx context.Context, req *pb.DisableNodeIPAddressRequest) (*pb.DisableNodeIPAddressResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -114,7 +114,7 @@ func (this *NodeIPAddressService) DisableNodeIPAddress(ctx context.Context, req // DisableAllNodeIPAddressesWithNodeId 禁用某个节点的IP地址 func (this *NodeIPAddressService) DisableAllNodeIPAddressesWithNodeId(ctx context.Context, req *pb.DisableAllNodeIPAddressesWithNodeIdRequest) (*pb.DisableAllNodeIPAddressesWithNodeIdResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -132,7 +132,7 @@ func (this *NodeIPAddressService) DisableAllNodeIPAddressesWithNodeId(ctx contex // FindEnabledNodeIPAddress 查找单个IP地址 func (this *NodeIPAddressService) FindEnabledNodeIPAddress(ctx context.Context, req *pb.FindEnabledNodeIPAddressRequest) (*pb.FindEnabledNodeIPAddressResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -169,7 +169,7 @@ func (this *NodeIPAddressService) FindEnabledNodeIPAddress(ctx context.Context, // FindAllEnabledNodeIPAddressesWithNodeId 查找节点的所有地址 func (this *NodeIPAddressService) FindAllEnabledNodeIPAddressesWithNodeId(ctx context.Context, req *pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest) (*pb.FindAllEnabledNodeIPAddressesWithNodeIdResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -206,7 +206,7 @@ func (this *NodeIPAddressService) FindAllEnabledNodeIPAddressesWithNodeId(ctx co // CountAllEnabledNodeIPAddresses 计算IP地址数量 func (this *NodeIPAddressService) CountAllEnabledNodeIPAddresses(ctx context.Context, req *pb.CountAllEnabledNodeIPAddressesRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -223,7 +223,7 @@ func (this *NodeIPAddressService) CountAllEnabledNodeIPAddresses(ctx context.Con // ListEnabledNodeIPAddresses 列出单页IP地址 func (this *NodeIPAddressService) ListEnabledNodeIPAddresses(ctx context.Context, req *pb.ListEnabledNodeIPAddressesRequest) (*pb.ListEnabledNodeIPAddressesResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -256,7 +256,7 @@ func (this *NodeIPAddressService) ListEnabledNodeIPAddresses(ctx context.Context // UpdateNodeIPAddressIsUp 设置上下线状态 func (this *NodeIPAddressService) UpdateNodeIPAddressIsUp(ctx context.Context, req *pb.UpdateNodeIPAddressIsUpRequest) (*pb.RPCSuccess, error) { // 校验请求 - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -283,7 +283,7 @@ func (this *NodeIPAddressService) UpdateNodeIPAddressIsUp(ctx context.Context, r // RestoreNodeIPAddressBackupIP 还原备用IP状态 func (this *NodeIPAddressService) RestoreNodeIPAddressBackupIP(ctx context.Context, req *pb.RestoreNodeIPAddressBackupIPRequest) (*pb.RPCSuccess, error) { // 校验请求 - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_ip_address_log.go b/internal/rpc/services/service_node_ip_address_log.go index 04b386b4..1479743f 100644 --- a/internal/rpc/services/service_node_ip_address_log.go +++ b/internal/rpc/services/service_node_ip_address_log.go @@ -15,7 +15,7 @@ type NodeIPAddressLogService struct { // CountAllNodeIPAddressLogs 计算日志数量 func (this *NodeIPAddressLogService) CountAllNodeIPAddressLogs(ctx context.Context, req *pb.CountAllNodeIPAddressLogsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -31,7 +31,7 @@ func (this *NodeIPAddressLogService) CountAllNodeIPAddressLogs(ctx context.Conte // ListNodeIPAddressLogs 列出单页日志 func (this *NodeIPAddressLogService) ListNodeIPAddressLogs(ctx context.Context, req *pb.ListNodeIPAddressLogsRequest) (*pb.ListNodeIPAddressLogsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_ip_address_threshold.go b/internal/rpc/services/service_node_ip_address_threshold.go index a3795fa8..11e63ffa 100644 --- a/internal/rpc/services/service_node_ip_address_threshold.go +++ b/internal/rpc/services/service_node_ip_address_threshold.go @@ -18,7 +18,7 @@ type NodeIPAddressThresholdService struct { // CreateNodeIPAddressThreshold 创建阈值 func (this *NodeIPAddressThresholdService) CreateNodeIPAddressThreshold(ctx context.Context, req *pb.CreateNodeIPAddressThresholdRequest) (*pb.CreateNodeIPAddressThresholdResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -49,7 +49,7 @@ func (this *NodeIPAddressThresholdService) CreateNodeIPAddressThreshold(ctx cont // UpdateNodeIPAddressThreshold 修改阈值 func (this *NodeIPAddressThresholdService) UpdateNodeIPAddressThreshold(ctx context.Context, req *pb.UpdateNodeIPAddressThresholdRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -79,7 +79,7 @@ func (this *NodeIPAddressThresholdService) UpdateNodeIPAddressThreshold(ctx cont // DeleteNodeIPAddressThreshold 删除阈值 func (this *NodeIPAddressThresholdService) DeleteNodeIPAddressThreshold(ctx context.Context, req *pb.DeleteNodeIPAddressThresholdRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -94,7 +94,7 @@ func (this *NodeIPAddressThresholdService) DeleteNodeIPAddressThreshold(ctx cont // FindAllEnabledNodeIPAddressThresholds 查找IP的所有阈值 func (this *NodeIPAddressThresholdService) FindAllEnabledNodeIPAddressThresholds(ctx context.Context, req *pb.FindAllEnabledNodeIPAddressThresholdsRequest) (*pb.FindAllEnabledNodeIPAddressThresholdsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -118,7 +118,7 @@ func (this *NodeIPAddressThresholdService) FindAllEnabledNodeIPAddressThresholds // CountAllEnabledNodeIPAddressThresholds 计算IP阈值的数量 func (this *NodeIPAddressThresholdService) CountAllEnabledNodeIPAddressThresholds(ctx context.Context, req *pb.CountAllEnabledNodeIPAddressThresholdsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -133,7 +133,7 @@ func (this *NodeIPAddressThresholdService) CountAllEnabledNodeIPAddressThreshold // UpdateAllNodeIPAddressThresholds 批量更新阈值 func (this *NodeIPAddressThresholdService) UpdateAllNodeIPAddressThresholds(ctx context.Context, req *pb.UpdateAllNodeIPAddressThresholdsRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_log.go b/internal/rpc/services/service_node_log.go index 42dc0f55..1c42bc2f 100644 --- a/internal/rpc/services/service_node_log.go +++ b/internal/rpc/services/service_node_log.go @@ -34,7 +34,7 @@ func (this *NodeLogService) CreateNodeLogs(ctx context.Context, req *pb.CreateNo // CountNodeLogs 查询日志数量 func (this *NodeLogService) CountNodeLogs(ctx context.Context, req *pb.CountNodeLogsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func (this *NodeLogService) CountNodeLogs(ctx context.Context, req *pb.CountNode // ListNodeLogs 列出单页日志 func (this *NodeLogService) ListNodeLogs(ctx context.Context, req *pb.ListNodeLogsRequest) (*pb.ListNodeLogsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -93,7 +93,7 @@ func (this *NodeLogService) ListNodeLogs(ctx context.Context, req *pb.ListNodeLo // FixNodeLogs 设置日志为已修复 func (this *NodeLogService) FixNodeLogs(ctx context.Context, req *pb.FixNodeLogsRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -111,7 +111,7 @@ func (this *NodeLogService) FixNodeLogs(ctx context.Context, req *pb.FixNodeLogs // FixAllNodeLogs 设置所有日志为已修复 func (this *NodeLogService) FixAllNodeLogs(ctx context.Context, req *pb.FixAllNodeLogsRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -127,7 +127,7 @@ func (this *NodeLogService) FixAllNodeLogs(ctx context.Context, req *pb.FixAllNo // CountAllUnreadNodeLogs 计算未读的日志数量 func (this *NodeLogService) CountAllUnreadNodeLogs(ctx context.Context, req *pb.CountAllUnreadNodeLogsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -142,7 +142,7 @@ func (this *NodeLogService) CountAllUnreadNodeLogs(ctx context.Context, req *pb. // UpdateNodeLogsRead 设置日志为已读 func (this *NodeLogService) UpdateNodeLogsRead(ctx context.Context, req *pb.UpdateNodeLogsReadRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -157,7 +157,7 @@ func (this *NodeLogService) UpdateNodeLogsRead(ctx context.Context, req *pb.Upda // UpdateAllNodeLogsRead 设置所有日志未已读 func (this *NodeLogService) UpdateAllNodeLogsRead(ctx context.Context, req *pb.UpdateAllNodeLogsReadRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_login.go b/internal/rpc/services/service_node_login.go index cdf652f5..71251020 100644 --- a/internal/rpc/services/service_node_login.go +++ b/internal/rpc/services/service_node_login.go @@ -20,7 +20,7 @@ type NodeLoginService struct { // FindNodeLoginSuggestPorts 读取建议的端口 func (this *NodeLoginService) FindNodeLoginSuggestPorts(ctx context.Context, req *pb.FindNodeLoginSuggestPortsRequest) (*pb.FindNodeLoginSuggestPortsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_price_item.go b/internal/rpc/services/service_node_price_item.go index 393088ac..ca1164b7 100644 --- a/internal/rpc/services/service_node_price_item.go +++ b/internal/rpc/services/service_node_price_item.go @@ -13,7 +13,7 @@ type NodePriceItemService struct { // 创建区域价格 func (this *NodePriceItemService) CreateNodePriceItem(ctx context.Context, req *pb.CreateNodePriceItemRequest) (*pb.CreateNodePriceItemResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -29,7 +29,7 @@ func (this *NodePriceItemService) CreateNodePriceItem(ctx context.Context, req * // 修改区域价格 func (this *NodePriceItemService) UpdateNodePriceItem(ctx context.Context, req *pb.UpdateNodePriceItemRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -45,7 +45,7 @@ func (this *NodePriceItemService) UpdateNodePriceItem(ctx context.Context, req * // 删除区域价格 func (this *NodePriceItemService) DeleteNodePriceItem(ctx context.Context, req *pb.DeleteNodePriceItemRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -61,7 +61,7 @@ func (this *NodePriceItemService) DeleteNodePriceItem(ctx context.Context, req * // 查找所有区域价格 func (this *NodePriceItemService) FindAllEnabledNodePriceItems(ctx context.Context, req *pb.FindAllEnabledNodePriceItemsRequest) (*pb.FindAllEnabledNodePriceItemsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -89,7 +89,7 @@ func (this *NodePriceItemService) FindAllEnabledNodePriceItems(ctx context.Conte // FindAllEnabledAndOnNodePriceItems 查找所有启用的区域价格 func (this *NodePriceItemService) FindAllEnabledAndOnNodePriceItems(ctx context.Context, req *pb.FindAllEnabledAndOnNodePriceItemsRequest) (*pb.FindAllEnabledAndOnNodePriceItemsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -117,7 +117,7 @@ func (this *NodePriceItemService) FindAllEnabledAndOnNodePriceItems(ctx context. // 查找单个区域信息 func (this *NodePriceItemService) FindEnabledNodePriceItem(ctx context.Context, req *pb.FindEnabledNodePriceItemRequest) (*pb.FindEnabledNodePriceItemResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_region.go b/internal/rpc/services/service_node_region.go index 5fc572f4..311faade 100644 --- a/internal/rpc/services/service_node_region.go +++ b/internal/rpc/services/service_node_region.go @@ -13,7 +13,7 @@ type NodeRegionService struct { // CreateNodeRegion 创建区域 func (this *NodeRegionService) CreateNodeRegion(ctx context.Context, req *pb.CreateNodeRegionRequest) (*pb.CreateNodeRegionResponse, error) { - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -29,7 +29,7 @@ func (this *NodeRegionService) CreateNodeRegion(ctx context.Context, req *pb.Cre // UpdateNodeRegion 修改区域 func (this *NodeRegionService) UpdateNodeRegion(ctx context.Context, req *pb.UpdateNodeRegionRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -45,7 +45,7 @@ func (this *NodeRegionService) UpdateNodeRegion(ctx context.Context, req *pb.Upd // DeleteNodeRegion 删除区域 func (this *NodeRegionService) DeleteNodeRegion(ctx context.Context, req *pb.DeleteNodeRegionRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -61,7 +61,7 @@ func (this *NodeRegionService) DeleteNodeRegion(ctx context.Context, req *pb.Del // FindAllEnabledNodeRegions 查找所有区域 func (this *NodeRegionService) FindAllEnabledNodeRegions(ctx context.Context, req *pb.FindAllEnabledNodeRegionsRequest) (*pb.FindAllEnabledNodeRegionsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -87,7 +87,7 @@ func (this *NodeRegionService) FindAllEnabledNodeRegions(ctx context.Context, re // FindAllEnabledAndOnNodeRegions 查找所有启用的区域 func (this *NodeRegionService) FindAllEnabledAndOnNodeRegions(ctx context.Context, req *pb.FindAllEnabledAndOnNodeRegionsRequest) (*pb.FindAllEnabledAndOnNodeRegionsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -113,7 +113,7 @@ func (this *NodeRegionService) FindAllEnabledAndOnNodeRegions(ctx context.Contex // UpdateNodeRegionOrders 排序 func (this *NodeRegionService) UpdateNodeRegionOrders(ctx context.Context, req *pb.UpdateNodeRegionOrdersRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -129,7 +129,7 @@ func (this *NodeRegionService) UpdateNodeRegionOrders(ctx context.Context, req * // FindEnabledNodeRegion 查找单个区域信息 func (this *NodeRegionService) FindEnabledNodeRegion(ctx context.Context, req *pb.FindEnabledNodeRegionRequest) (*pb.FindEnabledNodeRegionResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -154,7 +154,7 @@ func (this *NodeRegionService) FindEnabledNodeRegion(ctx context.Context, req *p // UpdateNodeRegionPrice 修改价格项价格 func (this *NodeRegionService) UpdateNodeRegionPrice(ctx context.Context, req *pb.UpdateNodeRegionPriceRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_task.go b/internal/rpc/services/service_node_task.go index 078990dd..d156823a 100644 --- a/internal/rpc/services/service_node_task.go +++ b/internal/rpc/services/service_node_task.go @@ -82,7 +82,7 @@ func (this *NodeTaskService) ReportNodeTaskDone(ctx context.Context, req *pb.Rep // FindNodeClusterTasks 获取所有正在同步的集群信息 func (this *NodeTaskService) FindNodeClusterTasks(ctx context.Context, req *pb.FindNodeClusterTasksRequest) (*pb.FindNodeClusterTasksResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -155,7 +155,7 @@ func (this *NodeTaskService) FindNodeClusterTasks(ctx context.Context, req *pb.F // ExistsNodeTasks 检查是否有正在执行的任务 func (this *NodeTaskService) ExistsNodeTasks(ctx context.Context, req *pb.ExistsNodeTasksRequest) (*pb.ExistsNodeTasksResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -184,7 +184,7 @@ func (this *NodeTaskService) ExistsNodeTasks(ctx context.Context, req *pb.Exists // DeleteNodeTask 删除任务 func (this *NodeTaskService) DeleteNodeTask(ctx context.Context, req *pb.DeleteNodeTaskRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -200,7 +200,7 @@ func (this *NodeTaskService) DeleteNodeTask(ctx context.Context, req *pb.DeleteN // DeleteNodeTasks 批量删除任务 func (this *NodeTaskService) DeleteNodeTasks(ctx context.Context, req *pb.DeleteNodeTasksRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -218,7 +218,7 @@ func (this *NodeTaskService) DeleteNodeTasks(ctx context.Context, req *pb.Delete // CountDoingNodeTasks 计算正在执行的任务数量 func (this *NodeTaskService) CountDoingNodeTasks(ctx context.Context, req *pb.CountDoingNodeTasksRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -235,7 +235,7 @@ func (this *NodeTaskService) CountDoingNodeTasks(ctx context.Context, req *pb.Co // FindNotifyingNodeTasks 查找需要通知的任务 func (this *NodeTaskService) FindNotifyingNodeTasks(ctx context.Context, req *pb.FindNotifyingNodeTasksRequest) (*pb.FindNotifyingNodeTasksResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -272,7 +272,7 @@ func (this *NodeTaskService) FindNotifyingNodeTasks(ctx context.Context, req *pb // UpdateNodeTasksNotified 设置任务已通知 func (this *NodeTaskService) UpdateNodeTasksNotified(ctx context.Context, req *pb.UpdateNodeTasksNotifiedRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_threshold.go b/internal/rpc/services/service_node_threshold.go index f5f8d501..84fc230b 100644 --- a/internal/rpc/services/service_node_threshold.go +++ b/internal/rpc/services/service_node_threshold.go @@ -17,7 +17,7 @@ type NodeThresholdService struct { // CreateNodeThreshold 创建阈值 func (this *NodeThresholdService) CreateNodeThreshold(ctx context.Context, req *pb.CreateNodeThresholdRequest) (*pb.CreateNodeThresholdResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -31,7 +31,7 @@ func (this *NodeThresholdService) CreateNodeThreshold(ctx context.Context, req * // UpdateNodeThreshold 创建阈值 func (this *NodeThresholdService) UpdateNodeThreshold(ctx context.Context, req *pb.UpdateNodeThresholdRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -45,7 +45,7 @@ func (this *NodeThresholdService) UpdateNodeThreshold(ctx context.Context, req * // DeleteNodeThreshold 删除阈值 func (this *NodeThresholdService) DeleteNodeThreshold(ctx context.Context, req *pb.DeleteNodeThresholdRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -59,7 +59,7 @@ func (this *NodeThresholdService) DeleteNodeThreshold(ctx context.Context, req * // FindAllEnabledNodeThresholds 查询阈值 func (this *NodeThresholdService) FindAllEnabledNodeThresholds(ctx context.Context, req *pb.FindAllEnabledNodeThresholdsRequest) (*pb.FindAllEnabledNodeThresholdsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -108,7 +108,7 @@ func (this *NodeThresholdService) FindAllEnabledNodeThresholds(ctx context.Conte // CountAllEnabledNodeThresholds 计算阈值数量 func (this *NodeThresholdService) CountAllEnabledNodeThresholds(ctx context.Context, req *pb.CountAllEnabledNodeThresholdsRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -123,7 +123,7 @@ func (this *NodeThresholdService) CountAllEnabledNodeThresholds(ctx context.Cont // FindEnabledNodeThreshold 查询单个阈值详情 func (this *NodeThresholdService) FindEnabledNodeThreshold(ctx context.Context, req *pb.FindEnabledNodeThresholdRequest) (*pb.FindEnabledNodeThresholdResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_node_value.go b/internal/rpc/services/service_node_value.go index e9afa5a4..a1ec90dc 100644 --- a/internal/rpc/services/service_node_value.go +++ b/internal/rpc/services/service_node_value.go @@ -52,7 +52,7 @@ func (this *NodeValueService) CreateNodeValue(ctx context.Context, req *pb.Creat // ListNodeValues 读取数据 func (this *NodeValueService) ListNodeValues(ctx context.Context, req *pb.ListNodeValuesRequest) (*pb.ListNodeValuesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -75,7 +75,7 @@ func (this *NodeValueService) ListNodeValues(ctx context.Context, req *pb.ListNo // SumAllNodeValueStats 读取所有节点的最新数据 func (this *NodeValueService) SumAllNodeValueStats(ctx context.Context, req *pb.SumAllNodeValueStatsRequest) (*pb.SumAllNodeValueStatsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server.go b/internal/rpc/services/service_server.go index fed22f2f..75eb2f74 100644 --- a/internal/rpc/services/service_server.go +++ b/internal/rpc/services/service_server.go @@ -164,7 +164,7 @@ func (this *ServerService) CreateServer(ctx context.Context, req *pb.CreateServe // UpdateServerBasic 修改服务基本信息 func (this *ServerService) UpdateServerBasic(ctx context.Context, req *pb.UpdateServerBasicRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -371,7 +371,7 @@ func (this *ServerService) UpdateServerTLS(ctx context.Context, req *pb.UpdateSe // UpdateServerUnix 修改Unix服务 func (this *ServerService) UpdateServerUnix(ctx context.Context, req *pb.UpdateServerUnixRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -563,7 +563,7 @@ func (this *ServerService) UpdateServerNames(ctx context.Context, req *pb.Update // UpdateServerNamesAuditing 审核服务的域名设置 func (this *ServerService) UpdateServerNamesAuditing(ctx context.Context, req *pb.UpdateServerNamesAuditingRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -608,7 +608,7 @@ func (this *ServerService) UpdateServerNamesAuditing(ctx context.Context, req *p // UpdateServerDNS 修改服务的DNS相关设置 func (this *ServerService) UpdateServerDNS(ctx context.Context, req *pb.UpdateServerDNSRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -624,7 +624,7 @@ func (this *ServerService) UpdateServerDNS(ctx context.Context, req *pb.UpdateSe // RegenerateServerCNAME 重新生成CNAME func (this *ServerService) RegenerateServerCNAME(ctx context.Context, req *pb.RegenerateServerCNAMERequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1172,7 +1172,7 @@ func (this *ServerService) FindAllEnabledServersWithSSLCertId(ctx context.Contex // CountAllEnabledServersWithNodeClusterId 计算运行在某个集群上的所有服务数量 func (this *ServerService) CountAllEnabledServersWithNodeClusterId(ctx context.Context, req *pb.CountAllEnabledServersWithNodeClusterIdRequest) (*pb.RPCCountResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1206,7 +1206,7 @@ func (this *ServerService) CountAllEnabledServersWithServerGroupId(ctx context.C // NotifyServersChange 通知更新 func (this *ServerService) NotifyServersChange(ctx context.Context, _ *pb.NotifyServersChangeRequest) (*pb.NotifyServersChangeResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1230,7 +1230,7 @@ func (this *ServerService) NotifyServersChange(ctx context.Context, _ *pb.Notify // FindAllEnabledServersDNSWithNodeClusterId 取得某个集群下的所有服务相关的DNS func (this *ServerService) FindAllEnabledServersDNSWithNodeClusterId(ctx context.Context, req *pb.FindAllEnabledServersDNSWithNodeClusterIdRequest) (*pb.FindAllEnabledServersDNSWithNodeClusterIdResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1642,7 +1642,7 @@ func (this *ServerService) CheckServerNameDuplicationInNodeCluster(ctx context.C // FindLatestServers 查找最近访问的服务 func (this *ServerService) FindLatestServers(ctx context.Context, req *pb.FindLatestServersRequest) (*pb.FindLatestServersResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1664,7 +1664,7 @@ func (this *ServerService) FindLatestServers(ctx context.Context, req *pb.FindLa // FindNearbyServers 查找某个服务附近的服务 func (this *ServerService) FindNearbyServers(ctx context.Context, req *pb.FindNearbyServersRequest) (*pb.FindNearbyServersResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -1751,7 +1751,7 @@ func (this *ServerService) FindNearbyServers(ctx context.Context, req *pb.FindNe // PurgeServerCache 清除缓存 func (this *ServerService) PurgeServerCache(ctx context.Context, req *pb.PurgeServerCacheRequest) (*pb.PurgeServerCacheResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { // 检查是否为节点 _, err = this.ValidateNode(ctx) @@ -1875,7 +1875,7 @@ func (this *ServerService) FindEnabledServerTrafficLimit(ctx context.Context, re // UpdateServerTrafficLimit 设置流量限制 func (this *ServerService) UpdateServerTrafficLimit(ctx context.Context, req *pb.UpdateServerTrafficLimitRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_daily_stat.go b/internal/rpc/services/service_server_daily_stat.go index c8c0083a..df5dec50 100644 --- a/internal/rpc/services/service_server_daily_stat.go +++ b/internal/rpc/services/service_server_daily_stat.go @@ -106,7 +106,7 @@ func (this *ServerDailyStatService) UploadServerDailyStats(ctx context.Context, // FindLatestServerHourlyStats 按小时读取统计数据 func (this *ServerDailyStatService) FindLatestServerHourlyStats(ctx context.Context, req *pb.FindLatestServerHourlyStatsRequest) (*pb.FindLatestServerHourlyStatsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -137,7 +137,7 @@ func (this *ServerDailyStatService) FindLatestServerHourlyStats(ctx context.Cont // FindLatestServerMinutelyStats 按分钟读取统计数据 func (this *ServerDailyStatService) FindLatestServerMinutelyStats(ctx context.Context, req *pb.FindLatestServerMinutelyStatsRequest) (*pb.FindLatestServerMinutelyStatsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -194,7 +194,7 @@ func (this *ServerDailyStatService) FindLatestServerMinutelyStats(ctx context.Co // FindLatestServerDailyStats 按天读取统计数据 func (this *ServerDailyStatService) FindLatestServerDailyStats(ctx context.Context, req *pb.FindLatestServerDailyStatsRequest) (*pb.FindLatestServerDailyStatsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_domain_hourly_stat.go b/internal/rpc/services/service_server_domain_hourly_stat.go index e914f220..4693a95a 100644 --- a/internal/rpc/services/service_server_domain_hourly_stat.go +++ b/internal/rpc/services/service_server_domain_hourly_stat.go @@ -15,7 +15,7 @@ type ServerDomainHourlyStatService struct { // ListTopServerDomainStatsWithServerId 读取域名排行 func (this *ServerDomainHourlyStatService) ListTopServerDomainStatsWithServerId(ctx context.Context, req *pb.ListTopServerDomainStatsWithServerIdRequest) (*pb.ListTopServerDomainStatsWithServerIdResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_group.go b/internal/rpc/services/service_server_group.go index 7c88d7f8..8f824edb 100644 --- a/internal/rpc/services/service_server_group.go +++ b/internal/rpc/services/service_server_group.go @@ -161,7 +161,7 @@ func (this *ServerGroupService) FindEnabledServerGroup(ctx context.Context, req // FindAndInitServerGroupHTTPReverseProxyConfig 查找HTTP反向代理设置 func (this *ServerGroupService) FindAndInitServerGroupHTTPReverseProxyConfig(ctx context.Context, req *pb.FindAndInitServerGroupHTTPReverseProxyConfigRequest) (*pb.FindAndInitServerGroupHTTPReverseProxyConfigResponse, error) { // 校验请求 - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -214,7 +214,7 @@ func (this *ServerGroupService) FindAndInitServerGroupHTTPReverseProxyConfig(ctx // FindAndInitServerGroupTCPReverseProxyConfig 查找反向代理设置 func (this *ServerGroupService) FindAndInitServerGroupTCPReverseProxyConfig(ctx context.Context, req *pb.FindAndInitServerGroupTCPReverseProxyConfigRequest) (*pb.FindAndInitServerGroupTCPReverseProxyConfigResponse, error) { // 校验请求 - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -267,7 +267,7 @@ func (this *ServerGroupService) FindAndInitServerGroupTCPReverseProxyConfig(ctx // FindAndInitServerGroupUDPReverseProxyConfig 查找反向代理设置 func (this *ServerGroupService) FindAndInitServerGroupUDPReverseProxyConfig(ctx context.Context, req *pb.FindAndInitServerGroupUDPReverseProxyConfigRequest) (*pb.FindAndInitServerGroupUDPReverseProxyConfigResponse, error) { // 校验请求 - adminId, err := this.ValidateAdmin(ctx, 0) + adminId, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -320,7 +320,7 @@ func (this *ServerGroupService) FindAndInitServerGroupUDPReverseProxyConfig(ctx // UpdateServerGroupHTTPReverseProxy 修改服务的反向代理设置 func (this *ServerGroupService) UpdateServerGroupHTTPReverseProxy(ctx context.Context, req *pb.UpdateServerGroupHTTPReverseProxyRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -339,7 +339,7 @@ func (this *ServerGroupService) UpdateServerGroupHTTPReverseProxy(ctx context.Co // UpdateServerGroupTCPReverseProxy 修改服务的反向代理设置 func (this *ServerGroupService) UpdateServerGroupTCPReverseProxy(ctx context.Context, req *pb.UpdateServerGroupTCPReverseProxyRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -358,7 +358,7 @@ func (this *ServerGroupService) UpdateServerGroupTCPReverseProxy(ctx context.Con // UpdateServerGroupUDPReverseProxy 修改服务的反向代理设置 func (this *ServerGroupService) UpdateServerGroupUDPReverseProxy(ctx context.Context, req *pb.UpdateServerGroupUDPReverseProxyRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -492,7 +492,7 @@ func (this *ServerGroupService) FindEnabledServerGroupConfigInfo(ctx context.Con // FindAndInitServerGroupWebConfig 初始化Web设置 func (this *ServerGroupService) FindAndInitServerGroupWebConfig(ctx context.Context, req *pb.FindAndInitServerGroupWebConfigRequest) (*pb.FindAndInitServerGroupWebConfigResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_stat_board.go b/internal/rpc/services/service_server_stat_board.go index 5db836c9..aa7e1c48 100644 --- a/internal/rpc/services/service_server_stat_board.go +++ b/internal/rpc/services/service_server_stat_board.go @@ -25,7 +25,7 @@ type ServerStatBoardService struct { // FindAllEnabledServerStatBoards 读取所有看板 func (this *ServerStatBoardService) FindAllEnabledServerStatBoards(ctx context.Context, req *pb.FindAllEnabledServerStatBoardsRequest) (*pb.FindAllEnabledServerStatBoardsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -51,7 +51,7 @@ func (this *ServerStatBoardService) FindAllEnabledServerStatBoards(ctx context.C // ComposeServerStatNodeClusterBoard 组合看板数据 func (this *ServerStatBoardService) ComposeServerStatNodeClusterBoard(ctx context.Context, req *pb.ComposeServerStatNodeClusterBoardRequest) (*pb.ComposeServerStatNodeClusterBoardResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -190,7 +190,7 @@ func (this *ServerStatBoardService) ComposeServerStatNodeClusterBoard(ctx contex // ComposeServerStatNodeBoard 组合节点看板数据 func (this *ServerStatBoardService) ComposeServerStatNodeBoard(ctx context.Context, req *pb.ComposeServerStatNodeBoardRequest) (*pb.ComposeServerStatNodeBoardResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -400,7 +400,7 @@ func (this *ServerStatBoardService) ComposeServerStatNodeBoard(ctx context.Conte // ComposeServerStatBoard 组合服务看板数据 func (this *ServerStatBoardService) ComposeServerStatBoard(ctx context.Context, req *pb.ComposeServerStatBoardRequest) (*pb.ComposeServerStatBoardResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_server_stat_board_chart.go b/internal/rpc/services/service_server_stat_board_chart.go index 2bd5faff..bfdc780f 100644 --- a/internal/rpc/services/service_server_stat_board_chart.go +++ b/internal/rpc/services/service_server_stat_board_chart.go @@ -16,7 +16,7 @@ type ServerStatBoardChartService struct { // EnableServerStatBoardChart 添加图表 func (this *ServerStatBoardChartService) EnableServerStatBoardChart(ctx context.Context, req *pb.EnableServerStatBoardChartRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -32,7 +32,7 @@ func (this *ServerStatBoardChartService) EnableServerStatBoardChart(ctx context. // DisableServerStatBoardChart 取消图表 func (this *ServerStatBoardChartService) DisableServerStatBoardChart(ctx context.Context, req *pb.DisableServerStatBoardChartRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -48,7 +48,7 @@ func (this *ServerStatBoardChartService) DisableServerStatBoardChart(ctx context // FindAllEnabledServerStatBoardCharts 读取看板中的图表 func (this *ServerStatBoardChartService) FindAllEnabledServerStatBoardCharts(ctx context.Context, req *pb.FindAllEnabledServerStatBoardChartsRequest) (*pb.FindAllEnabledServerStatBoardChartsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_ssl_cert.go b/internal/rpc/services/service_ssl_cert.go index 5039000c..a953d416 100644 --- a/internal/rpc/services/service_ssl_cert.go +++ b/internal/rpc/services/service_ssl_cert.go @@ -199,7 +199,7 @@ func (this *SSLCertService) ListSSLCerts(ctx context.Context, req *pb.ListSSLCer // CountAllSSLCertsWithOCSPError 计算有OCSP错误的证书数量 func (this *SSLCertService) CountAllSSLCertsWithOCSPError(ctx context.Context, req *pb.CountAllSSLCertsWithOCSPErrorRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -214,7 +214,7 @@ func (this *SSLCertService) CountAllSSLCertsWithOCSPError(ctx context.Context, r // ListSSLCertsWithOCSPError 列出有OCSP错误的证书 func (this *SSLCertService) ListSSLCertsWithOCSPError(ctx context.Context, req *pb.ListSSLCertsWithOCSPErrorRequest) (*pb.ListSSLCertsWithOCSPErrorResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -255,7 +255,7 @@ func (this *SSLCertService) ListSSLCertsWithOCSPError(ctx context.Context, req * // IgnoreSSLCertsWithOCSPError 忽略一组OCSP证书错误 func (this *SSLCertService) IgnoreSSLCertsWithOCSPError(ctx context.Context, req *pb.IgnoreSSLCertsWithOCSPErrorRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -270,7 +270,7 @@ func (this *SSLCertService) IgnoreSSLCertsWithOCSPError(ctx context.Context, req // ResetSSLCertsWithOCSPError 重置一组证书OCSP错误状态 func (this *SSLCertService) ResetSSLCertsWithOCSPError(ctx context.Context, req *pb.ResetSSLCertsWithOCSPErrorRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -285,7 +285,7 @@ func (this *SSLCertService) ResetSSLCertsWithOCSPError(ctx context.Context, req // ResetAllSSLCertsWithOCSPError 重置所有证书OCSP错误状态 func (this *SSLCertService) ResetAllSSLCertsWithOCSPError(ctx context.Context, req *pb.ResetAllSSLCertsWithOCSPErrorRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_traffic_daily_stat.go b/internal/rpc/services/service_traffic_daily_stat.go index c791ddd7..4490ac5a 100644 --- a/internal/rpc/services/service_traffic_daily_stat.go +++ b/internal/rpc/services/service_traffic_daily_stat.go @@ -18,7 +18,7 @@ type TrafficDailyStatService struct { // FindTrafficDailyStatWithDay 查找某日统计 func (this *TrafficDailyStatService) FindTrafficDailyStatWithDay(ctx context.Context, req *pb.FindTrafficDailyStatWithDayRequest) (*pb.FindTrafficDailyStatWithDayResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_user.go b/internal/rpc/services/service_user.go index dfb903a4..d6015138 100644 --- a/internal/rpc/services/service_user.go +++ b/internal/rpc/services/service_user.go @@ -26,7 +26,7 @@ type UserService struct { // CreateUser 创建用户 func (this *UserService) CreateUser(ctx context.Context, req *pb.CreateUserRequest) (*pb.CreateUserResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -95,7 +95,7 @@ func (this *UserService) RegisterUser(ctx context.Context, req *pb.RegisterUserR // VerifyUser 审核用户 func (this *UserService) VerifyUser(ctx context.Context, req *pb.VerifyUserRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -111,7 +111,7 @@ func (this *UserService) VerifyUser(ctx context.Context, req *pb.VerifyUserReque // UpdateUser 修改用户 func (this *UserService) UpdateUser(ctx context.Context, req *pb.UpdateUserRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -140,7 +140,7 @@ func (this *UserService) UpdateUser(ctx context.Context, req *pb.UpdateUserReque // DeleteUser 删除用户 func (this *UserService) DeleteUser(ctx context.Context, req *pb.DeleteUserRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -168,7 +168,7 @@ func (this *UserService) DeleteUser(ctx context.Context, req *pb.DeleteUserReque // CountAllEnabledUsers 计算用户数量 func (this *UserService) CountAllEnabledUsers(ctx context.Context, req *pb.CountAllEnabledUsersRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -184,7 +184,7 @@ func (this *UserService) CountAllEnabledUsers(ctx context.Context, req *pb.Count // ListEnabledUsers 列出单页用户 func (this *UserService) ListEnabledUsers(ctx context.Context, req *pb.ListEnabledUsersRequest) (*pb.ListEnabledUsersResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -500,7 +500,7 @@ func (this *UserService) FindUserNodeClusterId(ctx context.Context, req *pb.Find // UpdateUserFeatures 设置用户能使用的功能 func (this *UserService) UpdateUserFeatures(ctx context.Context, req *pb.UpdateUserFeaturesRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -546,7 +546,7 @@ func (this *UserService) FindUserFeatures(ctx context.Context, req *pb.FindUserF // FindAllUserFeatureDefinitions 获取所有的功能定义 func (this *UserService) FindAllUserFeatureDefinitions(ctx context.Context, req *pb.FindAllUserFeatureDefinitionsRequest) (*pb.FindAllUserFeatureDefinitionsResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -561,7 +561,7 @@ func (this *UserService) FindAllUserFeatureDefinitions(ctx context.Context, req // ComposeUserGlobalBoard 组合全局的看板数据 func (this *UserService) ComposeUserGlobalBoard(ctx context.Context, req *pb.ComposeUserGlobalBoardRequest) (*pb.ComposeUserGlobalBoardResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_user_bill.go b/internal/rpc/services/service_user_bill.go index e8614561..d7581645 100644 --- a/internal/rpc/services/service_user_bill.go +++ b/internal/rpc/services/service_user_bill.go @@ -20,7 +20,7 @@ type UserBillService struct { // GenerateAllUserBills 手工生成订单 func (this *UserBillService) GenerateAllUserBills(ctx context.Context, req *pb.GenerateAllUserBillsRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_user_identity.go b/internal/rpc/services/service_user_identity.go index dc73b29b..822e6ae8 100644 --- a/internal/rpc/services/service_user_identity.go +++ b/internal/rpc/services/service_user_identity.go @@ -177,7 +177,7 @@ func (this *UserIdentityService) CancelUserIdentity(ctx context.Context, req *pb // RejectUserIdentity 拒绝用户身份认证信息 func (this *UserIdentityService) RejectUserIdentity(ctx context.Context, req *pb.RejectUserIdentityRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -203,7 +203,7 @@ func (this *UserIdentityService) RejectUserIdentity(ctx context.Context, req *pb // VerifyUserIdentity 通过用户身份认证信息 func (this *UserIdentityService) VerifyUserIdentity(ctx context.Context, req *pb.VerifyUserIdentityRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/service_user_node.go b/internal/rpc/services/service_user_node.go index a10a8542..147f4668 100644 --- a/internal/rpc/services/service_user_node.go +++ b/internal/rpc/services/service_user_node.go @@ -18,7 +18,7 @@ type UserNodeService struct { // CreateUserNode 创建用户节点 func (this *UserNodeService) CreateUserNode(ctx context.Context, req *pb.CreateUserNodeRequest) (*pb.CreateUserNodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -35,7 +35,7 @@ func (this *UserNodeService) CreateUserNode(ctx context.Context, req *pb.CreateU // UpdateUserNode 修改用户节点 func (this *UserNodeService) UpdateUserNode(ctx context.Context, req *pb.UpdateUserNodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -52,7 +52,7 @@ func (this *UserNodeService) UpdateUserNode(ctx context.Context, req *pb.UpdateU // DeleteUserNode 删除用户节点 func (this *UserNodeService) DeleteUserNode(ctx context.Context, req *pb.DeleteUserNodeRequest) (*pb.RPCSuccess, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -69,7 +69,7 @@ func (this *UserNodeService) DeleteUserNode(ctx context.Context, req *pb.DeleteU // FindAllEnabledUserNodes 列出所有可用用户节点 func (this *UserNodeService) FindAllEnabledUserNodes(ctx context.Context, req *pb.FindAllEnabledUserNodesRequest) (*pb.FindAllEnabledUserNodesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -107,7 +107,7 @@ func (this *UserNodeService) FindAllEnabledUserNodes(ctx context.Context, req *p // CountAllEnabledUserNodes 计算用户节点数量 func (this *UserNodeService) CountAllEnabledUserNodes(ctx context.Context, req *pb.CountAllEnabledUserNodesRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -124,7 +124,7 @@ func (this *UserNodeService) CountAllEnabledUserNodes(ctx context.Context, req * // ListEnabledUserNodes 列出单页的用户节点 func (this *UserNodeService) ListEnabledUserNodes(ctx context.Context, req *pb.ListEnabledUserNodesRequest) (*pb.ListEnabledUserNodesResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -163,7 +163,7 @@ func (this *UserNodeService) ListEnabledUserNodes(ctx context.Context, req *pb.L // FindEnabledUserNode 根据ID查找节点 func (this *UserNodeService) FindEnabledUserNode(ctx context.Context, req *pb.FindEnabledUserNodeRequest) (*pb.FindEnabledUserNodeResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -282,7 +282,7 @@ func (this *UserNodeService) UpdateUserNodeStatus(ctx context.Context, req *pb.U // CountAllEnabledUserNodesWithSSLCertId 计算使用某个SSL证书的用户节点数量 func (this *UserNodeService) CountAllEnabledUserNodesWithSSLCertId(ctx context.Context, req *pb.CountAllEnabledUserNodesWithSSLCertIdRequest) (*pb.RPCCountResponse, error) { - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } diff --git a/internal/rpc/services/sevice_http_gzip.go b/internal/rpc/services/sevice_http_gzip.go index 3ebc372c..36c5834e 100644 --- a/internal/rpc/services/sevice_http_gzip.go +++ b/internal/rpc/services/sevice_http_gzip.go @@ -15,7 +15,7 @@ type HTTPGzipService struct { // CreateHTTPGzip 创建Gzip配置 func (this *HTTPGzipService) CreateHTTPGzip(ctx context.Context, req *pb.CreateHTTPGzipRequest) (*pb.CreateHTTPGzipResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -55,7 +55,7 @@ func (this *HTTPGzipService) CreateHTTPGzip(ctx context.Context, req *pb.CreateH // FindEnabledHTTPGzipConfig 查找Gzip func (this *HTTPGzipService) FindEnabledHTTPGzipConfig(ctx context.Context, req *pb.FindEnabledGzipConfigRequest) (*pb.FindEnabledGzipConfigResponse, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err } @@ -77,7 +77,7 @@ func (this *HTTPGzipService) FindEnabledHTTPGzipConfig(ctx context.Context, req // UpdateHTTPGzip 修改Gzip配置 func (this *HTTPGzipService) UpdateHTTPGzip(ctx context.Context, req *pb.UpdateHTTPGzipRequest) (*pb.RPCSuccess, error) { // 校验请求 - _, err := this.ValidateAdmin(ctx, 0) + _, err := this.ValidateAdmin(ctx) if err != nil { return nil, err }