DNS服务商中的密钥数据以掩码方式显示

build/rpc.json

@@ -787,7 +787,18 @@
           "requestMessageName": "CheckAdminUsernameRequest",
           "responseMessageName": "CheckAdminUsernameResponse",
           "code": "rpc checkAdminUsername (CheckAdminUsernameRequest) returns (CheckAdminUsernameResponse);",
-          "doc": "检查用户名是否存在",
+          "doc": "检查管理员用户名是否存在",
+          "roles": [
+            "admin"
+          ],
+          "isDeprecated": false
+        },
+        {
+          "name": "findAdminWithUsername",
+          "requestMessageName": "FindAdminWithUsernameRequest",
+          "responseMessageName": "FindAdminWithUsernameResponse",
+          "code": "rpc findAdminWithUsername(FindAdminWithUsernameRequest) returns (FindAdminWithUsernameResponse);",
+          "doc": "使用用管理员户名查找管理员信息",
           "roles": [
             "admin"
           ],
@@ -9953,7 +9964,7 @@
           "requestMessageName": "FindAllEnabledRegionProvincesWithCountryIdRequest",
           "responseMessageName": "FindAllEnabledRegionProvincesWithCountryIdResponse",
           "code": "rpc findAllEnabledRegionProvincesWithCountryId (FindAllEnabledRegionProvincesWithCountryIdRequest) returns (FindAllEnabledRegionProvincesWithCountryIdResponse) {\n\t\toption deprecated = true;\n\t};\n\n\t// 查找单个省份信息\n\trpc findEnabledRegionProvince (FindEnabledRegionProvinceRequest) returns (FindEnabledRegionProvinceResponse) {\n\t\toption deprecated = true;\n\t};",
-          "doc": "查找所有省份",
+          "doc": "根据国家|地区ID查找所有省份",
           "roles": [],
           "isDeprecated": true
         },
@@ -9962,10 +9973,22 @@
           "requestMessageName": "FindAllRegionProvincesWithRegionCountryIdRequest",
           "responseMessageName": "FindAllRegionProvincesWithRegionCountryIdResponse",
           "code": "rpc findAllRegionProvincesWithRegionCountryId (FindAllRegionProvincesWithRegionCountryIdRequest) returns (FindAllRegionProvincesWithRegionCountryIdResponse);",
-          "doc": "查找所有省份",
+          "doc": "根据国家|地区ID查找所有省份",
           "roles": [],
           "isDeprecated": false
         },
