增加DNS域名管理

2025-12-05 13:50:26 +08:00 · 2020-11-12 14:41:23 +08:00
parent 6d7d87aa11
commit 37538b40a9
36 changed files with 4007 additions and 4179 deletions
--- a/pkg/rpc/protos/model_dns_domain.proto
+++ b/pkg/rpc/protos/model_dns_domain.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+message DNSDomain {
+	int64 id = 1;
+	string name = 2;
+	bool isOn = 3;
+	int64 dataUpdatedAt = 4;
+}
--- a/pkg/rpc/protos/model_dns_provider.proto
+++ b/pkg/rpc/protos/model_dns_provider.proto
@@ -9,6 +9,5 @@ message DNSProvider {
 	string type = 3;
 	string typeName = 4;
 	bytes apiParamsJSON = 5;
-	bytes routesJSON = 6;
-	int64 dataUpdatedAt = 7;
+	int64 dataUpdatedAt = 6;
 }
--- a/pkg/rpc/protos/rpc_messages.proto
+++ b/pkg/rpc/protos/rpc_messages.proto
@@ -10,3 +10,7 @@ message RPCUpdateSuccess {
 message RPCDeleteSuccess {

 }
+
+message RPCCountResponse {
+	int64 count = 1;
+}
--- a/pkg/rpc/protos/service_api_node.proto
+++ b/pkg/rpc/protos/service_api_node.proto
@@ -19,7 +19,7 @@ service APINodeService {
 	rpc findAllEnabledAPINodes (FindAllEnabledAPINodesRequest) returns (FindAllEnabledAPINodesResponse);

 	// 计算API节点数量
-	rpc countAllEnabledAPINodes (CountAllEnabledAPINodesRequest) returns (CountAllEnabledAPINodesResponse);
+	rpc countAllEnabledAPINodes (CountAllEnabledAPINodesRequest) returns (RPCCountResponse);

 	// 列出单页的API节点
 	rpc listEnabledAPINodes (ListEnabledAPINodesRequest) returns (ListEnabledAPINodesResponse);
@@ -75,10 +75,6 @@ message CountAllEnabledAPINodesRequest {

 }

-message CountAllEnabledAPINodesResponse {
-	int64 count = 1;
-}
-
 // 列出单页的API节点
 message ListEnabledAPINodesRequest {
 	int64 offset = 1;
--- a/pkg/rpc/protos/service_db_node.proto
+++ b/pkg/rpc/protos/service_db_node.proto
@@ -17,7 +17,7 @@ service DBNodeService {
 	rpc deleteDBNode (DeleteDBNodeRequest) returns (RPCDeleteSuccess);

 	// 计算可用的数据库节点数量
-	rpc countAllEnabledDBNodes (CountAllEnabledDBNodesRequest) returns (CountAllEnabledDBNodesResponse);
+	rpc countAllEnabledDBNodes (CountAllEnabledDBNodesRequest) returns (RPCCountResponse);

 	// 列出单页的数据库节点
 	rpc listEnabledDBNodes (ListEnabledDBNodesRequest) returns (ListEnabledDBNodesResponse);
@@ -67,10 +67,6 @@ message CountAllEnabledDBNodesRequest {

 }

-message CountAllEnabledDBNodesResponse {
-	int64 count = 1;
-}
-
 // 列出单页的数据库节点
 message ListEnabledDBNodesRequest {
 	int64 offset = 1;
--- a/pkg/rpc/protos/service_dns_domain.proto
+++ b/pkg/rpc/protos/service_dns_domain.proto
@@ -0,0 +1,61 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+import "rpc_messages.proto";
+import "model_dns_domain.proto";
+
+// DNS域名相关
+service DNSDomainService {
+	// 创建域名
+	rpc createDNSDomain (CreateDNSDomainRequest) returns (CreateDNSDomainResponse);
+
+	// 修改域名
+	rpc updateDNSDomain (UpdateDNSDomainRequest) returns (RPCUpdateSuccess);
+
+	// 删除域名
+	rpc deleteDNSDomain (DeleteDNSDomainRequest) returns (RPCDeleteSuccess);
+
+	// 计算服务商下的域名数量
+	rpc countAllEnabledDNSDomainsWithDNSProviderId (CountAllEnabledDNSDomainsWithDNSProviderIdRequest) returns (RPCCountResponse);
+
+	// 列出服务商下的所有域名
+	rpc findAllEnabledDNSDomainsWithDNSProviderId (FindAllEnabledDNSDomainsWithDNSProviderIdRequest) returns (FindAllEnabledDNSDomainsWithDNSProviderIdResponse);
+}
+
+// 创建域名
+message CreateDNSDomainRequest {
+	int64 dnsProviderId = 1;
+	string name = 2;
+}
+
+message CreateDNSDomainResponse {
+	int64 dnsDomainId = 1;
+}
+
+// 修改域名
+message UpdateDNSDomainRequest {
+	int64 dnsDomainId = 1;
+	string name = 2;
+	bool isOn = 3;
+}
+
+// 删除域名
+message DeleteDNSDomainRequest {
+	int64 dnsDomainId = 1;
+}
+
+// 计算服务商下的域名数量
+message CountAllEnabledDNSDomainsWithDNSProviderIdRequest {
+	int64 dnsProviderId = 1;
+}
+
+// 列出服务商下的所有域名
+message FindAllEnabledDNSDomainsWithDNSProviderIdRequest {
+	int64 dnsProviderId = 1;
+}
+
+message FindAllEnabledDNSDomainsWithDNSProviderIdResponse {
+	repeated DNSDomain dnsDomains = 1;
+}
--- a/pkg/rpc/protos/service_dns_provider.proto
+++ b/pkg/rpc/protos/service_dns_provider.proto
@@ -15,7 +15,7 @@ service DNSProviderService {
 	rpc updateDNSProvider (UpdateDNSProviderRequest) returns (RPCUpdateSuccess);

 	// 计算服务商数量
-	rpc countAllEnabledDNSProviders (CountAllEnabledDNSProvidersRequest) returns (CountAllEnabledDNSProvidersResponse);
+	rpc countAllEnabledDNSProviders (CountAllEnabledDNSProvidersRequest) returns (RPCCountResponse);

 	// 列出单页服务商信息
 	rpc listEnabledDNSProviders (ListEnabledDNSProvidersRequest) returns (ListEnabledDNSProvidersResponse);
@@ -28,6 +28,9 @@ service DNSProviderService {

 	// 取得所有服务商类型
 	rpc findAllDNSProviderTypes (FindAllDNSProviderTypesRequest) returns (FindAllDNSProviderTypesResponse);
+
+	// 更新数据
+	rpc updateDNSProviderData (UpdateDNSProviderDataRequest) returns (UpdateDNSProviderDataResponse);
 }

 // 创建服务商
@@ -35,7 +38,6 @@ message CreateDNSProviderRequest {
 	string name = 1;
 	string type = 2;
 	bytes apiParamsJSON = 3;
-	bytes routesJSON = 4;
 }

 message CreateDNSProviderResponse {
@@ -47,7 +49,6 @@ message UpdateDNSProviderRequest {
 	int64 dnsProviderId = 1;
 	string name = 2;
 	bytes apiParamsJSON = 3;
-	bytes routesJSON = 4;
 }

 // 计算服务商数量
@@ -55,10 +56,6 @@ message CountAllEnabledDNSProvidersRequest {

 }

-message CountAllEnabledDNSProvidersResponse {
-	int64 count = 1;
-}
-
 // 列出单页的服务商信息
 message ListEnabledDNSProvidersRequest {
 	int64 offset = 1;
@@ -95,4 +92,14 @@ message FindAllDNSProviderTypesResponse {
 message DNSProviderType {
 	string name = 1;
 	string code = 2;
+}
+
+// 更新数据
+message UpdateDNSProviderDataRequest {
+	int64 dnsProviderId = 1;
+}
+
+message UpdateDNSProviderDataResponse {
+	bool isOk = 1;
+	string error = 2;
 }
--- a/pkg/rpc/protos/service_http_cache_policy.proto
+++ b/pkg/rpc/protos/service_http_cache_policy.proto
@@ -20,7 +20,7 @@ service HTTPCachePolicyService {
 	rpc deleteHTTPCachePolicy (DeleteHTTPCachePolicyRequest) returns (RPCDeleteSuccess);

 	// 计算缓存策略数量
-	rpc countAllEnabledHTTPCachePolicies (CountAllEnabledHTTPCachePoliciesRequest) returns (CountAllEnabledHTTPCachePoliciesResponse);
+	rpc countAllEnabledHTTPCachePolicies (CountAllEnabledHTTPCachePoliciesRequest) returns (RPCCountResponse);

 	// 列出单页的缓存策略
 	rpc listEnabledHTTPCachePolicies (ListEnabledHTTPCachePoliciesRequest) returns (ListEnabledHTTPCachePoliciesResponse);
@@ -76,10 +76,6 @@ message DeleteHTTPCachePolicyRequest {
 message CountAllEnabledHTTPCachePoliciesRequest {
 }

-message CountAllEnabledHTTPCachePoliciesResponse {
-	int64 count = 1;
-}
-
 // 列出单页的缓存策略
 message ListEnabledHTTPCachePoliciesRequest {
 	int64 offset = 1;
--- a/pkg/rpc/protos/service_http_firewall_policy.proto
+++ b/pkg/rpc/protos/service_http_firewall_policy.proto
@@ -23,7 +23,7 @@ service HTTPFirewallPolicyService {
 	rpc updateHTTPFirewallInboundConfig (UpdateHTTPFirewallInboundConfigRequest) returns (RPCUpdateSuccess);

 	// 计算可用的防火墙策略数量
-	rpc countAllEnabledFirewallPolicies (CountAllEnabledFirewallPoliciesRequest) returns (CountAllEnabledFirewallPoliciesResponse);
+	rpc countAllEnabledFirewallPolicies (CountAllEnabledFirewallPoliciesRequest) returns (RPCCountResponse);

 	// 列出单页的防火墙策略
 	rpc listEnabledFirewallPolicies (ListEnabledFirewallPoliciesRequest) returns (ListEnabledFirewallPoliciesResponse);
@@ -85,10 +85,6 @@ message UpdateHTTPFirewallInboundConfigRequest {
 message CountAllEnabledFirewallPoliciesRequest {
 }

-message CountAllEnabledFirewallPoliciesResponse {
-	int64 count = 1;
-}
-
 // 列出单页的防火墙策略
 message ListEnabledFirewallPoliciesRequest {
 	int64 offset = 1;
--- a/pkg/rpc/protos/service_ip_item.proto
+++ b/pkg/rpc/protos/service_ip_item.proto
@@ -18,7 +18,7 @@ service IPItemService {
 	rpc deleteIPItem (DeleteIPItemRequest) returns (RPCDeleteSuccess);

 	// 计算IP数量
-	rpc countIPItemsWithListId (CountIPItemsWithListIdRequest) returns (CountIPItemsWithListIdResponse);
+	rpc countIPItemsWithListId (CountIPItemsWithListIdRequest) returns (RPCCountResponse);

 	// 列出单页的IP
 	rpc listIPItemsWithListId (ListIPItemsWithListIdRequest) returns (ListIPItemsWithListIdResponse);
@@ -62,10 +62,6 @@ message CountIPItemsWithListIdRequest {
 	int64 ipListId = 1;
 }

-message CountIPItemsWithListIdResponse {
-	int64 count = 1;
-}
-
 // 列出单页的IP
 message ListIPItemsWithListIdRequest {
 	int64 ipListId = 1;
--- a/pkg/rpc/protos/service_log.proto
+++ b/pkg/rpc/protos/service_log.proto
@@ -3,6 +3,7 @@ option go_package = "./pb";

 package pb;

+import "rpc_messages.proto";
 import "model_log.proto";

 service LogService {
@@ -10,7 +11,7 @@ service LogService {
 	rpc createLog (CreateLogRequest) returns (CreateLogResponse);

 	// 计算日志数量
-	rpc countLogs (CountLogRequest) returns (CountLogResponse);
+	rpc countLogs (CountLogRequest) returns (RPCCountResponse);

 	// 列出单页日志
 	rpc listLogs (ListLogsRequest) returns (ListLogsResponse);
@@ -33,10 +34,6 @@ message CountLogRequest {

 }

-message CountLogResponse {
-	int64 count = 1;
-}
-
 // 列出单页日志
 message ListLogsRequest {
 	int64 offset = 1;
--- a/pkg/rpc/protos/service_message.proto
+++ b/pkg/rpc/protos/service_message.proto
@@ -9,7 +9,7 @@ import "rpc_messages.proto";
 // 消息相关服务
 service MessageService {
 	// 计算未读消息数
-	rpc countUnreadMessages (CountUnreadMessagesRequest) returns (CountUnreadMessagesResponse);
+	rpc countUnreadMessages (CountUnreadMessagesRequest) returns (RPCCountResponse);

 	// 列出单页未读消息
 	rpc listUnreadMessages (ListUnreadMessagesRequest) returns (ListUnreadMessagesResponse);
@@ -29,10 +29,6 @@ message CountUnreadMessagesRequest {

 }

-message CountUnreadMessagesResponse {
-	int64 count = 1;
-}
-
 // 列出单页未读消息
 message ListUnreadMessagesRequest {
 	int64 offset = 1;
--- a/pkg/rpc/protos/service_node.proto
+++ b/pkg/rpc/protos/service_node.proto
@@ -16,10 +16,10 @@ service NodeService {
 	rpc registerClusterNode (RegisterClusterNodeRequest) returns (RegisterClusterNodeResponse);

 	// 节点数量
-	rpc countAllEnabledNodes (CountAllEnabledNodesRequest) returns (CountAllEnabledNodesResponse);
+	rpc countAllEnabledNodes (CountAllEnabledNodesRequest) returns (RPCCountResponse);

 	// 计算匹配的节点数量
-	rpc countAllEnabledNodesMatch (CountAllEnabledNodesMatchRequest) returns (CountAllEnabledNodesMatchResponse);
+	rpc countAllEnabledNodesMatch (CountAllEnabledNodesMatchRequest) returns (RPCCountResponse);

 	// 列出单页节点
 	rpc listEnabledNodesMatch (ListEnabledNodesMatchRequest) returns (ListEnabledNodesMatchResponse);
@@ -70,7 +70,7 @@ service NodeService {
 	rpc updateNodeConnectedAPINodes (UpdateNodeConnectedAPINodesRequest) returns (RPCUpdateSuccess);

 	// 计算使用某个认证的节点数量
-	rpc countAllEnabledNodesWithGrantId (CountAllEnabledNodesWithGrantIdRequest) returns (CountAllEnabledNodesWithGrantIdResponse);
+	rpc countAllEnabledNodesWithGrantId (CountAllEnabledNodesWithGrantIdRequest) returns (RPCCountResponse);

 	// 查找使用某个认证的所有节点
 	rpc findAllEnabledNodesWithGrantId (FindAllEnabledNodesWithGrantIdRequest) returns (FindAllEnabledNodesWithGrantIdResponse);
@@ -88,7 +88,7 @@ service NodeService {
 	rpc updateNodeLogin (UpdateNodeLoginRequest) returns (RPCUpdateSuccess);

 	// 计算某个节点分组内的节点数量
-	rpc countAllEnabledNodesWithGroupId (CountAllEnabledNodesWithGroupIdRequest) returns (CountAllEnabledNodesWithGroupIdResponse);
+	rpc countAllEnabledNodesWithGroupId (CountAllEnabledNodesWithGroupIdRequest) returns (RPCCountResponse);
 }

 // 创建节点
@@ -119,10 +119,6 @@ message CountAllEnabledNodesRequest {

 }

-message CountAllEnabledNodesResponse {
-	int64 count = 1;
-}
-
 // 列出单页节点
 message ListEnabledNodesMatchRequest {
 	int64 offset = 1;
@@ -219,10 +215,6 @@ message CountAllEnabledNodesMatchRequest {
 	int64 groupId = 5;
 }

-message CountAllEnabledNodesMatchResponse {
-	int64 count = 1;
-}
-
 // 修改节点安装状态
 message UpdateNodeIsInstalledRequest {
 	int64 nodeId = 1;
@@ -276,10 +268,6 @@ message CountAllEnabledNodesWithGrantIdRequest {
 	int64 grantId = 1;
 }

-message CountAllEnabledNodesWithGrantIdResponse {
-	int64 count = 1;
-}
-
 // 查找使用某个认证的所有节点
 message FindAllEnabledNodesWithGrantIdRequest {
 	int64 grantId = 1;
@@ -334,7 +322,3 @@ message UpdateNodeLoginRequest {
 message CountAllEnabledNodesWithGroupIdRequest {
 	int64 groupId = 1;
 }
-
-message CountAllEnabledNodesWithGroupIdResponse {
-	int64 count = 1;
-}
--- a/pkg/rpc/protos/service_node_cluster.proto
+++ b/pkg/rpc/protos/service_node_cluster.proto
@@ -7,6 +7,7 @@ import "model_node_cluster.proto";
 import "model_api_node.proto";
 import "model_node.proto";
 import "rpc_messages.proto";
+import "model_dns_domain.proto";
 import "model_dns_provider.proto";

 service NodeClusterService {
@@ -32,7 +33,7 @@ service NodeClusterService {
 	rpc findAllChangedNodeClusters (FindAllChangedNodeClustersRequest) returns (FindAllChangedNodeClustersResponse);

 	// 计算所有集群数量
-	rpc countAllEnabledNodeClusters (CountAllEnabledNodeClustersRequest) returns (CountAllEnabledNodeClustersResponse);
+	rpc countAllEnabledNodeClusters (CountAllEnabledNodeClustersRequest) returns (RPCCountResponse);

 	// 列出单页集群
 	rpc listEnabledNodeClusters (ListEnabledNodeClustersRequest) returns (ListEnabledNodeClustersResponse);
@@ -47,7 +48,7 @@ service NodeClusterService {
 	rpc executeNodeClusterHealthCheck (ExecuteNodeClusterHealthCheckRequest) returns (ExecuteNodeClusterHealthCheckResponse);

 	// 计算使用某个认证的集群数量
-	rpc countAllEnabledNodeClustersWithGrantId (CountAllEnabledNodeClustersWithGrantIdRequest) returns (CountAllEnabledNodeClustersWithGrantIdResponse);
+	rpc countAllEnabledNodeClustersWithGrantId (CountAllEnabledNodeClustersWithGrantIdRequest) returns (RPCCountResponse);

 	// 查找使用某个认证的所有集群
 	rpc findAllEnabledNodeClustersWithGrantId (FindAllEnabledNodeClustersWithGrantIdRequest) returns (FindAllEnabledNodeClustersWithGrantIdResponse);
@@ -56,7 +57,10 @@ service NodeClusterService {
 	rpc findEnabledNodeClusterDNS (FindEnabledNodeClusterDNSRequest) returns (FindEnabledNodeClusterDNSResponse);

 	// 计算使用某个DNS服务商的集群数量
-	rpc countAllEnabledNodeClustersWithDNSProviderId (CountAllEnabledNodeClustersWithDNSProviderIdRequest) returns (CountAllEnabledNodeClustersWithDNSProviderIdResponse);
+	rpc countAllEnabledNodeClustersWithDNSProviderId (CountAllEnabledNodeClustersWithDNSProviderIdRequest) returns (RPCCountResponse);
+
+	// 计算使用某个DNS域名的集群数量
+	rpc countAllEnabledNodeClustersWithDNSDomainId (CountAllEnabledNodeClustersWithDNSDomainIdRequest) returns (RPCCountResponse);
 }

 // 获取所有集群的信息
@@ -125,10 +129,6 @@ message CountAllEnabledNodeClustersRequest {

 }

-message CountAllEnabledNodeClustersResponse {
-	int64 count = 1;
-}
-
 // 列出单页集群
 message ListEnabledNodeClustersRequest {
 	int64 offset = 1;
@@ -176,10 +176,6 @@ message CountAllEnabledNodeClustersWithGrantIdRequest {
 	int64 grantId = 1;
 }

-message CountAllEnabledNodeClustersWithGrantIdResponse {
-	int64 count = 1;
-}
-
 // 查找使用某个认证的所有集群
 message FindAllEnabledNodeClustersWithGrantIdRequest {
 	int64 grantId = 1;
@@ -196,7 +192,7 @@ message FindEnabledNodeClusterDNSRequest {

 message FindEnabledNodeClusterDNSResponse {
 	string name = 1;
-	string domain = 2;
+	DNSDomain domain = 2;
 	DNSProvider provider = 3;
 }

@@ -205,6 +201,7 @@ message CountAllEnabledNodeClustersWithDNSProviderIdRequest {
 	int64 dnsProviderId = 1;
 }

-message CountAllEnabledNodeClustersWithDNSProviderIdResponse {
-	int64 count = 1;
+// 计算使用某个DNS域名的集群数量
+message CountAllEnabledNodeClustersWithDNSDomainIdRequest {
+	int64 dnsDomainId = 1;
 }
--- a/pkg/rpc/protos/service_node_grant.proto
+++ b/pkg/rpc/protos/service_node_grant.proto
@@ -16,7 +16,7 @@ service NodeGrantService {
 	rpc disableNodeGrant (DisableNodeGrantRequest) returns (DisableNodeGrantResponse);

 	// 计算认证的数量
-	rpc countAllEnabledNodeGrants (CountAllEnabledNodeGrantsRequest) returns (CountAllEnabledNodeGrantsResponse);
+	rpc countAllEnabledNodeGrants (CountAllEnabledNodeGrantsRequest) returns (RPCCountResponse);

 	// 列出单页认证
 	rpc ListEnabledNodeGrants (ListEnabledNodeGrantsRequest) returns (ListEnabledNodeGrantsResponse);
@@ -69,10 +69,6 @@ message CountAllEnabledNodeGrantsRequest {

 }

-message CountAllEnabledNodeGrantsResponse {
-	int64 count = 1;
-}
-
 // 列出单页认证
 message ListEnabledNodeGrantsRequest {
 	int64 offset = 1;
--- a/pkg/rpc/protos/service_node_log.proto
+++ b/pkg/rpc/protos/service_node_log.proto
@@ -3,6 +3,7 @@ option go_package = "./pb";

 package pb;

+import "rpc_messages.proto";
 import "model_node_log.proto";

 // 节点日志相关服务
@@ -11,7 +12,7 @@ service NodeLogService {
 	rpc createNodeLogs (CreateNodeLogsRequest) returns (CreateNodeLogsResponse);

 	// 查询日志数量
-	rpc countNodeLogs (CountNodeLogsRequest) returns (CountNodeLogsResponse);
+	rpc countNodeLogs (CountNodeLogsRequest) returns (RPCCountResponse);

 	// 列出单页日志
 	rpc listNodeLogs (ListNodeLogsRequest) returns (ListNodeLogsResponse);
@@ -32,10 +33,6 @@ message CountNodeLogsRequest {
 	string role = 2;
 }

-message CountNodeLogsResponse {
-	int64 count = 1;
-}
-
 // 列出单页日志
 message ListNodeLogsRequest {
 	int64 nodeId = 1;
--- a/pkg/rpc/protos/service_server.proto
+++ b/pkg/rpc/protos/service_server.proto
@@ -41,7 +41,7 @@ service ServerService {
 	rpc updateServerNames (UpdateServerNamesRequest) returns (RPCUpdateSuccess);

 	// 计算匹配的服务数量
-	rpc countAllEnabledServersMatch (CountAllEnabledServersMatchRequest) returns (CountAllEnabledServersMatchResponse);
+	rpc countAllEnabledServersMatch (CountAllEnabledServersMatchRequest) returns (RPCCountResponse);

 	// 列出单页服务
 	rpc listEnabledServersMatch (ListEnabledServersMatchRequest) returns (ListEnabledServersMatchResponse);
@@ -62,28 +62,28 @@ service ServerService {
 	rpc findAndInitServerWebConfig (FindAndInitServerWebConfigRequest) returns (FindAndInitServerWebConfigResponse);

 	// 计算使用某个SSL证书的服务数量
-	rpc countAllEnabledServersWithSSLCertId (CountAllEnabledServersWithSSLCertIdRequest) returns (CountAllEnabledServersWithSSLCertIdResponse);
+	rpc countAllEnabledServersWithSSLCertId (CountAllEnabledServersWithSSLCertIdRequest) returns (RPCCountResponse);

 	// 查找使用某个SSL证书的所有服务
 	rpc findAllEnabledServersWithSSLCertId (FindAllEnabledServersWithSSLCertIdRequest) returns (FindAllEnabledServersWithSSLCertIdResponse);

 	// 计算使用某个缓存策略的服务数量
-	rpc countAllEnabledServersWithCachePolicyId (CountAllEnabledServersWithCachePolicyIdRequest) returns (CountAllEnabledServersWithCachePolicyIdResponse);
+	rpc countAllEnabledServersWithCachePolicyId (CountAllEnabledServersWithCachePolicyIdRequest) returns (RPCCountResponse);

 	// 查找使用某个缓存策略的所有服务
 	rpc findAllEnabledServersWithCachePolicyId (FindAllEnabledServersWithCachePolicyIdRequest) returns (FindAllEnabledServersWithCachePolicyIdResponse);

 	// 计算使用某个WAF策略的服务数量
-	rpc countAllEnabledServersWithHTTPFirewallPolicyId (CountAllEnabledServersWithHTTPFirewallPolicyIdRequest) returns (CountAllEnabledServersWithHTTPFirewallPolicyIdResponse);
+	rpc countAllEnabledServersWithHTTPFirewallPolicyId (CountAllEnabledServersWithHTTPFirewallPolicyIdRequest) returns (RPCCountResponse);

 	// 查找使用WAF策略的所有服务
 	rpc findAllEnabledServersWithHTTPFirewallPolicyId (FindAllEnabledServersWithHTTPFirewallPolicyIdRequest) returns (FindAllEnabledServersWithHTTPFirewallPolicyIdResponse);

 	// 计算运行在某个集群上的所有服务数量
-	rpc countAllEnabledServersWithNodeClusterId (CountAllEnabledServersWithNodeClusterIdRequest) returns (CountAllEnabledServersWithNodeClusterIdResponse);
+	rpc countAllEnabledServersWithNodeClusterId (CountAllEnabledServersWithNodeClusterIdRequest) returns (RPCCountResponse);

 	// 计算使用某个分组的服务数量
-	rpc countAllEnabledServersWithGroupId (CountAllEnabledServersWithGroupIdRequest) returns (CountAllEnabledServersWithGroupIdResponse);
+	rpc countAllEnabledServersWithGroupId (CountAllEnabledServersWithGroupIdRequest) returns (RPCCountResponse);

 	// 通知更新
 	rpc notifyServersChange (NotifyServersChangeRequest) returns (NotifyServersChangeResponse);
@@ -180,10 +180,6 @@ message CountAllEnabledServersMatchRequest {
 	string keyword = 2;
 }

-message CountAllEnabledServersMatchResponse {
-	int64 count = 1;
-}
-
 // 列出单页服务
 message ListEnabledServersMatchRequest {
 	int64 offset = 1;
@@ -247,10 +243,6 @@ message CountAllEnabledServersWithSSLCertIdRequest {
 	int64 certId = 1;
 }

-message CountAllEnabledServersWithSSLCertIdResponse {
-	int64 count = 1;
-}
-
 // 查找使用某个SSL证书的所有服务
 message FindAllEnabledServersWithSSLCertIdRequest {
 	int64 certId = 1;
@@ -265,10 +257,6 @@ message CountAllEnabledServersWithCachePolicyIdRequest {
 	int64 cachePolicyId = 1;
 }

-message CountAllEnabledServersWithCachePolicyIdResponse {
-	int64 count = 1;
-}
-
 // 查找使用某个缓存策略的所有服务
 message FindAllEnabledServersWithCachePolicyIdRequest {
 	int64 cachePolicyId = 1;
@@ -283,10 +271,6 @@ message CountAllEnabledServersWithHTTPFirewallPolicyIdRequest {
 	int64 firewallPolicyId = 1;
 }

-message CountAllEnabledServersWithHTTPFirewallPolicyIdResponse {
-	int64 count = 1;
-}
-
 // 查找使用某个WAF策略的所有服务
 message FindAllEnabledServersWithHTTPFirewallPolicyIdRequest {
 	int64 firewallPolicyId = 1;
@@ -301,19 +285,11 @@ message CountAllEnabledServersWithNodeClusterIdRequest {
 	int64 nodeClusterId = 1;
 }

-message CountAllEnabledServersWithNodeClusterIdResponse {
-	int64 count = 1;
-}
-
 // 计算使用某个分组的服务数量
 message CountAllEnabledServersWithGroupIdRequest {
 	int64 groupId = 1;
 }

-message CountAllEnabledServersWithGroupIdResponse {
-	int64 count = 1;
-}
-
 // 通知更新
 message NotifyServersChangeRequest {

--- a/pkg/rpc/protos/service_ssl_cert.proto
+++ b/pkg/rpc/protos/service_ssl_cert.proto
@@ -19,7 +19,7 @@ service SSLCertService {
 	rpc findEnabledSSLCertConfig (FindEnabledSSLCertConfigRequest) returns (FindEnabledSSLCertConfigResponse);

 	// 计算匹配的Cert数量
-	rpc countSSLCerts (CountSSLCertRequest) returns (CountSSLCertResponse);
+	rpc countSSLCerts (CountSSLCertRequest) returns (RPCCountResponse);

 	// 列出单页匹配的Cert
 	rpc listSSLCerts (ListSSLCertsRequest) returns (ListSSLCertsResponse);
@@ -83,10 +83,6 @@ message CountSSLCertRequest {
 	string keyword = 5;
 }

-message CountSSLCertResponse {
-	int64 count = 1;
-}
-
 // 列出单页匹配的Cert
 message ListSSLCertsRequest {
 	bool isCA = 1;