From 3945e94f715255a01da6efd4fe1f26ad3fc2e0c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Mon, 18 Mar 2024 10:18:38 +0800 Subject: [PATCH] =?UTF-8?q?DNS=E6=9C=8D=E5=8A=A1=E5=95=86=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=AF=86=E9=92=A5=E6=95=B0=E6=8D=AE=E4=BB=A5=E6=8E=A9?= =?UTF-8?q?=E7=A0=81=E6=96=B9=E5=BC=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/rpc.json | 6 +++--- pkg/rpc/pb/service_dns_provider.pb.go | 18 ++++++++++++++---- pkg/rpc/protos/service_dns_provider.proto | 5 +++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/build/rpc.json b/build/rpc.json index 2b65e81..7d0447b 100644 --- a/build/rpc.json +++ b/build/rpc.json @@ -18359,12 +18359,12 @@ }, { "name": "FindEnabledDNSProviderRequest", - "code": "message FindEnabledDNSProviderRequest {\n\tint64 dnsProviderId = 1;\n}", + "code": "message FindEnabledDNSProviderRequest {\n\tint64 dnsProviderId = 1; // DNS服务商ID\n\tbool maskParams = 2; // 是否对参数中的密钥进行掩码\n}", "doc": "查找单个服务商" }, { "name": "FindEnabledDNSProviderResponse", - "code": "message FindEnabledDNSProviderResponse {\n\tDNSProvider dnsProvider = 1;\n}", + "code": "message FindEnabledDNSProviderResponse {\n\tDNSProvider dnsProvider = 1; // DNS服务商信息\n}", "doc": "" }, { @@ -23826,7 +23826,7 @@ }, { "name": "json:http_firewall_ref", - "content": "# HTTP防火墙（即WAF）引用\n## 定义\n~~~json\n{\n \"isPrior\": \"是否覆盖上级配置\",\n \"isOn\": \"是否启用配置\",\n \"firewallPolicyId\": \"WAF策略ID\"\n}\n~~~\n\n## 示例\n~~~json\n{\n \"isPrior\": true,\n \"isOn\": true,\n \"firewallPolicyId\": 123\n}\n~~~" + "content": "# HTTP防火墙（即WAF）引用\n## 定义\n~~~json\n{\n \"isPrior\": \"是否覆盖上级配置\",\n \"isOn\": \"是否启用配置\",\n \"firewallPolicyId\": \"WAF策略ID\",\n \"ignoreGlobalRules\": \"是否忽略系统定义的全局规则\",\n \"defaultCaptchaType\": \"默认人机识别方式，可以选none（不设置）、default（默认）、oneClick（单击验证）、slide（滑动解锁）、geetest（极验）\"\n}\n~~~\n\n## 示例\n~~~json\n{\n \"isPrior\": true,\n \"isOn\": true,\n \"firewallPolicyId\": 123,\n \"ignoreGlobalRules\": false,\n \"defaultCaptchaType\": \"none\"\n}\n~~~" }, { "name": "json:http_protocol", diff --git a/pkg/rpc/pb/service_dns_provider.pb.go b/pkg/rpc/pb/service_dns_provider.pb.go index 3cb596b..9ae7beb 100644 --- a/pkg/rpc/pb/service_dns_provider.pb.go +++ b/pkg/rpc/pb/service_dns_provider.pb.go @@ -575,7 +575,8 @@ type FindEnabledDNSProviderRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DnsProviderId int64 `protobuf:"varint,1,opt,name=dnsProviderId,proto3" json:"dnsProviderId,omitempty"` + DnsProviderId int64 `protobuf:"varint,1,opt,name=dnsProviderId,proto3" json:"dnsProviderId,omitempty"` // DNS服务商ID + MaskParams bool `protobuf:"varint,2,opt,name=maskParams,proto3" json:"maskParams,omitempty"` // 是否对参数中的密钥进行掩码 } func (x *FindEnabledDNSProviderRequest) Reset() { @@ -617,12 +618,19 @@ func (x *FindEnabledDNSProviderRequest) GetDnsProviderId() int64 { return 0 } +func (x *FindEnabledDNSProviderRequest) GetMaskParams() bool { + if x != nil { + return x.MaskParams + } + return false +} + type FindEnabledDNSProviderResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DnsProvider *DNSProvider `protobuf:"bytes,1,opt,name=dnsProvider,proto3" json:"dnsProvider,omitempty"` + DnsProvider *DNSProvider `protobuf:"bytes,1,opt,name=dnsProvider,proto3" json:"dnsProvider,omitempty"` // DNS服务商信息 } func (x *FindEnabledDNSProviderResponse) Reset() { @@ -978,11 +986,13 @@ var file_service_dns_provider_proto_rawDesc = []byte{ 0x4e, 0x53, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x64, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x64, 0x6e, 0x73, 0x50, 0x72, 0x6f, - 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x22, 0x45, 0x0a, 0x1d, 0x46, 0x69, 0x6e, 0x64, 0x45, + 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x22, 0x65, 0x0a, 0x1d, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x44, 0x4e, 0x53, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x64, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x0d, 0x64, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x22, 0x53, + 0x0d, 0x64, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, + 0x0a, 0x0a, 0x6d, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x0a, 0x6d, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x53, 0x0a, 0x1e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x44, 0x4e, 0x53, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x0b, 0x64, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, diff --git a/pkg/rpc/protos/service_dns_provider.proto b/pkg/rpc/protos/service_dns_provider.proto index a0e8bbf..2f675eb 100644 --- a/pkg/rpc/protos/service_dns_provider.proto +++ b/pkg/rpc/protos/service_dns_provider.proto @@ -95,11 +95,12 @@ message DeleteDNSProviderRequest { // 查找单个服务商 message FindEnabledDNSProviderRequest { - int64 dnsProviderId = 1; + int64 dnsProviderId = 1; // DNS服务商ID + bool maskParams = 2; // 是否对参数中的密钥进行掩码 } message FindEnabledDNSProviderResponse { - DNSProvider dnsProvider = 1; + DNSProvider dnsProvider = 1; // DNS服务商信息 } // 取得所有服务商类型