+        {
+          "name": "findAllRegionProvinces",
+          "requestMessageName": "FindAllRegionProvincesRequest",
+          "responseMessageName": "FindAllRegionProvincesResponse",
+          "code": "rpc findAllRegionProvinces(FindAllRegionProvincesRequest) returns (FindAllRegionProvincesResponse);",
+          "doc": "查找所有国家|地区的所有省份",
+          "roles": [
+            "admin",
+            "user"
+          ],
+          "isDeprecated": false
+        },
         {
           "name": "findRegionProvince",
           "requestMessageName": "FindRegionProvinceRequest",
@@ -14187,7 +14210,7 @@
     {
       "name": "CheckAdminUsernameRequest",
       "code": "message CheckAdminUsernameRequest {\n\tint64 adminId = 1;\n\tstring username = 2;\n}",
-      "doc": "检查用户名是否存在"
+      "doc": "检查管理员用户名是否存在"
     },
     {
       "name": "CheckAdminUsernameResponse",
@@ -16954,6 +16977,16 @@
       "code": "message FindAdminFullnameResponse {\n\tstring fullname = 1;\n}",
       "doc": ""
     },
+    {
+      "name": "FindAdminWithUsernameRequest",
+      "code": "message FindAdminWithUsernameRequest {\n\tstring username = 1; // 管理员用户名\n}",
+      "doc": "使用用管理员户名查找管理员信息"
+    },
+    {
+      "name": "FindAdminWithUsernameResponse",
+      "code": "message FindAdminWithUsernameResponse {\n\tAdmin admin = 1; // 管理员信息\n}",
+      "doc": ""
+    },
     {
       "name": "FindAllACMEProviderAccountsWithProviderCodeRequest",
       "code": "message FindAllACMEProviderAccountsWithProviderCodeRequest {\n\tstring acmeProviderCode = 1;\n}",
@@ -17591,12 +17624,12 @@
     },
     {
       "name": "FindAllEnabledRegionProvincesWithCountryIdRequest",
-      "code": "message FindAllEnabledRegionProvincesWithCountryIdRequest {\n\tint64 regionCountryId = 1;\n}",
+      "code": "message FindAllEnabledRegionProvincesWithCountryIdRequest {\n\tint64 regionCountryId = 1; // 国家|地区ID\n}",
-      "doc": "查找所有省份"
+      "doc": "根据国家|地区ID查找所有省份"
     },
     {
       "name": "FindAllEnabledRegionProvincesWithCountryIdResponse",
-      "code": "message FindAllEnabledRegionProvincesWithCountryIdResponse {\n\trepeated RegionProvince regionProvinces = 1;\n}",
+      "code": "message FindAllEnabledRegionProvincesWithCountryIdResponse {\n\trepeated RegionProvince regionProvinces = 1; // 省份列表\n}",
       "doc": ""
     },
     {
@@ -17919,14 +17952,24 @@
       "code": "message FindAllRegionProvidersResponse {\n\trepeated RegionProvider regionProviders = 1;\n}",
       "doc": ""
     },
+    {
+      "name": "FindAllRegionProvincesRequest",
+      "code": "message FindAllRegionProvincesRequest {\n\n}",
+      "doc": "查找所有国家|地区的所有省份"
+    },
+    {
+      "name": "FindAllRegionProvincesResponse",
+      "code": "message FindAllRegionProvincesResponse {\n\trepeated RegionProvince regionProvinces = 1; // 省份列表\n}",
+      "doc": ""
+    },
     {
       "name": "FindAllRegionProvincesWithRegionCountryIdRequest",
-      "code": "message FindAllRegionProvincesWithRegionCountryIdRequest {\n\tint64 regionCountryId = 1;\n}",
+      "code": "message FindAllRegionProvincesWithRegionCountryIdRequest {\n\tint64 regionCountryId = 1; // 国家|地区ID\n}",
-      "doc": "查找所有省份"
+      "doc": "根据国家|地区ID查找所有省份"
     },
     {
       "name": "FindAllRegionProvincesWithRegionCountryIdResponse",
-      "code": "message FindAllRegionProvincesWithRegionCountryIdResponse {\n\trepeated RegionProvince regionProvinces = 1;\n}",
+      "code": "message FindAllRegionProvincesWithRegionCountryIdResponse {\n\trepeated RegionProvince regionProvinces = 1; // 省份列表\n}",
       "doc": ""
     },
     {
@@ -18316,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": ""
     },
     {
@@ -18896,12 +18939,12 @@
     },
     {
       "name": "FindEnabledRegionProvinceRequest",
-      "code": "message FindEnabledRegionProvinceRequest {\n\tint64 regionProvinceId = 1;\n}",
+      "code": "message FindEnabledRegionProvinceRequest {\n\tint64 regionProvinceId = 1; // 省份ID\n}",
       "doc": "查找单个省份信息"
     },
     {
       "name": "FindEnabledRegionProvinceResponse",
-      "code": "message FindEnabledRegionProvinceResponse {\n\tRegionProvince regionProvince = 1;\n}",
+      "code": "message FindEnabledRegionProvinceResponse {\n\tRegionProvince regionProvince = 1; // 省份信息\n}",
       "doc": ""
     },
     {
@@ -20081,12 +20124,12 @@
     },
     {
       "name": "FindRegionProvinceRequest",
-      "code": "message FindRegionProvinceRequest {\n\tint64 regionProvinceId = 1;\n}",
+      "code": "message FindRegionProvinceRequest {\n\tint64 regionProvinceId = 1; // 省份ID\n}",
       "doc": "查找单个省份信息"
     },
     {
       "name": "FindRegionProvinceResponse",
-      "code": "message FindRegionProvinceResponse {\n\tRegionProvince regionProvince = 1;\n}",
+      "code": "message FindRegionProvinceResponse {\n\tRegionProvince regionProvince = 1; // 省份信息\n}",
       "doc": ""
     },
     {
@@ -20561,7 +20604,7 @@
     },
     {
       "name": "HTTPCacheTaskKey",
-      "code": "message HTTPCacheTaskKey {\n\tint64 id = 1; // 缓存键ID\n\tint64 taskId = 2; // 任务ID\n\tstring key = 3; // 缓存键\n\tstring type = 4; // 操作类型：purge|fetch\n\tstring keyType = 5; // 键类型：key|prefix\n\tbool isDone = 6; // 是否已完成\n\tbool isDoing = 9; // 是否执行中\n\tbytes errorsJSON = 7; // 错误信息\n\tint64 nodeClusterId = 8; // 所属集群ID\n}",
+      "code": "message HTTPCacheTaskKey {\n\tint64 id = 1; // 缓存键ID\n\tint64 taskId = 2; // 任务ID\n\tstring key = 3; // 缓存键\n\tstring type = 4; // 操作类型：purge|fetch\n\tstring keyType = 5; // 键类型：key|prefix\n\tbool isDone = 6; // 是否已完成\n\tbool isDoing = 9; // 是否执行中\n\tbytes errorsJSON = 7; // 错误信息\n\tint64 nodeClusterId = 8; // 所属集群ID\n\n\tNodeCluster nodeCluster = 30; // 所属集群，不一定有内容\n}",
       "doc": ""
     },
     {
@@ -21866,7 +21909,7 @@
     },
     {
       "name": "RegionCountry",
-      "code": "message RegionCountry {\n\tint64 id = 1;\n\tstring name = 2;\n\trepeated string codes = 3;\n\trepeated string pinyin = 4;\n\tstring customName = 5;\n\trepeated string customCodes = 6;\n\tstring displayName = 7;\n\tbool isCommon = 8; // 是否常用\n}",
+      "code": "message RegionCountry {\n\tint64 id = 1;\n\tstring name = 2;\n\trepeated string codes = 3;\n\trepeated string pinyin = 4;\n\tstring customName = 5;\n\trepeated string customCodes = 6;\n\tstring displayName = 7;\n\tbool isCommon = 8; // 是否常用\n\tstring routeCode = 9; // 线路代号\n}",
       "doc": "国家/地区"
     },
     {
@@ -21876,8 +21919,8 @@
     },
     {
       "name": "RegionProvince",
-      "code": "message RegionProvince {\n\tint64 id = 1;\n\tstring name = 2;\n\trepeated string codes = 3;\n\tint64 regionCountryId = 4;\n\tstring customName = 5;\n\trepeated string customCodes = 6;\n\tstring displayName = 7;\n}",
+      "code": "message RegionProvince {\n\tint64 id = 1;\n\tstring name = 2;\n\trepeated string codes = 3;\n\tint64 regionCountryId = 4;\n\tstring customName = 5;\n\trepeated string customCodes = 6;\n\tstring displayName = 7;\n\n\tRegionCountry regionCountry = 30; // 国家|地区信息\n}",
-      "doc": ""
+      "doc": "省份｜州|区域信息"
     },
     {
       "name": "RegionTown",
@@ -23246,7 +23289,7 @@
     },
     {
       "name": "UpdateRegionProvinceCustomRequest",
-      "code": "message UpdateRegionProvinceCustomRequest {\n\tint64 regionProvinceId = 1;\n\tstring customName = 2;\n\trepeated string customCodes = 3;\n}",
+      "code": "message UpdateRegionProvinceCustomRequest {\n\tint64 regionProvinceId = 1; // 省份ID\n\tstring customName = 2; // 自定义名称\n\trepeated string customCodes = 3; // 自定义代号\n}",
       "doc": "修改省份定制信息"
     },
     {
@@ -23783,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",

pkg/iplibrary/reader.go

@@ -9,6 +9,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"io"
 	"net"
+	"runtime"
 	"sort"
 	"strconv"
 	"strings"
@@ -36,6 +37,13 @@ func NewReader(reader io.Reader) (*Reader, error) {
 	var libReader = &Reader{
 		regionMap: map[string]*ipRegion{},
 	}
+
+	if runtime.NumCPU() >= 4 /** CPU数量较多的通常有着大内存 **/ {
+		libReader.ipV4Items = make([]ipv4Item, 0, 6_000_000)
+	} else {
+		libReader.ipV4Items = make([]ipv4Item, 0, 600_000)
+	}
+
 	err := libReader.load(reader)
 	if err != nil {
 		return nil, err

pkg/rpc/jsons/http_firewall_ref.md

@@ -4,7 +4,9 @@
 {
   "isPrior": "是否覆盖上级配置",
   "isOn": "是否启用配置",
-  "firewallPolicyId": "WAF策略ID"
+  "firewallPolicyId": "WAF策略ID",
+  "ignoreGlobalRules": "是否忽略系统定义的全局规则",
+  "defaultCaptchaType": "默认人机识别方式，可以选none（不设置）、default（默认）、oneClick（单击验证）、slide（滑动解锁）、geetest（极验）"
 }
 ~~~
 
@@ -13,6 +15,8 @@
 {
   "isPrior": true,
   "isOn": true,
-  "firewallPolicyId": 123
+  "firewallPolicyId": 123,
+  "ignoreGlobalRules": false,
+  "defaultCaptchaType": "none"
 }
 ~~~

pkg/rpc/pb/model_http_cache_task_key.pb.go

@@ -25,15 +25,16 @@ type HTTPCacheTaskKey struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id            int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`                       // 缓存键ID
+	Id            int64        `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`                       // 缓存键ID
-	TaskId        int64  `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId,omitempty"`               // 任务ID
+	TaskId        int64        `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId,omitempty"`               // 任务ID
-	Key           string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`                      // 缓存键
+	Key           string       `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"`                      // 缓存键
-	Type          string `protobuf:"bytes,4,opt,name=type,proto3" json:"type,omitempty"`                    // 操作类型：purge|fetch
+	Type          string       `protobuf:"bytes,4,opt,name=type,proto3" json:"type,omitempty"`                    // 操作类型：purge|fetch
-	KeyType       string `protobuf:"bytes,5,opt,name=keyType,proto3" json:"keyType,omitempty"`              // 键类型：key|prefix
+	KeyType       string       `protobuf:"bytes,5,opt,name=keyType,proto3" json:"keyType,omitempty"`              // 键类型：key|prefix
-	IsDone        bool   `protobuf:"varint,6,opt,name=isDone,proto3" json:"isDone,omitempty"`               // 是否已完成
+	IsDone        bool         `protobuf:"varint,6,opt,name=isDone,proto3" json:"isDone,omitempty"`               // 是否已完成
-	IsDoing       bool   `protobuf:"varint,9,opt,name=isDoing,proto3" json:"isDoing,omitempty"`             // 是否执行中
+	IsDoing       bool         `protobuf:"varint,9,opt,name=isDoing,proto3" json:"isDoing,omitempty"`             // 是否执行中
-	ErrorsJSON    []byte `protobuf:"bytes,7,opt,name=errorsJSON,proto3" json:"errorsJSON,omitempty"`        // 错误信息
+	ErrorsJSON    []byte       `protobuf:"bytes,7,opt,name=errorsJSON,proto3" json:"errorsJSON,omitempty"`        // 错误信息
-	NodeClusterId int64  `protobuf:"varint,8,opt,name=nodeClusterId,proto3" json:"nodeClusterId,omitempty"` // 所属集群ID
+	NodeClusterId int64        `protobuf:"varint,8,opt,name=nodeClusterId,proto3" json:"nodeClusterId,omitempty"` // 所属集群ID
+	NodeCluster   *NodeCluster `protobuf:"bytes,30,opt,name=nodeCluster,proto3" json:"nodeCluster,omitempty"`     // 所属集群，不一定有内容
 }
 
 func (x *HTTPCacheTaskKey) Reset() {
@@ -131,29 +132,41 @@ func (x *HTTPCacheTaskKey) GetNodeClusterId() int64 {
 	return 0
 }
 
+func (x *HTTPCacheTaskKey) GetNodeCluster() *NodeCluster {
+	if x != nil {
+		return x.NodeCluster
+	}
+	return nil
+}
+
 var File_models_model_http_cache_task_key_proto protoreflect.FileDescriptor
 
 var file_models_model_http_cache_task_key_proto_rawDesc = []byte{
 	0x0a, 0x26, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x68,
 	0x74, 0x74, 0x70, 0x5f, 0x63, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x6b,
-	0x65, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xf2, 0x01, 0x0a,
+	0x65, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x1f, 0x6d, 0x6f,
-	0x10, 0x48, 0x54, 0x54, 0x50, 0x43, 0x61, 0x63, 0x68, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4b, 0x65,
+	0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f,
-	0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69,
+	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa5, 0x02,
-	0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0a, 0x10, 0x48, 0x54, 0x54, 0x50, 0x43, 0x61, 0x63, 0x68, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4b,
-	0x03, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x65, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x74,
+	0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12,
+	0x28, 0x03, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x18, 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
+	0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x12, 0x0a, 0x04,
-	0x52, 0x07, 0x6b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x44,
+	0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65,
-	0x6f, 0x6e, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x44, 0x6f, 0x6e,
+	0x12, 0x18, 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x65, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x44, 0x6f, 0x69, 0x6e, 0x67, 0x18, 0x09, 0x20, 0x01,
+	0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73,
-	0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x44, 0x6f, 0x69, 0x6e, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x65,
+	0x44, 0x6f, 0x6e, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x44, 0x6f,
-	0x72, 0x72, 0x6f, 0x72, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x6e, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x44, 0x6f, 0x69, 0x6e, 0x67, 0x18, 0x09, 0x20,
-	0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x24, 0x0a, 0x0d, 0x6e,
+	0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x44, 0x6f, 0x69, 0x6e, 0x67, 0x12, 0x1e, 0x0a, 0x0a,
-	0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01,
+	0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c,
-	0x28, 0x03, 0x52, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49,
+	0x52, 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x24, 0x0a, 0x0d,
-	0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x08, 0x20,
-	0x33,
+	0x01, 0x28, 0x03, 0x52, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x49, 0x64, 0x12, 0x31, 0x0a, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x72, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64,
+	0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -171,13 +184,15 @@ func file_models_model_http_cache_task_key_proto_rawDescGZIP() []byte {
 var file_models_model_http_cache_task_key_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_models_model_http_cache_task_key_proto_goTypes = []interface{}{
 	(*HTTPCacheTaskKey)(nil), // 0: pb.HTTPCacheTaskKey
+	(*NodeCluster)(nil),      // 1: pb.NodeCluster
 }
 var file_models_model_http_cache_task_key_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
+	1, // 0: pb.HTTPCacheTaskKey.nodeCluster:type_name -> pb.NodeCluster
-	0, // [0:0] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension extendee
+	1, // [1:1] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for field type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
 }
 
 func init() { file_models_model_http_cache_task_key_proto_init() }
@@ -185,6 +200,7 @@ func file_models_model_http_cache_task_key_proto_init() {
 	if File_models_model_http_cache_task_key_proto != nil {
 		return
 	}
+	file_models_model_node_cluster_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_models_model_http_cache_task_key_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HTTPCacheTaskKey); i {

pkg/rpc/pb/model_region_country.pb.go

@@ -33,7 +33,8 @@ type RegionCountry struct {
 	CustomName  string   `protobuf:"bytes,5,opt,name=customName,proto3" json:"customName,omitempty"`
 	CustomCodes []string `protobuf:"bytes,6,rep,name=customCodes,proto3" json:"customCodes,omitempty"`
 	DisplayName string   `protobuf:"bytes,7,opt,name=displayName,proto3" json:"displayName,omitempty"`
-	IsCommon    bool     `protobuf:"varint,8,opt,name=isCommon,proto3" json:"isCommon,omitempty"` // 是否常用
+	IsCommon    bool     `protobuf:"varint,8,opt,name=isCommon,proto3" json:"isCommon,omitempty"`  // 是否常用
+	RouteCode   string   `protobuf:"bytes,9,opt,name=routeCode,proto3" json:"routeCode,omitempty"` // 线路代号
 }
 
 func (x *RegionCountry) Reset() {
@@ -124,12 +125,19 @@ func (x *RegionCountry) GetIsCommon() bool {
 	return false
 }
 
+func (x *RegionCountry) GetRouteCode() string {
+	if x != nil {
+		return x.RouteCode
+	}
+	return ""
+}
+
 var File_models_model_region_country_proto protoreflect.FileDescriptor
 
 var file_models_model_region_country_proto_rawDesc = []byte{
 	0x0a, 0x21, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x72,
 	0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xe1, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x67, 0x69,
+	0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xff, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x67, 0x69,
 	0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
 	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a,
@@ -143,8 +151,10 @@ var file_models_model_region_country_proto_rawDesc = []byte{
 	0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12,
 	0x1a, 0x0a, 0x08, 0x69, 0x73, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x08, 0x69, 0x73, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x08, 0x52, 0x08, 0x69, 0x73, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x72,
-	0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x72, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pkg/rpc/pb/model_region_province.pb.go

@@ -20,18 +20,20 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+// 省份｜州|区域信息
 type RegionProvince struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id              int64    `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Id              int64          `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	Name            string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Name            string         `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	Codes           []string `protobuf:"bytes,3,rep,name=codes,proto3" json:"codes,omitempty"`
+	Codes           []string       `protobuf:"bytes,3,rep,name=codes,proto3" json:"codes,omitempty"`
-	RegionCountryId int64    `protobuf:"varint,4,opt,name=regionCountryId,proto3" json:"regionCountryId,omitempty"`
+	RegionCountryId int64          `protobuf:"varint,4,opt,name=regionCountryId,proto3" json:"regionCountryId,omitempty"`
-	CustomName      string   `protobuf:"bytes,5,opt,name=customName,proto3" json:"customName,omitempty"`
+	CustomName      string         `protobuf:"bytes,5,opt,name=customName,proto3" json:"customName,omitempty"`
-	CustomCodes     []string `protobuf:"bytes,6,rep,name=customCodes,proto3" json:"customCodes,omitempty"`
+	CustomCodes     []string       `protobuf:"bytes,6,rep,name=customCodes,proto3" json:"customCodes,omitempty"`
-	DisplayName     string   `protobuf:"bytes,7,opt,name=displayName,proto3" json:"displayName,omitempty"`
+	DisplayName     string         `protobuf:"bytes,7,opt,name=displayName,proto3" json:"displayName,omitempty"`
+	RegionCountry   *RegionCountry `protobuf:"bytes,30,opt,name=regionCountry,proto3" json:"regionCountry,omitempty"` // 国家|地区信息
 }
 
 func (x *RegionProvince) Reset() {
@@ -115,27 +117,39 @@ func (x *RegionProvince) GetDisplayName() string {
 	return ""
 }
 
+func (x *RegionProvince) GetRegionCountry() *RegionCountry {
+	if x != nil {
+		return x.RegionCountry
+	}
+	return nil
+}
+
 var File_models_model_region_province_proto protoreflect.FileDescriptor
 
 var file_models_model_region_province_proto_rawDesc = []byte{
 	0x0a, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x72,
 	0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xd8, 0x01, 0x0a, 0x0e, 0x52, 0x65, 0x67,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x21, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73,
-	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e,
+	0x75, 0x6e, 0x74, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x91, 0x02, 0x0a, 0x0e,
-	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x0e,
-	0x14, 0x0a, 0x05, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12,
-	0x63, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
-	0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f,
+	0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x12,
+	0x09, 0x52, 0x05, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x72, 0x65, 0x67, 0x69,
-	0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20,
+	0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x03, 0x52, 0x0f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79,
-	0x20, 0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x06,
+	0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61,
-	0x73, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65,
+	0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65,
-	0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e,
+	0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43,
-	0x61, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x6f, 0x64, 0x65, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x4e,
-	0x74, 0x6f, 0x33,
+	0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x69, 0x73, 0x70, 0x6c,
+	0x61, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x0d, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e,
+	0x70, 0x62, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x0d, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -153,13 +167,15 @@ func file_models_model_region_province_proto_rawDescGZIP() []byte {
 var file_models_model_region_province_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_models_model_region_province_proto_goTypes = []interface{}{
 	(*RegionProvince)(nil), // 0: pb.RegionProvince
+	(*RegionCountry)(nil),  // 1: pb.RegionCountry
 }
 var file_models_model_region_province_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
+	1, // 0: pb.RegionProvince.regionCountry:type_name -> pb.RegionCountry
-	0, // [0:0] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension extendee
+	1, // [1:1] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for field type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
 }
 
 func init() { file_models_model_region_province_proto_init() }
@@ -167,6 +183,7 @@ func file_models_model_region_province_proto_init() {
 	if File_models_model_region_province_proto != nil {
 		return
 	}
+	file_models_model_region_country_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_models_model_region_province_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RegionProvince); i {

pkg/rpc/pb/service_admin_grpc.pb.go

@@ -22,6 +22,7 @@ const (
 	AdminService_LoginAdmin_FullMethodName                = "/pb.AdminService/loginAdmin"
 	AdminService_CheckAdminExists_FullMethodName          = "/pb.AdminService/checkAdminExists"
 	AdminService_CheckAdminUsername_FullMethodName        = "/pb.AdminService/checkAdminUsername"
+	AdminService_FindAdminWithUsername_FullMethodName     = "/pb.AdminService/findAdminWithUsername"
 	AdminService_FindAdminFullname_FullMethodName         = "/pb.AdminService/findAdminFullname"
 	AdminService_FindEnabledAdmin_FullMethodName          = "/pb.AdminService/findEnabledAdmin"
 	AdminService_CreateOrUpdateAdmin_FullMethodName       = "/pb.AdminService/createOrUpdateAdmin"
@@ -47,8 +48,10 @@ type AdminServiceClient interface {
 	LoginAdmin(ctx context.Context, in *LoginAdminRequest, opts ...grpc.CallOption) (*LoginAdminResponse, error)
 	// 检查管理员是否存在
 	CheckAdminExists(ctx context.Context, in *CheckAdminExistsRequest, opts ...grpc.CallOption) (*CheckAdminExistsResponse, error)
-	// 检查用户名是否存在
+	// 检查管理员用户名是否存在
 	CheckAdminUsername(ctx context.Context, in *CheckAdminUsernameRequest, opts ...grpc.CallOption) (*CheckAdminUsernameResponse, error)
+	// 使用用管理员户名查找管理员信息
+	FindAdminWithUsername(ctx context.Context, in *FindAdminWithUsernameRequest, opts ...grpc.CallOption) (*FindAdminWithUsernameResponse, error)
 	// 获取管理员名称
 	FindAdminFullname(ctx context.Context, in *FindAdminFullnameRequest, opts ...grpc.CallOption) (*FindAdminFullnameResponse, error)
 	// 获取管理员信息
@@ -116,6 +119,15 @@ func (c *adminServiceClient) CheckAdminUsername(ctx context.Context, in *CheckAd
 	return out, nil
 }
 
+func (c *adminServiceClient) FindAdminWithUsername(ctx context.Context, in *FindAdminWithUsernameRequest, opts ...grpc.CallOption) (*FindAdminWithUsernameResponse, error) {
+	out := new(FindAdminWithUsernameResponse)
+	err := c.cc.Invoke(ctx, AdminService_FindAdminWithUsername_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *adminServiceClient) FindAdminFullname(ctx context.Context, in *FindAdminFullnameRequest, opts ...grpc.CallOption) (*FindAdminFullnameResponse, error) {
 	out := new(FindAdminFullnameResponse)
 	err := c.cc.Invoke(ctx, AdminService_FindAdminFullname_FullMethodName, in, out, opts...)
@@ -259,8 +271,10 @@ type AdminServiceServer interface {
 	LoginAdmin(context.Context, *LoginAdminRequest) (*LoginAdminResponse, error)
 	// 检查管理员是否存在
 	CheckAdminExists(context.Context, *CheckAdminExistsRequest) (*CheckAdminExistsResponse, error)
-	// 检查用户名是否存在
+	// 检查管理员用户名是否存在
 	CheckAdminUsername(context.Context, *CheckAdminUsernameRequest) (*CheckAdminUsernameResponse, error)
+	// 使用用管理员户名查找管理员信息
+	FindAdminWithUsername(context.Context, *FindAdminWithUsernameRequest) (*FindAdminWithUsernameResponse, error)
 	// 获取管理员名称
 	FindAdminFullname(context.Context, *FindAdminFullnameRequest) (*FindAdminFullnameResponse, error)
 	// 获取管理员信息
@@ -306,6 +320,9 @@ func (UnimplementedAdminServiceServer) CheckAdminExists(context.Context, *CheckA
 func (UnimplementedAdminServiceServer) CheckAdminUsername(context.Context, *CheckAdminUsernameRequest) (*CheckAdminUsernameResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CheckAdminUsername not implemented")
 }
+func (UnimplementedAdminServiceServer) FindAdminWithUsername(context.Context, *FindAdminWithUsernameRequest) (*FindAdminWithUsernameResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindAdminWithUsername not implemented")
+}
 func (UnimplementedAdminServiceServer) FindAdminFullname(context.Context, *FindAdminFullnameRequest) (*FindAdminFullnameResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindAdminFullname not implemented")
 }
@@ -417,6 +434,24 @@ func _AdminService_CheckAdminUsername_Handler(srv interface{}, ctx context.Conte
 	return interceptor(ctx, in, info, handler)
 }
 
+func _AdminService_FindAdminWithUsername_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(FindAdminWithUsernameRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(AdminServiceServer).FindAdminWithUsername(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: AdminService_FindAdminWithUsername_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(AdminServiceServer).FindAdminWithUsername(ctx, req.(*FindAdminWithUsernameRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _AdminService_FindAdminFullname_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(FindAdminFullnameRequest)
 	if err := dec(in); err != nil {
@@ -706,6 +741,10 @@ var AdminService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "checkAdminUsername",
 			Handler:    _AdminService_CheckAdminUsername_Handler,
 		},
+		{
+			MethodName: "findAdminWithUsername",
+			Handler:    _AdminService_FindAdminWithUsername_Handler,
+		},
 		{
 			MethodName: "findAdminFullname",
 			Handler:    _AdminService_FindAdminFullname_Handler,

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,

pkg/rpc/pb/service_region_province.pb.go

@@ -20,13 +20,13 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// 查找所有省份
+// 根据国家|地区ID查找所有省份
 type FindAllEnabledRegionProvincesWithCountryIdRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RegionCountryId int64 `protobuf:"varint,1,opt,name=regionCountryId,proto3" json:"regionCountryId,omitempty"`
+	RegionCountryId int64 `protobuf:"varint,1,opt,name=regionCountryId,proto3" json:"regionCountryId,omitempty"` // 国家|地区ID
 }
 
 func (x *FindAllEnabledRegionProvincesWithCountryIdRequest) Reset() {
@@ -73,7 +73,7 @@ type FindAllEnabledRegionProvincesWithCountryIdResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RegionProvinces []*RegionProvince `protobuf:"bytes,1,rep,name=regionProvinces,proto3" json:"regionProvinces,omitempty"`
+	RegionProvinces []*RegionProvince `protobuf:"bytes,1,rep,name=regionProvinces,proto3" json:"regionProvinces,omitempty"` // 省份列表
 }
 
 func (x *FindAllEnabledRegionProvincesWithCountryIdResponse) Reset() {
@@ -121,7 +121,7 @@ type FindEnabledRegionProvinceRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RegionProvinceId int64 `protobuf:"varint,1,opt,name=regionProvinceId,proto3" json:"regionProvinceId,omitempty"`
+	RegionProvinceId int64 `protobuf:"varint,1,opt,name=regionProvinceId,proto3" json:"regionProvinceId,omitempty"` // 省份ID
 }
 
 func (x *FindEnabledRegionProvinceRequest) Reset() {
@@ -168,7 +168,7 @@ type FindEnabledRegionProvinceResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RegionProvince *RegionProvince `protobuf:"bytes,1,opt,name=regionProvince,proto3" json:"regionProvince,omitempty"`
+	RegionProvince *RegionProvince `protobuf:"bytes,1,opt,name=regionProvince,proto3" json:"regionProvince,omitempty"` // 省份信息
 }
 
 func (x *FindEnabledRegionProvinceResponse) Reset() {
@@ -210,13 +210,13 @@ func (x *FindEnabledRegionProvinceResponse) GetRegionProvince() *RegionProvince
 	return nil
 }
 
-// 查找所有省份
+// 根据国家|地区ID查找所有省份
 type FindAllRegionProvincesWithRegionCountryIdRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RegionCountryId int64 `protobuf:"varint,1,opt,name=regionCountryId,proto3" json:"regionCountryId,omitempty"`
+	RegionCountryId int64 `protobuf:"varint,1,opt,name=regionCountryId,proto3" json:"regionCountryId,omitempty"` // 国家|地区ID
 }
 
 func (x *FindAllRegionProvincesWithRegionCountryIdRequest) Reset() {
@@ -263,7 +263,7 @@ type FindAllRegionProvincesWithRegionCountryIdResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RegionProvinces []*RegionProvince `protobuf:"bytes,1,rep,name=regionProvinces,proto3" json:"regionProvinces,omitempty"`
+	RegionProvinces []*RegionProvince `protobuf:"bytes,1,rep,name=regionProvinces,proto3" json:"regionProvinces,omitempty"` // 省份列表
 }
 
 func (x *FindAllRegionProvincesWithRegionCountryIdResponse) Reset() {
@@ -305,19 +305,105 @@ func (x *FindAllRegionProvincesWithRegionCountryIdResponse) GetRegionProvinces()
 	return nil
 }
 
+// 查找所有国家|地区的所有省份
+type FindAllRegionProvincesRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *FindAllRegionProvincesRequest) Reset() {
+	*x = FindAllRegionProvincesRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_service_region_province_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FindAllRegionProvincesRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FindAllRegionProvincesRequest) ProtoMessage() {}
+
+func (x *FindAllRegionProvincesRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_service_region_province_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use FindAllRegionProvincesRequest.ProtoReflect.Descriptor instead.
+func (*FindAllRegionProvincesRequest) Descriptor() ([]byte, []int) {
+	return file_service_region_province_proto_rawDescGZIP(), []int{6}
+}
+
+type FindAllRegionProvincesResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	RegionProvinces []*RegionProvince `protobuf:"bytes,1,rep,name=regionProvinces,proto3" json:"regionProvinces,omitempty"` // 省份列表
+}
+
+func (x *FindAllRegionProvincesResponse) Reset() {
+	*x = FindAllRegionProvincesResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_service_region_province_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FindAllRegionProvincesResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FindAllRegionProvincesResponse) ProtoMessage() {}
+
+func (x *FindAllRegionProvincesResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_service_region_province_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use FindAllRegionProvincesResponse.ProtoReflect.Descriptor instead.
+func (*FindAllRegionProvincesResponse) Descriptor() ([]byte, []int) {
+	return file_service_region_province_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *FindAllRegionProvincesResponse) GetRegionProvinces() []*RegionProvince {
+	if x != nil {
+		return x.RegionProvinces
+	}
+	return nil
+}
+
 // 查找单个省份信息
 type FindRegionProvinceRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RegionProvinceId int64 `protobuf:"varint,1,opt,name=regionProvinceId,proto3" json:"regionProvinceId,omitempty"`
+	RegionProvinceId int64 `protobuf:"varint,1,opt,name=regionProvinceId,proto3" json:"regionProvinceId,omitempty"` // 省份ID
 }
 
 func (x *FindRegionProvinceRequest) Reset() {
 	*x = FindRegionProvinceRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_service_region_province_proto_msgTypes[6]
+		mi := &file_service_region_province_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -330,7 +416,7 @@ func (x *FindRegionProvinceRequest) String() string {
 func (*FindRegionProvinceRequest) ProtoMessage() {}
 
 func (x *FindRegionProvinceRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_service_region_province_proto_msgTypes[6]
+	mi := &file_service_region_province_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -343,7 +429,7 @@ func (x *FindRegionProvinceRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FindRegionProvinceRequest.ProtoReflect.Descriptor instead.
 func (*FindRegionProvinceRequest) Descriptor() ([]byte, []int) {
-	return file_service_region_province_proto_rawDescGZIP(), []int{6}
+	return file_service_region_province_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *FindRegionProvinceRequest) GetRegionProvinceId() int64 {
@@ -358,13 +444,13 @@ type FindRegionProvinceResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RegionProvince *RegionProvince `protobuf:"bytes,1,opt,name=regionProvince,proto3" json:"regionProvince,omitempty"`
+	RegionProvince *RegionProvince `protobuf:"bytes,1,opt,name=regionProvince,proto3" json:"regionProvince,omitempty"` // 省份信息
 }
 
 func (x *FindRegionProvinceResponse) Reset() {
 	*x = FindRegionProvinceResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_service_region_province_proto_msgTypes[7]
+		mi := &file_service_region_province_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -377,7 +463,7 @@ func (x *FindRegionProvinceResponse) String() string {
 func (*FindRegionProvinceResponse) ProtoMessage() {}
 
 func (x *FindRegionProvinceResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_service_region_province_proto_msgTypes[7]
+	mi := &file_service_region_province_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -390,7 +476,7 @@ func (x *FindRegionProvinceResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FindRegionProvinceResponse.ProtoReflect.Descriptor instead.
 func (*FindRegionProvinceResponse) Descriptor() ([]byte, []int) {
-	return file_service_region_province_proto_rawDescGZIP(), []int{7}
+	return file_service_region_province_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *FindRegionProvinceResponse) GetRegionProvince() *RegionProvince {
@@ -406,15 +492,15 @@ type UpdateRegionProvinceCustomRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	RegionProvinceId int64    `protobuf:"varint,1,opt,name=regionProvinceId,proto3" json:"regionProvinceId,omitempty"`
+	RegionProvinceId int64    `protobuf:"varint,1,opt,name=regionProvinceId,proto3" json:"regionProvinceId,omitempty"` // 省份ID
-	CustomName       string   `protobuf:"bytes,2,opt,name=customName,proto3" json:"customName,omitempty"`
+	CustomName       string   `protobuf:"bytes,2,opt,name=customName,proto3" json:"customName,omitempty"`              // 自定义名称
-	CustomCodes      []string `protobuf:"bytes,3,rep,name=customCodes,proto3" json:"customCodes,omitempty"`
+	CustomCodes      []string `protobuf:"bytes,3,rep,name=customCodes,proto3" json:"customCodes,omitempty"`            // 自定义代号
 }
 
 func (x *UpdateRegionProvinceCustomRequest) Reset() {
 	*x = UpdateRegionProvinceCustomRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_service_region_province_proto_msgTypes[8]
+		mi := &file_service_region_province_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -427,7 +513,7 @@ func (x *UpdateRegionProvinceCustomRequest) String() string {
 func (*UpdateRegionProvinceCustomRequest) ProtoMessage() {}
 
 func (x *UpdateRegionProvinceCustomRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_service_region_province_proto_msgTypes[8]
+	mi := &file_service_region_province_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -440,7 +526,7 @@ func (x *UpdateRegionProvinceCustomRequest) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use UpdateRegionProvinceCustomRequest.ProtoReflect.Descriptor instead.
 func (*UpdateRegionProvinceCustomRequest) Descriptor() ([]byte, []int) {
-	return file_service_region_province_proto_rawDescGZIP(), []int{8}
+	return file_service_region_province_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *UpdateRegionProvinceCustomRequest) GetRegionProvinceId() int64 {
@@ -510,66 +596,81 @@ var file_service_region_province_proto_rawDesc = []byte{
 	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03,
 	0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72,
 	0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x0f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72,
-	0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x22, 0x47, 0x0a, 0x19, 0x46, 0x69, 0x6e, 0x64, 0x52,
+	0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x22, 0x1f, 0x0a, 0x1d, 0x46, 0x69, 0x6e, 0x64, 0x41,
-	0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71,
+	0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x5e, 0x0a, 0x1e, 0x46, 0x69, 0x6e, 0x64,
-	0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10,
+	0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63,
-	0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64,
+	0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3c, 0x0a, 0x0f, 0x72, 0x65,
-	0x22, 0x58, 0x0a, 0x1a, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72,
+	0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20,
-	0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a,
+	0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50,
-	0x0a, 0x0e, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65,
+	0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x0f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x67, 0x69,
+	0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x22, 0x47, 0x0a, 0x19, 0x46, 0x69, 0x6e, 0x64,
-	0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x0e, 0x72, 0x65, 0x67, 0x69,
+	0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65,
-	0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x91, 0x01, 0x0a, 0x21, 0x55,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69,
+	0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x6e, 0x63, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x10, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x49,
-	0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e,
+	0x64, 0x22, 0x58, 0x0a, 0x1a, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50,
-	0x63, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x72, 0x65, 0x67, 0x69,
+	0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a,
+	0x3a, 0x0a, 0x0e, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63,
-	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x65, 0x67,
-	0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b,
+	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x0e, 0x72, 0x65, 0x67,
-	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
+	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x22, 0x91, 0x01, 0x0a, 0x21,
-	0x09, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x32, 0xee,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76,
-	0x04, 0x0a, 0x15, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63,
+	0x69, 0x6e, 0x63, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xa0, 0x01, 0x0a, 0x2a, 0x66, 0x69, 0x6e,
+	0x74, 0x12, 0x2a, 0x0a, 0x10, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69,
-	0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f,
+	0x6e, 0x63, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x72, 0x65, 0x67,
-	0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f,
+	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a,
-	0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x12, 0x35, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e,
+	0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f,
+	0x09, 0x52, 0x0a, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a,
-	0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f,
+	0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03,
-	0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x36,
+	0x28, 0x09, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x32,
-	0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c,
+	0xcf, 0x05, 0x0a, 0x15, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e,
-	0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65,
+	0x63, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xa0, 0x01, 0x0a, 0x2a, 0x66, 0x69,
-	0x73, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65,
+	0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x6d, 0x0a, 0x19, 0x66,
+	0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43,
+	0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x12, 0x35, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69,
+	0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69,
+	0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43,
+	0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x36, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x45, 0x6e, 0x61, 0x62,
+	0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63,
+	0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x6d, 0x0a, 0x19,
+	0x66, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f,
+	0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x24, 0x2e, 0x70, 0x62, 0x2e, 0x46,
 	0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e,
-	0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x24, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69,
+	0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50,
+	0x25, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64,
-	0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25,
+	0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65,
-	0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x52,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x98, 0x01, 0x0a, 0x29,
-	0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73,
+	0x66, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x98, 0x01, 0x0a, 0x29, 0x66,
+	0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x12, 0x34, 0x2e, 0x70, 0x62, 0x2e, 0x46,
 	0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76,
 	0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43,
-	0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x12, 0x34, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69,
+	0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69,
+	0x35, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69,
-	0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f,
+	0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x52,
-	0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35,
+	0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65,
-	0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5f, 0x0a, 0x16, 0x66, 0x69, 0x6e, 0x64, 0x41, 0x6c,
-	0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65,
+	0x6c, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73,
-	0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x49, 0x64, 0x52, 0x65, 0x73,
+	0x12, 0x21, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x67,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x12, 0x66, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67,
+	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x1d, 0x2e, 0x70, 0x62,
+	0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c,
-	0x2e, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69,
+	0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x52,
-	0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x70, 0x62, 0x2e,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x12, 0x66, 0x69, 0x6e, 0x64, 0x52,
-	0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e,
+	0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x1d, 0x2e,
-	0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x1a, 0x75, 0x70,
+	0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f,
-	0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e,
+	0x76, 0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x70,
-	0x63, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x12, 0x25, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70,
+	0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76,
-	0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e,
+	0x69, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x1a,
-	0x63, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76,
-	0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x42,
+	0x69, 0x6e, 0x63, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x12, 0x25, 0x2e, 0x70, 0x62, 0x2e,
-	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76,
+	0x69, 0x6e, 0x63, 0x65, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73,
+	0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -584,7 +685,7 @@ func file_service_region_province_proto_rawDescGZIP() []byte {
 	return file_service_region_province_proto_rawDescData
 }
 
-var file_service_region_province_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
+var file_service_region_province_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
 var file_service_region_province_proto_goTypes = []interface{}{
 	(*FindAllEnabledRegionProvincesWithCountryIdRequest)(nil),  // 0: pb.FindAllEnabledRegionProvincesWithCountryIdRequest
 	(*FindAllEnabledRegionProvincesWithCountryIdResponse)(nil), // 1: pb.FindAllEnabledRegionProvincesWithCountryIdResponse
@@ -592,32 +693,37 @@ var file_service_region_province_proto_goTypes = []interface{}{
 	(*FindEnabledRegionProvinceResponse)(nil),                  // 3: pb.FindEnabledRegionProvinceResponse
 	(*FindAllRegionProvincesWithRegionCountryIdRequest)(nil),   // 4: pb.FindAllRegionProvincesWithRegionCountryIdRequest
 	(*FindAllRegionProvincesWithRegionCountryIdResponse)(nil),  // 5: pb.FindAllRegionProvincesWithRegionCountryIdResponse
-	(*FindRegionProvinceRequest)(nil),                          // 6: pb.FindRegionProvinceRequest
+	(*FindAllRegionProvincesRequest)(nil),                      // 6: pb.FindAllRegionProvincesRequest
-	(*FindRegionProvinceResponse)(nil),                         // 7: pb.FindRegionProvinceResponse
+	(*FindAllRegionProvincesResponse)(nil),                     // 7: pb.FindAllRegionProvincesResponse
-	(*UpdateRegionProvinceCustomRequest)(nil),                  // 8: pb.UpdateRegionProvinceCustomRequest
+	(*FindRegionProvinceRequest)(nil),                          // 8: pb.FindRegionProvinceRequest
-	(*RegionProvince)(nil),                                     // 9: pb.RegionProvince
+	(*FindRegionProvinceResponse)(nil),                         // 9: pb.FindRegionProvinceResponse
-	(*RPCSuccess)(nil),                                         // 10: pb.RPCSuccess
+	(*UpdateRegionProvinceCustomRequest)(nil),                  // 10: pb.UpdateRegionProvinceCustomRequest
+	(*RegionProvince)(nil),                                     // 11: pb.RegionProvince
+	(*RPCSuccess)(nil),                                         // 12: pb.RPCSuccess
 }
 var file_service_region_province_proto_depIdxs = []int32{
-	9,  // 0: pb.FindAllEnabledRegionProvincesWithCountryIdResponse.regionProvinces:type_name -> pb.RegionProvince
+	11, // 0: pb.FindAllEnabledRegionProvincesWithCountryIdResponse.regionProvinces:type_name -> pb.RegionProvince
-	9,  // 1: pb.FindEnabledRegionProvinceResponse.regionProvince:type_name -> pb.RegionProvince
+	11, // 1: pb.FindEnabledRegionProvinceResponse.regionProvince:type_name -> pb.RegionProvince
-	9,  // 2: pb.FindAllRegionProvincesWithRegionCountryIdResponse.regionProvinces:type_name -> pb.RegionProvince
+	11, // 2: pb.FindAllRegionProvincesWithRegionCountryIdResponse.regionProvinces:type_name -> pb.RegionProvince
-	9,  // 3: pb.FindRegionProvinceResponse.regionProvince:type_name -> pb.RegionProvince
+	11, // 3: pb.FindAllRegionProvincesResponse.regionProvinces:type_name -> pb.RegionProvince
-	0,  // 4: pb.RegionProvinceService.findAllEnabledRegionProvincesWithCountryId:input_type -> pb.FindAllEnabledRegionProvincesWithCountryIdRequest
+	11, // 4: pb.FindRegionProvinceResponse.regionProvince:type_name -> pb.RegionProvince
-	2,  // 5: pb.RegionProvinceService.findEnabledRegionProvince:input_type -> pb.FindEnabledRegionProvinceRequest
+	0,  // 5: pb.RegionProvinceService.findAllEnabledRegionProvincesWithCountryId:input_type -> pb.FindAllEnabledRegionProvincesWithCountryIdRequest
-	4,  // 6: pb.RegionProvinceService.findAllRegionProvincesWithRegionCountryId:input_type -> pb.FindAllRegionProvincesWithRegionCountryIdRequest
+	2,  // 6: pb.RegionProvinceService.findEnabledRegionProvince:input_type -> pb.FindEnabledRegionProvinceRequest
-	6,  // 7: pb.RegionProvinceService.findRegionProvince:input_type -> pb.FindRegionProvinceRequest
+	4,  // 7: pb.RegionProvinceService.findAllRegionProvincesWithRegionCountryId:input_type -> pb.FindAllRegionProvincesWithRegionCountryIdRequest
-	8,  // 8: pb.RegionProvinceService.updateRegionProvinceCustom:input_type -> pb.UpdateRegionProvinceCustomRequest
+	6,  // 8: pb.RegionProvinceService.findAllRegionProvinces:input_type -> pb.FindAllRegionProvincesRequest
-	1,  // 9: pb.RegionProvinceService.findAllEnabledRegionProvincesWithCountryId:output_type -> pb.FindAllEnabledRegionProvincesWithCountryIdResponse
+	8,  // 9: pb.RegionProvinceService.findRegionProvince:input_type -> pb.FindRegionProvinceRequest
-	3,  // 10: pb.RegionProvinceService.findEnabledRegionProvince:output_type -> pb.FindEnabledRegionProvinceResponse
+	10, // 10: pb.RegionProvinceService.updateRegionProvinceCustom:input_type -> pb.UpdateRegionProvinceCustomRequest
-	5,  // 11: pb.RegionProvinceService.findAllRegionProvincesWithRegionCountryId:output_type -> pb.FindAllRegionProvincesWithRegionCountryIdResponse
+	1,  // 11: pb.RegionProvinceService.findAllEnabledRegionProvincesWithCountryId:output_type -> pb.FindAllEnabledRegionProvincesWithCountryIdResponse
-	7,  // 12: pb.RegionProvinceService.findRegionProvince:output_type -> pb.FindRegionProvinceResponse
+	3,  // 12: pb.RegionProvinceService.findEnabledRegionProvince:output_type -> pb.FindEnabledRegionProvinceResponse
-	10, // 13: pb.RegionProvinceService.updateRegionProvinceCustom:output_type -> pb.RPCSuccess
+	5,  // 13: pb.RegionProvinceService.findAllRegionProvincesWithRegionCountryId:output_type -> pb.FindAllRegionProvincesWithRegionCountryIdResponse
-	9,  // [9:14] is the sub-list for method output_type
+	7,  // 14: pb.RegionProvinceService.findAllRegionProvinces:output_type -> pb.FindAllRegionProvincesResponse
-	4,  // [4:9] is the sub-list for method input_type
+	9,  // 15: pb.RegionProvinceService.findRegionProvince:output_type -> pb.FindRegionProvinceResponse
-	4,  // [4:4] is the sub-list for extension type_name
+	12, // 16: pb.RegionProvinceService.updateRegionProvinceCustom:output_type -> pb.RPCSuccess
-	4,  // [4:4] is the sub-list for extension extendee
+	11, // [11:17] is the sub-list for method output_type
-	0,  // [0:4] is the sub-list for field type_name
+	5,  // [5:11] is the sub-list for method input_type
+	5,  // [5:5] is the sub-list for extension type_name
+	5,  // [5:5] is the sub-list for extension extendee
+	0,  // [0:5] is the sub-list for field type_name
 }
 
 func init() { file_service_region_province_proto_init() }
@@ -701,7 +807,7 @@ func file_service_region_province_proto_init() {
 			}
 		}
 		file_service_region_province_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FindRegionProvinceRequest); i {
+			switch v := v.(*FindAllRegionProvincesRequest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -713,7 +819,7 @@ func file_service_region_province_proto_init() {
 			}
 		}
 		file_service_region_province_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*FindRegionProvinceResponse); i {
+			switch v := v.(*FindAllRegionProvincesResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -725,6 +831,30 @@ func file_service_region_province_proto_init() {
 			}
 		}
 		file_service_region_province_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FindRegionProvinceRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_service_region_province_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FindRegionProvinceResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_service_region_province_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateRegionProvinceCustomRequest); i {
 			case 0:
 				return &v.state
@@ -743,7 +873,7 @@ func file_service_region_province_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_service_region_province_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   9,
+			NumMessages:   11,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

pkg/rpc/pb/service_region_province_grpc.pb.go

@@ -22,6 +22,7 @@ const (
 	RegionProvinceService_FindAllEnabledRegionProvincesWithCountryId_FullMethodName = "/pb.RegionProvinceService/findAllEnabledRegionProvincesWithCountryId"
 	RegionProvinceService_FindEnabledRegionProvince_FullMethodName                  = "/pb.RegionProvinceService/findEnabledRegionProvince"
 	RegionProvinceService_FindAllRegionProvincesWithRegionCountryId_FullMethodName  = "/pb.RegionProvinceService/findAllRegionProvincesWithRegionCountryId"
+	RegionProvinceService_FindAllRegionProvinces_FullMethodName                     = "/pb.RegionProvinceService/findAllRegionProvinces"
 	RegionProvinceService_FindRegionProvince_FullMethodName                         = "/pb.RegionProvinceService/findRegionProvince"
 	RegionProvinceService_UpdateRegionProvinceCustom_FullMethodName                 = "/pb.RegionProvinceService/updateRegionProvinceCustom"
 )
@@ -31,13 +32,15 @@ const (
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type RegionProvinceServiceClient interface {
 	// Deprecated: Do not use.
-	// 查找所有省份
+	// 根据国家|地区ID查找所有省份
 	FindAllEnabledRegionProvincesWithCountryId(ctx context.Context, in *FindAllEnabledRegionProvincesWithCountryIdRequest, opts ...grpc.CallOption) (*FindAllEnabledRegionProvincesWithCountryIdResponse, error)
 	// Deprecated: Do not use.
 	// 查找单个省份信息
 	FindEnabledRegionProvince(ctx context.Context, in *FindEnabledRegionProvinceRequest, opts ...grpc.CallOption) (*FindEnabledRegionProvinceResponse, error)
-	// 查找所有省份
+	// 根据国家|地区ID查找所有省份
 	FindAllRegionProvincesWithRegionCountryId(ctx context.Context, in *FindAllRegionProvincesWithRegionCountryIdRequest, opts ...grpc.CallOption) (*FindAllRegionProvincesWithRegionCountryIdResponse, error)
+	// 查找所有国家|地区的所有省份
+	FindAllRegionProvinces(ctx context.Context, in *FindAllRegionProvincesRequest, opts ...grpc.CallOption) (*FindAllRegionProvincesResponse, error)
 	// 查找单个省份信息
 	FindRegionProvince(ctx context.Context, in *FindRegionProvinceRequest, opts ...grpc.CallOption) (*FindRegionProvinceResponse, error)
 	// 修改国家/地区定制信息
@@ -81,6 +84,15 @@ func (c *regionProvinceServiceClient) FindAllRegionProvincesWithRegionCountryId(
 	return out, nil
 }
 
+func (c *regionProvinceServiceClient) FindAllRegionProvinces(ctx context.Context, in *FindAllRegionProvincesRequest, opts ...grpc.CallOption) (*FindAllRegionProvincesResponse, error) {
+	out := new(FindAllRegionProvincesResponse)
+	err := c.cc.Invoke(ctx, RegionProvinceService_FindAllRegionProvinces_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *regionProvinceServiceClient) FindRegionProvince(ctx context.Context, in *FindRegionProvinceRequest, opts ...grpc.CallOption) (*FindRegionProvinceResponse, error) {
 	out := new(FindRegionProvinceResponse)
 	err := c.cc.Invoke(ctx, RegionProvinceService_FindRegionProvince_FullMethodName, in, out, opts...)
@@ -104,13 +116,15 @@ func (c *regionProvinceServiceClient) UpdateRegionProvinceCustom(ctx context.Con
 // for forward compatibility
 type RegionProvinceServiceServer interface {
 	// Deprecated: Do not use.
-	// 查找所有省份
+	// 根据国家|地区ID查找所有省份
 	FindAllEnabledRegionProvincesWithCountryId(context.Context, *FindAllEnabledRegionProvincesWithCountryIdRequest) (*FindAllEnabledRegionProvincesWithCountryIdResponse, error)
 	// Deprecated: Do not use.
 	// 查找单个省份信息
 	FindEnabledRegionProvince(context.Context, *FindEnabledRegionProvinceRequest) (*FindEnabledRegionProvinceResponse, error)
-	// 查找所有省份
+	// 根据国家|地区ID查找所有省份
 	FindAllRegionProvincesWithRegionCountryId(context.Context, *FindAllRegionProvincesWithRegionCountryIdRequest) (*FindAllRegionProvincesWithRegionCountryIdResponse, error)
+	// 查找所有国家|地区的所有省份
+	FindAllRegionProvinces(context.Context, *FindAllRegionProvincesRequest) (*FindAllRegionProvincesResponse, error)
 	// 查找单个省份信息
 	FindRegionProvince(context.Context, *FindRegionProvinceRequest) (*FindRegionProvinceResponse, error)
 	// 修改国家/地区定制信息
@@ -130,6 +144,9 @@ func (UnimplementedRegionProvinceServiceServer) FindEnabledRegionProvince(contex
 func (UnimplementedRegionProvinceServiceServer) FindAllRegionProvincesWithRegionCountryId(context.Context, *FindAllRegionProvincesWithRegionCountryIdRequest) (*FindAllRegionProvincesWithRegionCountryIdResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindAllRegionProvincesWithRegionCountryId not implemented")
 }
+func (UnimplementedRegionProvinceServiceServer) FindAllRegionProvinces(context.Context, *FindAllRegionProvincesRequest) (*FindAllRegionProvincesResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method FindAllRegionProvinces not implemented")
+}
 func (UnimplementedRegionProvinceServiceServer) FindRegionProvince(context.Context, *FindRegionProvinceRequest) (*FindRegionProvinceResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindRegionProvince not implemented")
 }
@@ -202,6 +219,24 @@ func _RegionProvinceService_FindAllRegionProvincesWithRegionCountryId_Handler(sr
 	return interceptor(ctx, in, info, handler)
 }
 
+func _RegionProvinceService_FindAllRegionProvinces_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(FindAllRegionProvincesRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(RegionProvinceServiceServer).FindAllRegionProvinces(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: RegionProvinceService_FindAllRegionProvinces_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(RegionProvinceServiceServer).FindAllRegionProvinces(ctx, req.(*FindAllRegionProvincesRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _RegionProvinceService_FindRegionProvince_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(FindRegionProvinceRequest)
 	if err := dec(in); err != nil {
@@ -257,6 +292,10 @@ var RegionProvinceService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "findAllRegionProvincesWithRegionCountryId",
 			Handler:    _RegionProvinceService_FindAllRegionProvincesWithRegionCountryId_Handler,
 		},
+		{
+			MethodName: "findAllRegionProvinces",
+			Handler:    _RegionProvinceService_FindAllRegionProvinces_Handler,
+		},
 		{
 			MethodName: "findRegionProvince",
 			Handler:    _RegionProvinceService_FindRegionProvince_Handler,

pkg/rpc/protos/models/model_http_cache_task_key.proto

@@ -3,6 +3,8 @@ option go_package = "./pb";
 
 package pb;
 
+import "models/model_node_cluster.proto";
+
 message HTTPCacheTaskKey {
 	int64 id = 1; // 缓存键ID
 	int64 taskId = 2; // 任务ID
@@ -13,4 +15,6 @@ message HTTPCacheTaskKey {
 	bool isDoing = 9; // 是否执行中
 	bytes errorsJSON = 7; // 错误信息
 	int64 nodeClusterId = 8; // 所属集群ID
+
+	NodeCluster nodeCluster = 30; // 所属集群，不一定有内容
 }

pkg/rpc/protos/models/model_region_country.proto

@@ -13,4 +13,5 @@ message RegionCountry {
 	repeated string customCodes = 6;
 	string displayName = 7;
 	bool isCommon = 8; // 是否常用
+	string routeCode = 9; // 线路代号
 }

pkg/rpc/protos/models/model_region_province.proto

@@ -3,6 +3,9 @@ option go_package = "./pb";
 
 package pb;
 
+import "models/model_region_country.proto";
+
+// 省份｜州|区域信息
 message RegionProvince {
 	int64 id = 1;
 	string name = 2;
@@ -11,4 +14,6 @@ message RegionProvince {
 	string customName = 5;
 	repeated string customCodes = 6;
 	string displayName = 7;
+
+	RegionCountry regionCountry = 30; // 国家|地区信息
 }

pkg/rpc/protos/service_admin.proto

@@ -16,9 +16,12 @@ service AdminService {
 	// 检查管理员是否存在
 	rpc checkAdminExists (CheckAdminExistsRequest) returns (CheckAdminExistsResponse);
 
-	// 检查用户名是否存在
+	// 检查管理员用户名是否存在
 	rpc checkAdminUsername (CheckAdminUsernameRequest) returns (CheckAdminUsernameResponse);
 
+	// 使用用管理员户名查找管理员信息
+	rpc findAdminWithUsername(FindAdminWithUsernameRequest) returns (FindAdminWithUsernameResponse);
+
 	// 获取管理员名称
 	rpc findAdminFullname (FindAdminFullnameRequest) returns (FindAdminFullnameResponse);
 
@@ -87,7 +90,7 @@ message CheckAdminExistsResponse {
 	string message = 2;
 }
 
-// 检查用户名是否存在
+// 检查管理员用户名是否存在
 message CheckAdminUsernameRequest {
 	int64 adminId = 1;
 	string username = 2;
@@ -97,6 +100,15 @@ message CheckAdminUsernameResponse {
 	bool exists = 1;
 }
 
+// 使用用管理员户名查找管理员信息
+message FindAdminWithUsernameRequest {
+	string username = 1; // 管理员用户名
+}
+
+message FindAdminWithUsernameResponse {
+	Admin admin = 1; // 管理员信息
+}
+
 // 获取管理员名称
 message FindAdminFullnameRequest {
 	int64 adminId = 1;

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服务商信息
 }
 
 // 取得所有服务商类型

pkg/rpc/protos/service_region_province.proto

@@ -8,7 +8,7 @@ import "models/rpc_messages.proto";
 
 // 省份相关服务
 service RegionProvinceService {
-	// 查找所有省份
+	// 根据国家|地区ID查找所有省份
 	rpc findAllEnabledRegionProvincesWithCountryId (FindAllEnabledRegionProvincesWithCountryIdRequest) returns (FindAllEnabledRegionProvincesWithCountryIdResponse) {
 		option deprecated = true;
 	};
@@ -18,9 +18,12 @@ service RegionProvinceService {
 		option deprecated = true;
 	};
 
-	// 查找所有省份
+	// 根据国家|地区ID查找所有省份
 	rpc findAllRegionProvincesWithRegionCountryId (FindAllRegionProvincesWithRegionCountryIdRequest) returns (FindAllRegionProvincesWithRegionCountryIdResponse);
 
+	// 查找所有国家|地区的所有省份
+	rpc findAllRegionProvinces(FindAllRegionProvincesRequest) returns (FindAllRegionProvincesResponse);
+
 	// 查找单个省份信息
 	rpc findRegionProvince (FindRegionProvinceRequest) returns (FindRegionProvinceResponse);
 
@@ -28,45 +31,54 @@ service RegionProvinceService {
 	rpc updateRegionProvinceCustom(UpdateRegionProvinceCustomRequest) returns (RPCSuccess);
 }
 
-// 查找所有省份
+// 根据国家|地区ID查找所有省份
 message FindAllEnabledRegionProvincesWithCountryIdRequest {
-	int64 regionCountryId = 1;
+	int64 regionCountryId = 1; // 国家|地区ID
 }
 
 message FindAllEnabledRegionProvincesWithCountryIdResponse {
-	repeated RegionProvince regionProvinces = 1;
+	repeated RegionProvince regionProvinces = 1; // 省份列表
 }
 
 // 查找单个省份信息
 message FindEnabledRegionProvinceRequest {
-	int64 regionProvinceId = 1;
+	int64 regionProvinceId = 1; // 省份ID
 }
 
 message FindEnabledRegionProvinceResponse {
-	RegionProvince regionProvince = 1;
+	RegionProvince regionProvince = 1; // 省份信息
 }
 
-// 查找所有省份
+// 根据国家|地区ID查找所有省份
 message FindAllRegionProvincesWithRegionCountryIdRequest {
-	int64 regionCountryId = 1;
+	int64 regionCountryId = 1; // 国家|地区ID
 }
 
 message FindAllRegionProvincesWithRegionCountryIdResponse {
-	repeated RegionProvince regionProvinces = 1;
+	repeated RegionProvince regionProvinces = 1; // 省份列表
+}
+
+// 查找所有国家|地区的所有省份
+message FindAllRegionProvincesRequest {
+
+}
+
+message FindAllRegionProvincesResponse {
+	repeated RegionProvince regionProvinces = 1; // 省份列表
 }
 
 // 查找单个省份信息
 message FindRegionProvinceRequest {
-	int64 regionProvinceId = 1;
+	int64 regionProvinceId = 1; // 省份ID
 }
 
 message FindRegionProvinceResponse {
-	RegionProvince regionProvince = 1;
+	RegionProvince regionProvince = 1; // 省份信息
 }
 
 // 修改省份定制信息
 message UpdateRegionProvinceCustomRequest {
-	int64 regionProvinceId = 1;
+	int64 regionProvinceId = 1; // 省份ID
-	string customName = 2;
+	string customName = 2; // 自定义名称
-	repeated string customCodes = 3;
+	repeated string customCodes = 3; // 自定义代号
 }

pkg/serverconfigs/domain_mismatch_action.go

@@ -3,8 +3,9 @@ package serverconfigs
 import "github.com/iwind/TeaGo/maps"
 
 const (
-	DomainMismatchActionPage  = "page"
+	DomainMismatchActionPage     = "page"
-	DomainMismatchActionClose = "close"
+	DomainMismatchActionClose    = "close"
+	DomainMismatchActionRedirect = "redirect"
 )
 
 type DomainMismatchPageOptions struct {
@@ -15,6 +16,10 @@ type DomainMismatchPageOptions struct {
 type DomainMismatchCloseOptions struct {
 }
 
+type DomainMismatchRedirectOptions struct {
+	URL string `yaml:"url" json:"url"`
+}
+
 type DomainMismatchAction struct {
 	Code    string   `yaml:"code" json:"code"`       // 动作代号
 	Options maps.Map `yaml:"options" json:"options"` // 动作选项

pkg/serverconfigs/http_page_optimization_config.go

@@ -2,17 +2,6 @@
 
 package serverconfigs
 
-import (
-	"bytes"
-	"github.com/iwind/TeaGo/types"
-	"github.com/tdewolff/minify/v2"
-	"io"
-	"net/http"
-	"strings"
-)
-
-var httpPageOptimizationLimiter = make(chan bool, 64)
-
 type HTTPPageOptimizationMimeType = string
 
 const (
@@ -21,6 +10,10 @@ const (
 	HTTPPageOptimizationMimeTypeCSS        HTTPPageOptimizationMimeType = "text/css"
 )
 
+type HTTPPageMinifier interface {
+	Bytes(mediaType string, data []byte) ([]byte, error)
+}
+
 type HTTPPageOptimizationConfig struct {
 	IsPrior bool `yaml:"isPrior" json:"isPrior"`
 
@@ -28,8 +21,9 @@ type HTTPPageOptimizationConfig struct {
 	Javascript *HTTPJavascriptOptimizationConfig `yaml:"javascript" json:"javascript"`
 	CSS        *HTTPCSSOptimizationConfig        `yaml:"css" json:"css"`
 
-	isOn           bool
+	isOn bool
-	minifyInstance *minify.M
+
+	minifyInstance HTTPPageMinifier
 }
 
 func NewHTTPPageOptimizationConfig() *HTTPPageOptimizationConfig {
@@ -44,11 +38,6 @@ func NewHTTPPageOptimizationConfig() *HTTPPageOptimizationConfig {
 func (this *HTTPPageOptimizationConfig) Init() error {
 	this.isOn = this.CheckIsOn()
 
-	if this.isOn {
-		// MUST NOT create instance for every config
-		this.minifyInstance = minify.New()
-	}
-
 	if this.HTML != nil {
 		err := this.HTML.Init()
 		if err != nil {
@@ -56,8 +45,6 @@ func (this *HTTPPageOptimizationConfig) Init() error {
 		}
 		if this.HTML.IsOn {
 			this.isOn = true
-			this.minifyInstance.Add(HTTPPageOptimizationMimeTypeHTML, this.HTML.AsMinifier())
-
 		}
 	}
 	if this.Javascript != nil {
@@ -67,7 +54,6 @@ func (this *HTTPPageOptimizationConfig) Init() error {
 		}
 		if this.Javascript.IsOn {
 			this.isOn = true
-			this.minifyInstance.Add(HTTPPageOptimizationMimeTypeJavascript, this.Javascript.AsMinifier())
 		}
 	}
 	if this.CSS != nil {
@@ -77,7 +63,6 @@ func (this *HTTPPageOptimizationConfig) Init() error {
 		}
 		if this.CSS.IsOn {
 			this.isOn = true
-			this.minifyInstance.Add(HTTPPageOptimizationMimeTypeCSS, this.CSS.AsMinifier())
 		}
 	}
 
@@ -94,78 +79,10 @@ func (this *HTTPPageOptimizationConfig) CheckIsOn() bool {
 		(this.CSS != nil && this.CSS.IsOn)
 }
 
-func (this *HTTPPageOptimizationConfig) FilterResponse(url string, resp *http.Response) error {
+func (this *HTTPPageOptimizationConfig) InternalInstance() HTTPPageMinifier {
-	if !this.isOn || this.minifyInstance == nil {
+	return this.minifyInstance
-		return nil
-	}
-
-	var contentType = resp.Header.Get("Content-Type")
-	if len(contentType) == 0 {
-		return nil
-	}
-
-	// validate content length
-	if resp.ContentLength <= 0 || resp.ContentLength > (1<<20) {
-		return nil
-	}
-
-	contentType, _, _ = strings.Cut(contentType, ";")
-	var mimeType = ""
-	switch contentType {
-	case "text/html":
-		if this.HTML != nil && this.HTML.IsOn && this.HTML.MatchURL(url) {
-			mimeType = HTTPPageOptimizationMimeTypeHTML
-		}
-	case "text/javascript", "application/javascript":
-		if this.Javascript != nil && this.Javascript.IsOn && this.Javascript.MatchURL(url) {
-			mimeType = HTTPPageOptimizationMimeTypeJavascript
-		}
-	case "text/css":
-		if this.CSS != nil && this.CSS.IsOn && this.CSS.MatchURL(url) {
-			mimeType = HTTPPageOptimizationMimeTypeCSS
-		}
-	default:
-		return nil
-	}
-
-	if len(mimeType) == 0 {
-		return nil
-	}
-
-	// concurrent limiter, to prevent memory overflow
-	select {
-	case httpPageOptimizationLimiter <- true:
-		defer func() {
-			<-httpPageOptimizationLimiter
-		}()
-
-		var contentLength int64
-		var err error
-		resp.Body, contentLength, err = this.minify(mimeType, resp.Body)
-		if err != nil {
-			return err
-		}
-
-		// fix resp.ContentLength and Content-Length header
-		resp.ContentLength = contentLength
-		resp.Header.Set("Content-Length", types.String(contentLength))
-	default:
-	}
-	return nil
 }
 
-func (this *HTTPPageOptimizationConfig) minify(mimeType HTTPPageOptimizationMimeType, rawReader io.ReadCloser) (newReader io.ReadCloser, newContentLength int64, err error) {
+func (this *HTTPPageOptimizationConfig) SetInternalInstance(instance HTTPPageMinifier) {
-
+	this.minifyInstance = instance
-	var rawData []byte
-	rawData, err = io.ReadAll(rawReader)
-	if err != nil {
-		return
-	}
-
-	resultData, err := this.minifyInstance.Bytes(mimeType, rawData)
-	if err != nil {
-		return io.NopCloser(bytes.NewReader(rawData)), int64(len(rawData)), nil // return rawData, and ignore error
-	}
-
-	return io.NopCloser(bytes.NewReader(resultData)), int64(len(resultData)), nil
 }

pkg/serverconfigs/http_page_optimization_css.go

@@ -2,8 +2,6 @@
 
 package serverconfigs
 
-import "github.com/tdewolff/minify/v2/css"
-
 type HTTPCSSOptimizationConfig struct {
 	HTTPBaseOptimizationConfig
 
@@ -26,10 +24,3 @@ func (this *HTTPCSSOptimizationConfig) Init() error {
 	}
 	return nil
 }
-
-func (this *HTTPCSSOptimizationConfig) AsMinifier() *css.Minifier {
-	return &css.Minifier{
-		KeepCSS2:  this.KeepCSS2,
-		Precision: this.Precision,
-	}
-}

pkg/serverconfigs/http_page_optimization_html.go

@@ -2,10 +2,6 @@
 
 package serverconfigs
 
-import (
-	"github.com/tdewolff/minify/v2/html"
-)
-
 type HTTPHTMLOptimizationConfig struct {
 	HTTPBaseOptimizationConfig
 
@@ -36,15 +32,3 @@ func (this *HTTPHTMLOptimizationConfig) Init() error {
 	}
 	return nil
 }
-
-func (this *HTTPHTMLOptimizationConfig) AsMinifier() *html.Minifier {
-	return &html.Minifier{
-		KeepComments:            this.KeepComments,
-		KeepConditionalComments: this.KeepConditionalComments,
-		KeepDefaultAttrVals:     this.KeepDefaultAttrVals,
-		KeepDocumentTags:        this.KeepDocumentTags,
-		KeepEndTags:             this.KeepEndTags,
-		KeepQuotes:              this.KeepQuotes,
-		KeepWhitespace:          this.KeepWhitespace,
-	}
-}

pkg/serverconfigs/http_page_optimization_javascript.go

@@ -2,8 +2,6 @@
 
 package serverconfigs
 
-import "github.com/tdewolff/minify/v2/js"
-
 type HTTPJavascriptOptimizationConfig struct {
 	HTTPBaseOptimizationConfig
 
@@ -25,11 +23,3 @@ func (this *HTTPJavascriptOptimizationConfig) Init() error {
 	}
 	return nil
 }
-
-func (this *HTTPJavascriptOptimizationConfig) AsMinifier() *js.Minifier {
-	return &js.Minifier{
-		Precision:    this.Precision,
-		KeepVarNames: this.KeepVarNames,
-		Version:      this.Version,
-	}
-}

pkg/systemconfigs/settings.go

@@ -15,4 +15,6 @@ const (
 	SettingCodeUserServerConfig   SettingCode = "userServerConfig"   // 用户服务设置
 	SettingCodeUserRegisterConfig SettingCode = "userRegisterConfig" // 用户注册配置
 	SettingCodeUserUIConfig       SettingCode = "userUIConfig"       // 用户界面配置
+
+	SettingCodeStandaloneInstanceInitialized SettingCode = "standaloneInstanceInitialized" // 单体实例是否已经被初始化：0 未被初始化, 1 已经成功初始化
 )

pkg/systemconfigs/user_ui_config.go

@@ -45,7 +45,7 @@ type UserUIConfig struct {
 	Theme ThemeConfig `yaml:"theme" json:"theme"` // 风格模板
 }
 
-func DefaultUserUIConfig() *UserUIConfig {
+func NewUserUIConfig() *UserUIConfig {
 	var config = &UserUIConfig{
 		ProductName:         "GoEdge",
 		UserSystemName:      "GoEdge用户系统",
@@ -55,6 +55,7 @@ func DefaultUserUIConfig() *UserUIConfig {
 		BandwidthUnit:       BandwidthUnitBit,
 		ShowBandwidthCharts: true,
 		ShowTrafficCharts:   true,
+		TimeZone:            "Asia/Shanghai",
 	}
 
 	// 服务相关