用户实现OTP登录

LICENSE

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2020, LiuXiangChao
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,3 +1,5 @@
+GoEdge公共配置项。
+
 目录结构：
 ~~~
 pkg/

build/build.sh

@@ -1,5 +1,23 @@
 #!/usr/bin/env bash
 
+echo "starting ..."
+
 #rm -f ../pkg/rpc/pb/*.pb.go
+
 protoc --go_out=plugins=grpc:../pkg/rpc --proto_path=../pkg/rpc/protos ../pkg/rpc/protos/*.proto
-protoc --go_out=plugins=grpc:../pkg/rpc --proto_path=../pkg/rpc/protos ../pkg/rpc/protos/models/*.proto
+RESULT=$?
+if [ "${RESULT}" != "0" ]; then
+	exit
+fi
+
+RESULT=`protoc --go_out=plugins=grpc:../pkg/rpc --proto_path=../pkg/rpc/protos ../pkg/rpc/protos/models/*.proto`
+RESULT=$?
+if [ "${RESULT}" != "0" ]; then
+	exit
+fi
+
+
+# generate rpc.json
+./proto-json.sh --quiet
+
+echo "ok"

build/proto-json.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+go run ../cmd/proto-json/main.go $1

cmd/proto-json/main.go

@@ -0,0 +1,273 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"github.com/iwind/TeaGo/Tea"
+	_ "github.com/iwind/TeaGo/bootstrap"
+	"github.com/iwind/TeaGo/types"
+	"io/ioutil"
+	"path/filepath"
+	"regexp"
+	"strings"
+)
+
+type ServiceInfo struct {
+	Name     string        `json:"name"`
+	Methods  []*MethodInfo `json:"methods"`
+	Filename string        `json:"filename"`
+	Doc      string        `json:"doc"`
+}
+
+type MethodInfo struct {
+	Name                string `json:"name"`
+	RequestMessageName  string `json:"requestMessageName"`
+	ResponseMessageName string `json:"responseMessageName"`
+	Code                string `json:"code"`
+	Doc                 string `json:"doc"`
+}
+
+type MessageInfo struct {
+	Name string `json:"name"`
+	Code string `json:"code"`
+	Doc  string `json:"doc"`
+}
+
+type LinkInfo struct {
+	Name    string `json:"name"`
+	Content string `json:"content"`
+}
+
+type RPCList struct {
+	Services []*ServiceInfo `json:"services"`
+	Messages []*MessageInfo `json:"messages"`
+	Links    []*LinkInfo    `json:"links"`
+}
+
+func readComments(data []byte) string {
+	var lines = bytes.Split(data, []byte{'\n'})
+	var comments = [][]byte{}
+	for i := len(lines) - 1; i >= 0; i-- {
+		var line = bytes.TrimLeft(lines[i], " \t")
+		if len(line) == 0 {
+			comments = append([][]byte{{' '}}, comments...)
+			continue
+		}
+
+		if bytes.HasPrefix(line, []byte("//")) {
+			line = bytes.TrimSpace(bytes.TrimLeft(line, "/"))
+			comments = append([][]byte{line}, comments...)
+		} else {
+			break
+		}
+	}
+	return string(bytes.TrimSpace(bytes.Join(comments, []byte{'\n'})))
+}
+
+// 生成JSON格式API列表
+func main() {
+	var quiet = false
+	flag.BoolVar(&quiet, "quiet", false, "")
+	flag.Parse()
+
+	var services = []*ServiceInfo{}
+	var messages = []*MessageInfo{}
+
+	{
+		var dirs = []string{Tea.Root + "/../pkg/rpc/protos/", Tea.Root + "/../pkg/rpc/protos/models"}
+		for _, dir := range dirs {
+			func(dir string) {
+				dir = filepath.Clean(dir)
+
+				files, err := filepath.Glob(dir + "/*.proto")
+				if err != nil {
+					fmt.Println("[ERROR]list proto files failed: " + err.Error())
+					return
+				}
+
+				for _, path := range files {
+					func(path string) {
+						data, err := ioutil.ReadFile(path)
+						if err != nil {
+							fmt.Println("[ERROR]" + err.Error())
+							return
+						}
+
+						// 先将rpc代码替换成临时代码
+						var methodCodeMap = map[string][]byte{} // code => method
+						var methodIndex = 0
+						var methodReg = regexp.MustCompile(`rpc\s+(\w+)\s*\(\s*(\w+)\s*\)\s*returns\s*\(\s*(\w+)\s*\)\s*;`)
+						data = methodReg.ReplaceAllFunc(data, func(methodData []byte) []byte {
+							methodIndex++
+							var code = "METHOD" + types.String(methodIndex)
+							methodCodeMap[code] = methodData
+							return []byte("\n" + code)
+						})
+
+						// 服务列表
+						// TODO 这里需要改进一下，当前实现方法如果方法注释里有括号（}），就会导致部分方法解析不到
+						var serviceNameReg = regexp.MustCompile(`(?sU)\n\s*service\s+(\w+)\s*\{(.+)}`)
+						var serviceMatches = serviceNameReg.FindAllSubmatch(data, -1)
+						var serviceNamePositions = serviceNameReg.FindAllIndex(data, -1)
+						for serviceMatchIndex, serviceMatch := range serviceMatches {
+							var serviceName = string(serviceMatch[1])
+							var serviceNamePosition = serviceNamePositions[serviceMatchIndex][0]
+							var comment = readComments(data[:serviceNamePosition])
+
+							// 方法列表
+							var methods = []*MethodInfo{}
+							var serviceData = serviceMatch[2]
+							var methodCodeReg = regexp.MustCompile(`\b(METHOD\d+)\b`)
+							var methodCodeMatches = methodCodeReg.FindAllSubmatch(serviceData, -1)
+							var methodCodePositions = methodCodeReg.FindAllIndex(serviceData, -1)
+							for methodMatchIndex, methodMatch := range methodCodeMatches {
+								var methodCode = string(methodMatch[1])
+								var methodData = methodCodeMap[methodCode]
+								var methodPieces = methodReg.FindSubmatch(methodData)
+								var methodCodePosition = methodCodePositions[methodMatchIndex]
+
+								methods = append(methods, &MethodInfo{
+									Name:                string(methodPieces[1]),
+									RequestMessageName:  string(methodPieces[2]),
+									ResponseMessageName: string(methodPieces[3]),
+									Code:                string(methodData),
+									Doc:                 readComments(serviceData[:methodCodePosition[0]]),
+								})
+							}
+
+							services = append(services, &ServiceInfo{
+								Name:     serviceName,
+								Methods:  methods,
+								Filename: filepath.Base(path),
+								Doc:      comment,
+							})
+						}
+
+						// 消息列表
+						var topMessageCodeMap = map[string][]byte{} // code => message
+						var allMessageCodeMap = map[string][]byte{}
+						var messageCodeIndex = 0
+						var messagesReg = regexp.MustCompile(`(?sU)\n\s*message\s+(\w+)\s*\{([^{}]+)\n\s*}`)
+						var firstMessagesReg = regexp.MustCompile(`message\s+(\w+)`)
+						var messageCodeREG = regexp.MustCompile(`MESSAGE\d+`)
+						for {
+							var hasMessage = false
+
+							data = messagesReg.ReplaceAllFunc(data, func(messageData []byte) []byte {
+								messageCodeIndex++
+								hasMessage = true
+
+								// 是否包含子Message
+								var subMatches = messageCodeREG.FindAllSubmatch(messageData, -1)
+								for _, subMatch := range subMatches {
+									var subMatchCode = string(subMatch[0])
+									delete(topMessageCodeMap, subMatchCode)
+								}
+
+								var code = "MESSAGE" + types.String(messageCodeIndex)
+								topMessageCodeMap[code] = messageData
+								allMessageCodeMap[code] = messageData
+								return []byte("\n" + code)
+							})
+							if !hasMessage {
+								break
+							}
+						}
+
+						for messageCode, messageData := range topMessageCodeMap {
+							// 替换其中的子Message
+							for {
+								if messageCodeREG.Match(messageData) {
+									messageData = messageCodeREG.ReplaceAllFunc(messageData, func(messageCodeData []byte) []byte {
+										return allMessageCodeMap[string(messageCodeData)]
+									})
+								} else {
+									break
+								}
+							}
+
+							// 注释
+							var index = bytes.Index(data, []byte(messageCode))
+							var messageName = string(firstMessagesReg.FindSubmatch(messageData)[1])
+							messages = append(messages, &MessageInfo{
+								Name: messageName,
+								Code: string(bytes.TrimSpace(messageData)),
+								Doc:  readComments(data[:index]),
+							})
+						}
+					}(path)
+				}
+			}(dir)
+		}
+	}
+
+	var countServices = len(services)
+	var countMethods = 0
+	var countMessages = len(messages)
+	for _, service := range services {
+		countMethods += len(service.Methods)
+	}
+
+	// 链接
+	var links = []*LinkInfo{}
+
+	// json links
+	{
+		var dirs = []string{Tea.Root + "/../pkg/rpc/jsons"}
+		for _, dir := range dirs {
+			func(dir string) {
+				dir = filepath.Clean(dir)
+
+				files, err := filepath.Glob(dir + "/*.md")
+				if err != nil {
+					fmt.Println("[ERROR]list .md files failed: " + err.Error())
+					return
+				}
+
+				for _, path := range files {
+					func(path string) {
+						var name = strings.TrimSuffix(filepath.Base(path), ".md")
+						data, err := ioutil.ReadFile(path)
+						if err != nil {
+							fmt.Println("[ERROR]read '" + path + "' failed: " + err.Error())
+							return
+						}
+
+						links = append(links, &LinkInfo{
+							Name:    "json:" + name,
+							Content: string(data),
+						})
+					}(path)
+				}
+			}(dir)
+		}
+	}
+
+	var rpcList = &RPCList{
+		Services: services,
+		Messages: messages,
+		Links:    links,
+	}
+	jsonData, err := json.MarshalIndent(rpcList, "", "  ")
+	if err != nil {
+		fmt.Println("[ERROR]marshal to json failed: " + err.Error())
+		return
+	}
+
+	var jsonFile = Tea.Root + "/rpc.json"
+	err = ioutil.WriteFile(jsonFile, jsonData, 0666)
+	if err != nil {
+		fmt.Println("[ERROR]write json to file failed: " + err.Error())
+		return
+	}
+
+	if !quiet {
+		fmt.Println("services:", countServices, "methods:", countMethods, "messages:", countMessages)
+		fmt.Println("===")
+		fmt.Println("generated " + filepath.Base(jsonFile) + " successfully")
+	}
+}

go.mod

@@ -1,15 +1,18 @@
 module github.com/TeaOSLab/EdgeCommon
 
-go 1.15
+go 1.18
 
 require (
-	github.com/cespare/xxhash/v2 v2.1.1
-	github.com/go-yaml/yaml v2.1.0+incompatible
-	github.com/golang/protobuf v1.4.2
-	github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060
-	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
-	golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 // indirect
-	google.golang.org/grpc v1.32.0
-	google.golang.org/protobuf v1.25.0
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	github.com/golang/protobuf v1.5.2
+	github.com/iwind/TeaGo v0.0.0-20220304043459-0dd944a5b475
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f
+	google.golang.org/grpc v1.45.0
+	google.golang.org/protobuf v1.27.1
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+)
+
+require (
+	golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e // indirect
 )

go.sum

@@ -1,28 +1,35 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200624174652-8d2f3be8b2d9/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-redis/redis/v8 v8.0.0-beta.7/go.mod h1:FGJAWDWFht1sQ4qxyJHZZbVyvnVcKQN0E3u5/5lRz+g=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o=
-github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -34,18 +41,24 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060 h1:qdLtK4PDXxk2vMKkTWl5Fl9xqYuRCukzWAgJbLHdfOo=
-github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/iwind/TeaGo v0.0.0-20220304043459-0dd944a5b475 h1:EseyfFaQOjWanGiby9KMw7PjDBMg/95tLDgIw/ns0Cw=
+github.com/iwind/TeaGo v0.0.0-20220304043459-0dd944a5b475/go.mod h1:HRHK0zoC/og3c9/hKosD9yYVMTnnzm3PgXUdhRYHaLc=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -66,12 +79,17 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 github.com/opentracing/opentracing-go v1.1.1-0.20190913142402-a7454ce5950e/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 go.opentelemetry.io/otel v0.7.0/go.mod h1:aZMyHG5TqDOXEgH2tyLiXSUKly1jT3yqE9PmrzIeCdo=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
@@ -86,17 +104,22 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -111,13 +134,17 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 h1:cEhElsAv9LUt9ZUUocxzWe05oFLVd+AA2nstydTeI8g=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs=
+golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -125,22 +152,27 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e h1:fNKDNuUyC4WH+inqDMpfXDdfvwfYILbsX+oskGZ8hxg=
+google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0=
-google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M=
+google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -149,8 +181,11 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
@@ -158,11 +193,13 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

pkg/configutils/copy.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 )
 
-// 拷贝同类型struct指针对象中的字段
+// CopyStructObject 拷贝同类型struct指针对象中的字段
 func CopyStructObject(destPtr, sourcePtr interface{}) {
 	value := reflect.ValueOf(destPtr)
 	value2 := reflect.ValueOf(sourcePtr)

pkg/configutils/ip.go

@@ -2,27 +2,71 @@ package configutils
 
 import (
 	"encoding/binary"
-	"github.com/cespare/xxhash/v2"
-	"math"
+	"math/big"
 	"net"
 	"strings"
 )
 
-// IP2Long 将IP转换为整型
+// IPString2Long 将IP转换为整型
 // 注意IPv6没有顺序
-func IP2Long(ip string) uint64 {
+func IPString2Long(ip string) uint64 {
 	if len(ip) == 0 {
 		return 0
 	}
-	s := net.ParseIP(ip)
-	if len(s) == 0 {
+	var netIP = net.ParseIP(ip)
+	if len(netIP) == 0 {
+		return 0
+	}
+	return IP2Long(netIP)
+}
+
+// IP2Long 将IP对象转换为整型
+func IP2Long(netIP net.IP) uint64 {
+	if len(netIP) == 0 {
 		return 0
 	}
 
-	if strings.Contains(ip, ":") {
-		return math.MaxUint32 + xxhash.Sum64(s)
+	var b4 = netIP.To4()
+	if b4 != nil {
+		return uint64(binary.BigEndian.Uint32(b4.To4()))
 	}
-	return uint64(binary.BigEndian.Uint32(s.To4()))
+
+	var i = big.NewInt(0)
+	i.SetBytes(netIP.To16())
+	return i.Uint64()
+}
+
+// IsIPv4 检查是否为IPv4
+func IsIPv4(netIP net.IP) bool {
+	if len(netIP) == 0 {
+		return false
+	}
+	return netIP.To4() != nil
+}
+
+// IsIPv6 检查是否为IPv6
+func IsIPv6(netIP net.IP) bool {
+	if len(netIP) == 0 {
+		return false
+	}
+	return netIP.To4() == nil && netIP.To16() != nil
+}
+
+// IPVersion 获取IP版本号
+func IPVersion(netIP net.IP) int {
+	if len(netIP) == 0 {
+		return 0
+	}
+
+	if netIP.To4() != nil {
+		return 4
+	}
+
+	if netIP.To16() != nil {
+		return 6
+	}
+
+	return 0
 }
 
 // ParseCIDR 计算CIDR最大值

pkg/configutils/ip_test.go

@@ -1,11 +1,41 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package configutils
+package configutils_test
 
-import "testing"
+import (
+	"fmt"
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
+	"github.com/iwind/TeaGo/assert"
+	"net"
+	"testing"
+)
 
 func TestParseCIDR(t *testing.T) {
-	t.Log(ParseCIDR("192.168.1.1/32"))
-	t.Log(ParseCIDR("192.168.1.1/24"))
-	t.Log(ParseCIDR("192.168.1.1/16"))
+	t.Log(configutils.ParseCIDR("192.168.1.1/32"))
+	t.Log(configutils.ParseCIDR("192.168.1.1/24"))
+	t.Log(configutils.ParseCIDR("192.168.1.1/16"))
+}
+
+func TestIPString2Long(t *testing.T) {
+	for _, ip := range []string{"127.0.0.1", "192.168.1.100", "::1", "fd00:6868:6868:0:10ac:d056:3bf6:7452", "fd00:6868:6868:0:10ac:d056:3bf6:7453", "2001:0db8:85a3:0000:0000:8a2e:0370:7334", "wrong ip"} {
+		t.Log(fmt.Sprintf("%42s", ip), "=>", configutils.IPString2Long(ip))
+	}
+}
+
+func TestIsIPv4(t *testing.T) {
+	t.Log(configutils.IsIPv4(net.ParseIP("192.168.1.100")))
+	t.Log(configutils.IsIPv4(net.ParseIP("::1")))
+}
+
+func TestIsIPv6(t *testing.T) {
+	t.Log(configutils.IsIPv6(net.ParseIP("192.168.1.100")))
+	t.Log(configutils.IsIPv6(net.ParseIP("::1")))
+}
+
+func TestIPVersion(t *testing.T) {
+	var a = assert.NewAssertion(t)
+	a.IsTrue(configutils.IPVersion(net.ParseIP("192.168.1.100")) == 4)
+	a.IsTrue(configutils.IPVersion(net.ParseIP("1.2.3")) == 0)
+	a.IsTrue(configutils.IPVersion(net.ParseIP("::1")) == 6)
+	a.IsTrue(configutils.IPVersion(net.ParseIP("2001:0db8:85a3:0000:0000:8a2e:0370:7334")) == 6)
 }

pkg/configutils/variable.go

@@ -14,8 +14,18 @@ var variableMapping = map[string][]interface{}{} // source => [holder1, ...]
 var variableLocker = sync.RWMutex{}
 var regexpNamedVariable = regexp.MustCompile(`\${[\w.-]+}`)
 
+var stringBuilderPool = sync.Pool{
+	New: func() interface{} {
+		return &strings.Builder{}
+	},
+}
+
 // ParseVariables 分析变量
 func ParseVariables(source string, replacer func(varName string) (value string)) string {
+	if len(source) == 0 {
+		return ""
+	}
+
 	variableLocker.RLock()
 	holders, found := variableMapping[source]
 	variableLocker.RUnlock()
@@ -42,16 +52,18 @@ func ParseVariables(source string, replacer func(varName string) (value string))
 	}
 
 	// 多个占位时，使用Builder
-	result := strings.Builder{}
+	var builder = stringBuilderPool.Get().(*strings.Builder)
+	builder.Reset()
+	defer stringBuilderPool.Put(builder)
 	for _, h := range holders {
 		holder, ok := h.(VariableHolder)
 		if ok {
-			result.WriteString(replacer(string(holder)))
+			builder.WriteString(replacer(string(holder)))
 		} else {
-			result.Write(h.([]byte))
+			builder.Write(h.([]byte))
 		}
 	}
-	return result.String()
+	return builder.String()
 }
 
 // ParseVariablesFromHolders 从占位中分析变量
@@ -92,5 +104,8 @@ func ParseHolders(source string) (holders VariableHolders) {
 
 // HasVariables 判断是否有变量
 func HasVariables(source string) bool {
+	if len(source) == 0 {
+		return false
+	}
 	return regexpNamedVariable.MatchString(source)
 }

pkg/configutils/variable_test.go

@@ -53,6 +53,8 @@ func BenchmarkParseVariables(b *testing.B) {
 		return "Lu"
 	})
 
+	b.ResetTimer()
+
 	for i := 0; i < b.N; i++ {
 		_ = ParseVariables("hello, ${name}, ${age}, ${gender}, ${home}, world", func(s string) string {
 			return "Lu"
@@ -95,3 +97,11 @@ func BenchmarkParseNoVariables(b *testing.B) {
 		})
 	}
 }
+
+func BenchmarkParseEmpty(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		_ = ParseVariables("", func(s string) string {
+			return "Lu"
+		})
+	}
+}

pkg/configutils/yaml.go

@@ -1,7 +1,7 @@
 package configutils
 
 import (
-	"github.com/go-yaml/yaml"
+	"gopkg.in/yaml.v3"
 	"io/ioutil"
 )
 

pkg/dnsconfigs/cluster_dns_config.go

@@ -2,8 +2,9 @@ package dnsconfigs
 
 // ClusterDNSConfig 集群的DNS设置
 type ClusterDNSConfig struct {
-	CNameRecords []string `yaml:"cnameRecords" json:"cnameRecords"` // 自动加入的CNAME
-	TTL          int32    `yaml:"ttl" json:"ttl"`                   // 默认TTL，各个DNS服务商对记录的TTL的限制各有不同
+	CNameRecords  []string `yaml:"cnameRecords" json:"cnameRecords"`   // 自动加入的CNAME
+	TTL           int32    `yaml:"ttl" json:"ttl"`                     // 默认TTL，各个DNS服务商对记录的TTL的限制各有不同
+	CNameAsDomain bool     `yaml:"cnameAsDomain" json:"cnameAsDomain"` // 是否可以像域名一样直接访问CNAME
 
 	NodesAutoSync   bool `yaml:"nodesAutoSync" json:"nodesAutoSync"`     // 是否自动同步节点状态
 	ServersAutoSync bool `yaml:"serversAutoSync" json:"serversAutoSync"` // 是否自动同步服务状态

pkg/dnsconfigs/route_ranges.go

@@ -2,31 +2,107 @@
 
 package dnsconfigs
 
-import "github.com/TeaOSLab/EdgeCommon/pkg/configutils"
+import (
+	"encoding/json"
+	"errors"
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+	"github.com/iwind/TeaGo/maps"
+	"net"
+)
 
 type RouteRangeType = string
 
 const (
-	RouteRangeTypeIP RouteRangeType = "ipRange"
+	RouteRangeTypeIP     RouteRangeType = "ipRange" // IP范围
+	RouteRangeTypeCIDR   RouteRangeType = "cidr"    // CIDR
+	RouteRangeTypeRegion RouteRangeType = "region"  // 区域
 )
 
+func AllRouteRangeTypes() []*shared.Definition {
+	return []*shared.Definition{
+		{
+			Name: "IP范围",
+			Code: RouteRangeTypeIP,
+		},
+		{
+			Name: "CIDR",
+			Code: RouteRangeTypeCIDR,
+		},
+		{
+			Name: "区域",
+			Code: RouteRangeTypeRegion,
+		},
+	}
+}
+
+// RouteRegionResolver 解析IP接口
+type RouteRegionResolver interface {
+	Resolve(ip net.IP) (countryId int64, provinceId int64, cityId int64, providerId int64)
+}
+
+// RouteRangeInterface 线路范围接口
 type RouteRangeInterface interface {
+	// Init 初始化
 	Init() error
-	Contains(ip uint64) bool
+
+	// Contains 判断是否包含
+	Contains(ip net.IP) bool
+
+	// SetRegionResolver 设置IP解析接口
+	SetRegionResolver(resolver RouteRegionResolver)
+
+	// IsExcluding 是否为排除
+	IsExcluding() bool
+}
+
+type BaseRouteRange struct {
+	IsReverse bool `json:"isReverse"`
+
+	routeRegionResolver RouteRegionResolver
+}
+
+func (this *BaseRouteRange) SetRegionResolver(resolver RouteRegionResolver) {
+	this.routeRegionResolver = resolver
+}
+
+func (this *BaseRouteRange) IsExcluding() bool {
+	return this.IsReverse
 }
 
 // RouteRangeIPRange IP范围配置
+// IPv4和IPv6不能混用
 type RouteRangeIPRange struct {
+	BaseRouteRange
+
 	IPFrom string `json:"ipFrom"`
 	IPTo   string `json:"ipTo"`
 
 	ipFromLong uint64
 	ipToLong   uint64
+
+	ipVersion int // 4|6
 }
 
 func (this *RouteRangeIPRange) Init() error {
-	this.ipFromLong = configutils.IP2Long(this.IPFrom)
-	this.ipToLong = configutils.IP2Long(this.IPTo)
+	var ipFrom = net.ParseIP(this.IPFrom)
+	var ipTo = net.ParseIP(this.IPTo)
+	if ipFrom == nil {
+		return errors.New("invalid ipFrom '" + this.IPFrom + "'")
+	}
+	if ipTo == nil {
+		return errors.New("invalid ipTo '" + this.IPTo + "'")
+	}
+
+	var ipFromVersion = configutils.IPVersion(ipFrom)
+	var ipToVersion = configutils.IPVersion(ipTo)
+	if ipFromVersion != ipToVersion {
+		return errors.New("ipFrom and ipTo version are not same")
+	}
+	this.ipVersion = ipFromVersion
+
+	this.ipFromLong = configutils.IP2Long(ipFrom)
+	this.ipToLong = configutils.IP2Long(ipTo)
 
 	if this.ipFromLong > this.ipToLong {
 		this.ipFromLong, this.ipToLong = this.ipToLong, this.ipFromLong
@@ -35,6 +111,152 @@ func (this *RouteRangeIPRange) Init() error {
 	return nil
 }
 
-func (this *RouteRangeIPRange) Contains(ip uint64) bool {
-	return this.ipFromLong <= ip && this.ipToLong >= ip
+func (this *RouteRangeIPRange) Contains(netIP net.IP) bool {
+	if len(netIP) == 0 {
+		return false
+	}
+
+	var version = configutils.IPVersion(netIP)
+	if version != this.ipVersion {
+		return false
+	}
+
+	var ipLong = configutils.IP2Long(netIP)
+	return ipLong >= this.ipFromLong && ipLong <= this.ipToLong
+}
+
+// RouteRangeCIDR CIDR范围配置
+type RouteRangeCIDR struct {
+	BaseRouteRange
+
+	CIDR string `json:"cidr"`
+
+	cidr *net.IPNet
+}
+
+func (this *RouteRangeCIDR) Init() error {
+	_, ipNet, err := net.ParseCIDR(this.CIDR)
+	if err != nil {
+		return errors.New("parse cidr failed: " + err.Error())
+	}
+
+	this.cidr = ipNet
+
+	return nil
+}
+
+func (this *RouteRangeCIDR) Contains(netIP net.IP) bool {
+	if netIP == nil {
+		return false
+	}
+
+	if this.cidr == nil {
+		return false
+	}
+
+	return this.cidr.Contains(netIP)
+}
+
+// RouteRangeRegion 区域范围
+// country:ID, province:ID, city:ID, isp:ID
+type RouteRangeRegion struct {
+	BaseRouteRange
+
+	Regions []*routeRegion `json:"regions"`
+}
+
+func (this *RouteRangeRegion) Init() error {
+	return nil
+}
+
+func (this *RouteRangeRegion) Contains(netIP net.IP) bool {
+	if this.routeRegionResolver == nil {
+		return false
+	}
+
+	if len(this.Regions) == 0 {
+		return false
+	}
+
+	countryId, provinceId, cityId, providerId := this.routeRegionResolver.Resolve(netIP)
+	if countryId <= 0 && provinceId <= 0 && cityId <= 0 && providerId <= 0 {
+		return false
+	}
+
+	for _, region := range this.Regions {
+		if region.Id <= 0 {
+			continue
+		}
+
+		switch region.Type {
+		case "country":
+			if region.Id == countryId {
+				return true
+			}
+		case "province":
+			if region.Id == provinceId {
+				return true
+			}
+		case "city":
+			if region.Id == cityId {
+				return true
+			}
+		case "isp":
+			if region.Id == providerId {
+				return true
+			}
+		}
+	}
+
+	return false
+}
+
+type routeRegion struct {
+	Type string `json:"type"` // country|province|city|isp
+	Id   int64  `json:"id"`
+	Name string `json:"name"`
+}
+
+// InitRangesFromJSON 从JSON中初始化线路范围
+func InitRangesFromJSON(rangesJSON []byte) (ranges []RouteRangeInterface, err error) {
+	if len(rangesJSON) == 0 {
+		return
+	}
+
+	var rangeMaps = []maps.Map{}
+	err = json.Unmarshal(rangesJSON, &rangeMaps)
+	if err != nil {
+		return nil, err
+	}
+	for _, rangeMap := range rangeMaps {
+		var rangeType = rangeMap.GetString("type")
+		paramsJSON, err := json.Marshal(rangeMap.Get("params"))
+		if err != nil {
+			return nil, err
+		}
+
+		var r RouteRangeInterface
+
+		switch rangeType {
+		case RouteRangeTypeIP:
+			r = &RouteRangeIPRange{}
+		case RouteRangeTypeCIDR:
+			r = &RouteRangeCIDR{}
+		case RouteRangeTypeRegion:
+			r = &RouteRangeRegion{}
+		default:
+			return nil, errors.New("invalid route line type '" + rangeType + "'")
+		}
+
+		err = json.Unmarshal(paramsJSON, r)
+		if err != nil {
+			return nil, err
+		}
+		err = r.Init()
+		if err != nil {
+			return nil, err
+		}
+		ranges = append(ranges, r)
+	}
+	return
 }

pkg/dnsconfigs/route_ranges_test.go

@@ -0,0 +1,98 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package dnsconfigs
+
+import (
+	"github.com/iwind/TeaGo/assert"
+	"net"
+	"testing"
+)
+
+func TestRouteRangeIPRange_Contains(t *testing.T) {
+	var a = assert.NewAssertion(t)
+
+	// ipv4
+	{
+		var r = &RouteRangeIPRange{
+			IPFrom: "192.168.1.100",
+			IPTo:   "192.168.3.200",
+		}
+		err := r.Init()
+		if err != nil {
+			t.Fatal(err)
+		}
+		a.IsFalse(r.Contains(net.ParseIP("aaa")))
+		a.IsTrue(r.Contains(net.ParseIP("192.168.1.200")))
+		a.IsTrue(r.Contains(net.ParseIP("192.168.3.200")))
+		a.IsFalse(r.Contains(net.ParseIP("192.168.4.1")))
+		a.IsFalse(r.Contains(net.ParseIP("::1")))
+	}
+
+	// ipv6
+	{
+		var prefix = "1:2:3:4:5:6"
+		var r = &RouteRangeIPRange{
+			IPFrom: prefix + ":1:8",
+			IPTo:   prefix + ":5:10",
+		}
+		err := r.Init()
+		if err != nil {
+			t.Fatal(err)
+		}
+		a.IsFalse(r.Contains(net.ParseIP("aaa")))
+		a.IsTrue(r.Contains(net.ParseIP(prefix + ":3:4")))
+		a.IsTrue(r.Contains(net.ParseIP(prefix + ":5:9")))
+		a.IsTrue(r.Contains(net.ParseIP(prefix + ":5:10")))
+		a.IsTrue(r.Contains(net.ParseIP(prefix + ":4:8")))
+		a.IsFalse(r.Contains(net.ParseIP(prefix + ":5:11")))
+	}
+
+	{
+		var r = &RouteRangeCIDR{
+			CIDR: "192.168.2.1/24",
+		}
+		err := r.Init()
+		if err != nil {
+			t.Fatal(err)
+		}
+		a.IsFalse(r.Contains(net.ParseIP("aaa")))
+		a.IsTrue(r.Contains(net.ParseIP("192.168.2.1")))
+		a.IsTrue(r.Contains(net.ParseIP("192.168.2.254")))
+		a.IsTrue(r.Contains(net.ParseIP("192.168.2.100")))
+		a.IsFalse(r.Contains(net.ParseIP("192.168.3.1")))
+		a.IsFalse(r.Contains(net.ParseIP("192.168.1.1")))
+	}
+
+	// reverse ipv4
+	{
+		var r = &RouteRangeIPRange{
+			IPFrom: "192.168.1.100",
+			IPTo:   "192.168.3.200",
+		}
+		err := r.Init()
+		if err != nil {
+			t.Fatal(err)
+		}
+		a.IsFalse(r.Contains(net.ParseIP("aaa")))
+		a.IsTrue(r.Contains(net.ParseIP("192.168.1.200")))
+		a.IsTrue(r.Contains(net.ParseIP("192.168.3.200")))
+		a.IsFalse(r.Contains(net.ParseIP("192.168.4.1")))
+	}
+
+	// reverse cidr
+	{
+		var r = &RouteRangeCIDR{
+			CIDR: "192.168.2.1/24",
+		}
+		err := r.Init()
+		if err != nil {
+			t.Fatal(err)
+		}
+		a.IsFalse(r.Contains(net.ParseIP("aaa")))
+		a.IsTrue(r.Contains(net.ParseIP("192.168.2.1")))
+		a.IsTrue(r.Contains(net.ParseIP("192.168.2.254")))
+		a.IsTrue(r.Contains(net.ParseIP("192.168.2.100")))
+		a.IsFalse(r.Contains(net.ParseIP("192.168.3.1")))
+		a.IsFalse(r.Contains(net.ParseIP("192.168.1.1")))
+	}
+}

pkg/dnsconfigs/routes.go

@@ -120,12 +120,12 @@ var AllDefaultChinaProvinceRoutes = []*Route{
 	{
 		Name:       "河北省",
 		Code:       "china:province:heibei",
-		AliasNames: []string{"河北省"},
+		AliasNames: []string{"河北省", "河北"},
 	},
 	{
 		Name:       "山西省",
 		Code:       "china:province:shanxi",
-		AliasNames: []string{"山西省"},
+		AliasNames: []string{"山西省", "山西"},
 	},
 	{
 		Name:       "内蒙古自治区",
@@ -135,17 +135,17 @@ var AllDefaultChinaProvinceRoutes = []*Route{
 	{
 		Name:       "辽宁省",
 		Code:       "china:province:liaoning",
-		AliasNames: []string{"辽宁省"},
+		AliasNames: []string{"辽宁省", "辽宁"},
 	},
 	{
 		Name:       "吉林省",
 		Code:       "china:jilin",
-		AliasNames: []string{"吉林省"},
+		AliasNames: []string{"吉林省", "吉林"},
 	},
 	{
 		Name:       "黑龙江省",
 		Code:       "china:province:heilongjiang",
-		AliasNames: []string{"黑龙江省"},
+		AliasNames: []string{"黑龙江省", "黑龙江"},
 	},
 	{
 		Name:       "上海市",
@@ -155,52 +155,52 @@ var AllDefaultChinaProvinceRoutes = []*Route{
 	{
 		Name:       "江苏省",
 		Code:       "china:province:jiangsu",
-		AliasNames: []string{"江苏省"},
+		AliasNames: []string{"江苏省", "江苏"},
 	},
 	{
 		Name:       "浙江省",
 		Code:       "china:province:zhejiang",
-		AliasNames: []string{"浙江省"},
+		AliasNames: []string{"浙江省", "浙江"},
 	},
 	{
 		Name:       "安徽省",
 		Code:       "china:province:anhui",
-		AliasNames: []string{"安徽省"},
+		AliasNames: []string{"安徽省", "安徽"},
 	},
 	{
 		Name:       "福建省",
 		Code:       "china:province:fujian",
-		AliasNames: []string{"福建省"},
+		AliasNames: []string{"福建省", "福建"},
 	},
 	{
 		Name:       "江西省",
 		Code:       "china:province:jiangxi",
-		AliasNames: []string{"江西省"},
+		AliasNames: []string{"江西省", "江西"},
 	},
 	{
 		Name:       "山东省",
 		Code:       "china:province:shandong",
-		AliasNames: []string{"山东省"},
+		AliasNames: []string{"山东省", "山东"},
 	},
 	{
 		Name:       "河南省",
 		Code:       "china:province:henan",
-		AliasNames: []string{"河南省"},
+		AliasNames: []string{"河南省", "河南"},
 	},
 	{
 		Name:       "湖北省",
 		Code:       "china:province:hubei",
-		AliasNames: []string{"湖北省"},
+		AliasNames: []string{"湖北省", "湖北"},
 	},
 	{
 		Name:       "湖南省",
 		Code:       "china:province:hunan",
-		AliasNames: []string{"湖南省"},
+		AliasNames: []string{"湖南省", "湖南"},
 	},
 	{
 		Name:       "广东省",
 		Code:       "china:province:guangdong",
-		AliasNames: []string{"广东省"},
+		AliasNames: []string{"广东省", "广东"},
 	},
 	{
 		Name:       "广西壮族自治区",
@@ -210,7 +210,7 @@ var AllDefaultChinaProvinceRoutes = []*Route{
 	{
 		Name:       "海南省",
 		Code:       "china:province:hainan",
-		AliasNames: []string{"海南省"},
+		AliasNames: []string{"海南省", "海南"},
 	},
 	{
 		Name:       "重庆市",
@@ -220,17 +220,17 @@ var AllDefaultChinaProvinceRoutes = []*Route{
 	{
 		Name:       "四川省",
 		Code:       "china:province:sichuan",
-		AliasNames: []string{"四川省"},
+		AliasNames: []string{"四川省", "四川"},
 	},
 	{
 		Name:       "贵州省",
 		Code:       "china:province:guizhou",
-		AliasNames: []string{"贵州省"},
+		AliasNames: []string{"贵州省", "贵州"},
 	},
 	{
 		Name:       "云南省",
 		Code:       "china:province:yunnan",
-		AliasNames: []string{"云南省"},
+		AliasNames: []string{"云南省", "云南"},
 	},
 	{
 		Name:       "西藏自治区",
@@ -240,17 +240,17 @@ var AllDefaultChinaProvinceRoutes = []*Route{
 	{
 		Name:       "陕西省",
 		Code:       "china:province:shaanxi",
-		AliasNames: []string{"陕西省"},
+		AliasNames: []string{"陕西省", "陕西"},
 	},
 	{
 		Name:       "甘肃省",
 		Code:       "china:province:gansu",
-		AliasNames: []string{"甘肃省"},
+		AliasNames: []string{"甘肃省", "甘肃"},
 	},
 	{
 		Name:       "青海省",
 		Code:       "china:province:qinghai",
-		AliasNames: []string{"青海省"},
+		AliasNames: []string{"青海省", "青海"},
 	},
 	{
 		Name:       "宁夏回族自治区",
@@ -275,7 +275,7 @@ var AllDefaultChinaProvinceRoutes = []*Route{
 	{
 		Name:       "台湾省",
 		Code:       "china:province:tw",
-		AliasNames: []string{"台湾省"},
+		AliasNames: []string{"台湾省", "台湾"},
 	},
 }
 

pkg/messageconfigs/messages.go

@@ -7,10 +7,9 @@ const (
 	MessageCodeWriteCache          MessageCode = "writeCache"          // 写入缓存
 	MessageCodeReadCache           MessageCode = "readCache"           // 读取缓存
 	MessageCodeStatCache           MessageCode = "statCache"           // 统计缓存
-	MessageCodePurgeCache          MessageCode = "purgeCache"          // 删除缓存
 	MessageCodeCleanCache          MessageCode = "cleanCache"          // 清理缓存
-	MessageCodePreheatCache        MessageCode = "preheatCache"        // 预热缓存
 	MessageCodeCheckSystemdService MessageCode = "checkSystemdService" // 检查Systemd服务
+	MessageCodeCheckLocalFirewall  MessageCode = "checkLocalFirewall"  // 检查本地防火墙
 	MessageCodeNewNodeTask         MessageCode = "newNodeTask"         // 有新的节点任务产生
 	MessageCodeChangeAPINode       MessageCode = "changeAPINode"       // 改变新的API节点
 )
@@ -45,30 +44,15 @@ type CleanCacheMessage struct {
 	CachePolicyJSON []byte `json:"cachePolicyJSON"`
 }
 
-// PurgeCacheMessageType 删除缓存
-type PurgeCacheMessageType = string
-
-const (
-	PurgeCacheMessageTypeFile PurgeCacheMessageType = "file"
-	PurgeCacheMessageTypeDir  PurgeCacheMessageType = "dir"
-)
-
-type PurgeCacheMessage struct {
-	CachePolicyJSON []byte                `json:"cachePolicyJSON"`
-	Keys            []string              `json:"keys"`
-	Type            PurgeCacheMessageType `json:"type"` // 清理类型
-}
-
-// PreheatCacheMessage 预热缓存
-type PreheatCacheMessage struct {
-	CachePolicyJSON []byte   `json:"cachePolicyJSON"`
-	Keys            []string `json:"keys"`
-}
-
 // CheckSystemdServiceMessage Systemd服务
 type CheckSystemdServiceMessage struct {
 }
 
+// CheckLocalFirewallMessage 检查本地防火墙
+type CheckLocalFirewallMessage struct {
+	Name string `json:"name"`
+}
+
 // NewNodeTaskMessage 有新的节点任务
 type NewNodeTaskMessage struct {
 }

pkg/nodeconfigs/defaults.go

@@ -2,14 +2,29 @@
 
 package nodeconfigs
 
+import "github.com/iwind/TeaGo/maps"
+
 // 一组系统默认值
+// 修改单个IP相关限制值时要考虑到NAT中每个IP会代表很多个主机，并非1对1的关系
 
 const (
 	DefaultMaxThreads    = 20000   // 单节点最大线程数
 	DefaultMaxThreadsMin = 1000    // 单节点最大线程数最小值
 	DefaultMaxThreadsMax = 100_000 // 单节点最大线程数最大值
 
-	DefaultTCPMaxConnections   = 100_000 // 单节点TCP最大连接数
-	DefaultTCPLinger           = 3       // 单节点TCP Linger值
-	DefaultTLSHandshakeTimeout = 3       // TLS握手超时时间
+	DefaultTCPMaxConnections        = 100_000 // 单节点TCP最大连接数
+	DefaultTCPMaxConnectionsPerIP   = 1000    // 单IP最大连接数
+	DefaultTCPMinConnectionsPerIP   = 5       // 单IP最小连接数
+	DefaultTCPNewConnectionsRate    = 500     // 单IP连接速率限制（按分钟）
+	DefaultTCPNewConnectionsMinRate = 5       // 单IP最小连接速率
+	DefaultTCPLinger                = 3       // 单节点TCP Linger值
+	DefaultTLSHandshakeTimeout      = 3       // TLS握手超时时间
 )
+
+var DefaultConfigs = maps.Map{
+	"tcpMaxConnections":        DefaultTCPMaxConnections,
+	"tcpMaxConnectionsPerIP":   DefaultTCPMaxConnectionsPerIP,
+	"tcpMinConnectionsPerIP":   DefaultTCPMinConnectionsPerIP,
+	"tcpNewConnectionsRate":    DefaultTCPNewConnectionsRate,
+	"tcpNewConnectionsMinRate": DefaultTCPNewConnectionsMinRate,
+}

pkg/nodeconfigs/dns_resolver.go

@@ -0,0 +1,25 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package nodeconfigs
+
+type DNSResolverType = string
+
+const (
+	DNSResolverTypeDefault  = "default"
+	DNSResolverTypeGoNative = "goNative"
+	DNSResolverTypeCGO      = "cgo"
+)
+
+func DefaultDNSResolverConfig() *DNSResolverConfig {
+	return &DNSResolverConfig{
+		Type: DNSResolverTypeDefault,
+	}
+}
+
+type DNSResolverConfig struct {
+	Type string `yaml:"type" json:"type"` // 使用Go语言内置的DNS解析器
+}
+
+func (this *DNSResolverConfig) Init() error {
+	return nil
+}

pkg/nodeconfigs/image_webp_policy.go

@@ -0,0 +1,46 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nodeconfigs
+
+import "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+
+func init() {
+	_ = DefaultWebPImagePolicy.Init()
+}
+
+var DefaultWebPImagePolicy = &WebPImagePolicy{
+	IsOn:         true,
+	RequireCache: true,
+	MinLength:    shared.NewSizeCapacity(0, shared.SizeCapacityUnitKB),
+	MaxLength:    shared.NewSizeCapacity(128, shared.SizeCapacityUnitMB),
+}
+
+// WebPImagePolicy WebP策略
+type WebPImagePolicy struct {
+	IsOn         bool                 `yaml:"isOn" json:"isOn"`                 // 是否启用
+	RequireCache bool                 `yaml:"requireCache" json:"requireCache"` // 需要在缓存条件下进行
+	MinLength    *shared.SizeCapacity `yaml:"minLength" json:"minLength"`       // 最小压缩对象比如4m, 24k
+	MaxLength    *shared.SizeCapacity `yaml:"maxLength" json:"maxLength"`       // 最大压缩对象
+
+	minLength int64
+	maxLength int64
+}
+
+func (this *WebPImagePolicy) Init() error {
+	if this.MinLength != nil {
+		this.minLength = this.MinLength.Bytes()
+	}
+	if this.MaxLength != nil {
+		this.maxLength = this.MaxLength.Bytes()
+	}
+
+	return nil
+}
+
+func (this *WebPImagePolicy) MinLengthBytes() int64 {
+	return this.minLength
+}
+
+func (this *WebPImagePolicy) MaxLengthBytes() int64 {
+	return this.maxLength
+}

pkg/nodeconfigs/node_config.go

@@ -1,10 +1,12 @@
 package nodeconfigs
 
 import (
+	"crypto/sha256"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ddosconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/Tea"
@@ -27,20 +29,29 @@ func NewServerError(serverId int64, message string) *ServerError {
 
 // NodeConfig 边缘节点配置
 type NodeConfig struct {
-	Id                     int64                         `yaml:"id" json:"id"`
-	NodeId                 string                        `yaml:"nodeId" json:"nodeId"`
-	Secret                 string                        `yaml:"secret" json:"secret"`
-	IsOn                   bool                          `yaml:"isOn" json:"isOn"`
-	Servers                []*serverconfigs.ServerConfig `yaml:"servers" json:"servers"`
-	SupportCNAME           bool                          `yaml:"supportCNAME" json:"supportCNAME"`
-	Version                int64                         `yaml:"version" json:"version"`
-	Name                   string                        `yaml:"name" json:"name"`
+	Id           int64                         `yaml:"id" json:"id"`
+	NodeId       string                        `yaml:"nodeId" json:"nodeId"`
+	Secret       string                        `yaml:"secret" json:"secret"`
+	IsOn         bool                          `yaml:"isOn" json:"isOn"`
+	Servers      []*serverconfigs.ServerConfig `yaml:"servers" json:"servers"`
+	SupportCNAME bool                          `yaml:"supportCNAME" json:"supportCNAME"`
+	Version      int64                         `yaml:"version" json:"version"`
+	Name         string                        `yaml:"name" json:"name"`
+	GroupId      int64                         `yaml:"groupId" json:"groupId"`
+	RegionId     int64                         `yaml:"regionId" json:"regionId"`
+	OCSPVersion  int64                         `yaml:"ocspVersion" json:"ocspVersion"`
+
+	// 性能
 	MaxCPU                 int32                         `yaml:"maxCPU" json:"maxCPU"`
-	RegionId               int64                         `yaml:"regionId" json:"regionId"`
-	MaxCacheDiskCapacity   *shared.SizeCapacity          `yaml:"maxCacheDiskCapacity" json:"maxCacheDiskCapacity"`
-	MaxCacheMemoryCapacity *shared.SizeCapacity          `yaml:"maxCacheMemoryCapacity" json:"maxCacheMemoryCapacity"`
-	MaxThreads             int                           `yaml:"maxThreads" json:"maxThreads"`
-	TCPMaxConnections      int                           `yaml:"tcpMaxConnections" json:"tcpMaxConnections"`
+	CacheDiskDir           string                        `yaml:"cacheDiskDir" json:"cacheDiskDir"`                     // 文件缓存目录
+	MaxCacheDiskCapacity   *shared.SizeCapacity          `yaml:"maxCacheDiskCapacity" json:"maxCacheDiskCapacity"`     // 文件缓存容量
+	MaxCacheMemoryCapacity *shared.SizeCapacity          `yaml:"maxCacheMemoryCapacity" json:"maxCacheMemoryCapacity"` // 内容缓存容量
+	MaxThreads             int                           `yaml:"maxThreads" json:"maxThreads"`                         // 最大线程数
+	DDoSProtection         *ddosconfigs.ProtectionConfig `yaml:"ddosProtection" json:"ddosProtection"`
+
+	// 级别
+	Level       int32                         `yaml:"level" json:"level"`
+	ParentNodes map[int64][]*ParentNodeConfig `yaml:"parentNodes" json:"parentNodes"` // clusterId => []*ParentNodeConfig
 
 	// 全局配置
 	GlobalConfig  *serverconfigs.GlobalConfig `yaml:"globalConfig" json:"globalConfig"` // 全局配置
@@ -55,9 +66,23 @@ type NodeConfig struct {
 	TimeZone             string                                  `yaml:"timeZone" json:"timeZone"`
 	AutoOpenPorts        bool                                    `yaml:"autoOpenPorts" json:"autoOpenPorts"`
 
+	// 指标
 	MetricItems []*serverconfigs.MetricItemConfig `yaml:"metricItems" json:"metricItems"`
 
-	AllowedIPs []string `yaml:"allowedIPs" json:"allowedIPs"` // 自动白名单
+	// 自动白名单
+	AllowedIPs []string `yaml:"allowedIPs" json:"allowedIPs"`
+
+	// 脚本
+	CommonScripts []*serverconfigs.CommonScript `yaml:"commonScripts" json:"commonScripts"`
+
+	// WebP
+	WebPImagePolicies map[int64]*WebPImagePolicy `yaml:"webpImagePolicies" json:"webpImagePolicies"` // clusterId => *WebPImagePolicy
+
+	// UAM相关配置
+	UAMPolicies map[int64]*UAMPolicy `yaml:"uamPolicies" yaml:"uamPolicies" json:"uamPolicies"` // clusterId => *UAMPolicy
+
+	// DNS
+	DNSResolver *DNSResolverConfig `yaml:"dnsResolver" json:"dnsResolver"`
 
 	paddedId string
 
@@ -75,6 +100,8 @@ type NodeConfig struct {
 
 	// syn flood
 	synFlood *firewallconfigs.SYNFloodConfig
+
+	secretHash string
 }
 
 // SharedNodeConfig 取得当前节点配置单例
@@ -137,6 +164,7 @@ func CloneNodeConfig(nodeConfig *NodeConfig) (*NodeConfig, error) {
 
 // Init 初始化
 func (this *NodeConfig) Init() (err error, serverErrors []*ServerError) {
+	this.secretHash = fmt.Sprintf("%x", sha256.Sum256([]byte(this.NodeId+"@"+this.Secret)))
 	this.paddedId = fmt.Sprintf("%08d", this.Id)
 
 	// servers
@@ -275,6 +303,34 @@ func (this *NodeConfig) Init() (err error, serverErrors []*ServerError) {
 		this.allowedIPMap[allowIP] = true
 	}
 
+	// webp image policy
+	if this.WebPImagePolicies != nil {
+		for _, policy := range this.WebPImagePolicies {
+			err = policy.Init()
+			if err != nil {
+				return
+			}
+		}
+	}
+
+	// uam policy
+	if this.UAMPolicies != nil {
+		for _, policy := range this.UAMPolicies {
+			err = policy.Init()
+			if err != nil {
+				return
+			}
+		}
+	}
+
+	// dns resolver
+	if this.DNSResolver != nil {
+		err = this.DNSResolver.Init()
+		if err != nil {
+			return
+		}
+	}
+
 	return
 }
 
@@ -378,12 +434,25 @@ func (this *NodeConfig) lookupWeb(server *serverconfigs.ServerConfig, web *serve
 		return
 	}
 	if web.FirewallPolicy != nil && web.FirewallPolicy.IsOn {
-		// 复用节点的拦截选项设置
-		if web.FirewallPolicy.BlockOptions == nil && server.HTTPFirewallPolicy != nil && server.HTTPFirewallPolicy.BlockOptions != nil {
-			web.FirewallPolicy.BlockOptions = server.HTTPFirewallPolicy.BlockOptions
+		// 复用节点的选项设置
+		if server.HTTPFirewallPolicy != nil {
+			if (web.FirewallPolicy.BlockOptions == nil || !web.FirewallPolicy.BlockOptions.IsPrior) && server.HTTPFirewallPolicy.BlockOptions != nil {
+				web.FirewallPolicy.BlockOptions = server.HTTPFirewallPolicy.BlockOptions
+			}
+			if (web.FirewallPolicy.CaptchaOptions == nil || !web.FirewallPolicy.CaptchaOptions.IsPrior) && server.HTTPFirewallPolicy.CaptchaOptions != nil {
+				web.FirewallPolicy.CaptchaOptions = server.HTTPFirewallPolicy.CaptchaOptions
+			}
+			if (web.FirewallPolicy.SYNFlood == nil || !web.FirewallPolicy.SYNFlood.IsPrior) && server.HTTPFirewallPolicy.SYNFlood != nil {
+				web.FirewallPolicy.SYNFlood = server.HTTPFirewallPolicy.SYNFlood
+			}
+			if (web.FirewallPolicy.Log == nil || !web.FirewallPolicy.Log.IsPrior) && server.HTTPFirewallPolicy.Log != nil {
+				web.FirewallPolicy.Log = server.HTTPFirewallPolicy.Log
+			}
+
 			web.FirewallPolicy.Mode = server.HTTPFirewallPolicy.Mode
 			web.FirewallPolicy.UseLocalFirewall = server.HTTPFirewallPolicy.UseLocalFirewall
 		}
+
 		this.firewallPolicies = append(this.firewallPolicies, web.FirewallPolicy)
 	}
 	if len(web.Locations) > 0 {
@@ -420,3 +489,47 @@ func (this *NodeConfig) IPIsAutoAllowed(ip string) bool {
 func (this *NodeConfig) SYNFloodConfig() *firewallconfigs.SYNFloodConfig {
 	return this.synFlood
 }
+
+// UpdateCertOCSP 修改证书OCSP
+func (this *NodeConfig) UpdateCertOCSP(certId int64, ocsp []byte, expiresAt int64) {
+	shared.Locker.Lock()
+	defer shared.Locker.Unlock()
+
+	var servers = this.Servers
+	for _, server := range servers {
+		if server.HTTPS != nil &&
+			server.HTTPS.SSLPolicy != nil &&
+			server.HTTPS.SSLPolicy.OCSPIsOn &&
+			server.HTTPS.SSLPolicy.ContainsCert(certId) {
+			server.HTTPS.SSLPolicy.UpdateCertOCSP(certId, ocsp, expiresAt)
+		}
+
+		if server.TLS != nil &&
+			server.TLS.SSLPolicy != nil &&
+			server.TLS.SSLPolicy.OCSPIsOn &&
+			server.TLS.SSLPolicy.ContainsCert(certId) {
+			server.TLS.SSLPolicy.UpdateCertOCSP(certId, ocsp, expiresAt)
+		}
+	}
+}
+
+// FindWebPImagePolicyWithClusterId 使用集群ID查找WebP策略
+func (this *NodeConfig) FindWebPImagePolicyWithClusterId(clusterId int64) *WebPImagePolicy {
+	if this.WebPImagePolicies == nil {
+		return nil
+	}
+	return this.WebPImagePolicies[clusterId]
+}
+
+// FindUAMPolicyWithClusterId 使用集群ID查找UAM策略
+func (this *NodeConfig) FindUAMPolicyWithClusterId(clusterId int64) *UAMPolicy {
+	if this.UAMPolicies == nil {
+		return nil
+	}
+	return this.UAMPolicies[clusterId]
+}
+
+// SecretHash 对Id和Secret的Hash计算
+func (this *NodeConfig) SecretHash() string {
+	return this.secretHash
+}

pkg/nodeconfigs/node_levels.go

@@ -0,0 +1,37 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nodeconfigs
+
+type NodeLevel struct {
+	Name        string `yaml:"name" json:"name"`
+	Code        int    `yaml:"code" json:"code"`
+	Description string `yaml:"description" json:"description"`
+}
+
+func FindAllNodeLevels() []*NodeLevel {
+	return []*NodeLevel{
+		{
+			Name:        "边缘节点",
+			Code:        1,
+			Description: "普通的边缘节点。",
+		},
+		{
+			Name:        "L2节点",
+			Code:        2,
+			Description: "特殊的边缘节点，同时负责同组上一级节点的回源。",
+		},
+	}
+}
+
+func FindNodeLevel(level int) *NodeLevel {
+	level--
+
+	var levels = FindAllNodeLevels()
+	if level < 0 {
+		return levels[0]
+	}
+	if level < len(levels) {
+		return levels[level]
+	}
+	return levels[0]
+}

pkg/nodeconfigs/node_parent_config.go

@@ -0,0 +1,10 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nodeconfigs
+
+// ParentNodeConfig 父级节点配置
+type ParentNodeConfig struct {
+	Id         int64    `yaml:"id" json:"id"`
+	Addrs      []string `yaml:"addrs" json:"addrs"`
+	SecretHash string   `yaml:"secretHash" json:"secretHash"`
+}

pkg/nodeconfigs/node_status.go

@@ -20,10 +20,12 @@ type NodeStatus struct {
 	DiskMaxUsagePartition string  `json:"diskMaxUsagePartition"`
 	DiskTotal             uint64  `json:"diskTotal"`
 	UpdatedAt             int64   `json:"updatedAt"`
+	Timestamp             int64   `json:"timestamp"` // 当前节点时间戳
 	Load1m                float64 `json:"load1m"`
 	Load5m                float64 `json:"load5m"`
 	Load15m               float64 `json:"load15m"`
 	ConnectionCount       int     `json:"connectionCount"` // 连接数
+	ExePath               string  `json:"exePath"`         // 可执行文件路径
 
 	TrafficInBytes  uint64 `json:"trafficInBytes"`
 	TrafficOutBytes uint64 `json:"trafficOutBytes"`
@@ -31,6 +33,8 @@ type NodeStatus struct {
 	CacheTotalDiskSize   int64 `json:"cacheTotalDiskSize"`
 	CacheTotalMemorySize int64 `json:"cacheTotalMemorySize"`
 
+	LocalFirewallName string `json:"localFirewallName"`
+
 	IsActive bool   `json:"isActive"`
 	Error    string `json:"error"`
 }

pkg/nodeconfigs/uam_policy.go

@@ -0,0 +1,28 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package nodeconfigs
+
+func init() {
+	_ = DefaultUAMPolicy.Init()
+}
+
+var DefaultUAMPolicy = &UAMPolicy{
+	IsOn:               true,
+	AllowSearchEngines: true,
+	DenySpiders:        true,
+	UITitle:            "",
+	UIBody:             "",
+}
+
+type UAMPolicy struct {
+	IsOn               bool `yaml:"isOn" json:"isOn"`
+	AllowSearchEngines bool `yaml:"allowSearchEngines" json:"allowSearchEngines"` // 直接跳过常见搜索引擎
+	DenySpiders        bool `yaml:"denySpiders" json:"denySpiders"`               // 拦截常见爬虫
+
+	UITitle string `yaml:"uiTitle" json:"uiTitle"` // 页面标题
+	UIBody  string `yaml:"uiBody" json:"uiBody"`   // 页面内容
+}
+
+func (this *UAMPolicy) Init() error {
+	return nil
+}

pkg/rpc/dao/ip_list_dao.go

@@ -102,6 +102,7 @@ func (this *IPListDAO) CreateIPListForServerId(ctx context.Context, serverId int
 		Type:        listType,
 		Name:        "IP名单",
 		Code:        listType,
+		ServerId:    serverId,
 		TimeoutJSON: nil,
 	})
 	if err != nil {

pkg/rpc/errors/utils.go

@@ -6,27 +6,28 @@ import (
 	"errors"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"strings"
 )
 
 // HumanError 格式化GRPC相关错误
-func HumanError(err error) error {
+func HumanError(err error, endpoints []string, configFile string) (resultErr error, isConnError bool) {
 	if err == nil {
-		return err
+		return err, false
 	}
 	errStatus, ok := status.FromError(err)
 	if !ok {
-		return err
+		return err, false
 	}
 	switch errStatus.Code() {
 	case codes.InvalidArgument:
-		return errors.New("错误的RPC参数：" + err.Error())
+		return errors.New("错误的RPC参数：" + err.Error()), false
 	case codes.DeadlineExceeded:
-		return errors.New("RPC操作超时，请重试：" + err.Error())
+		return errors.New("RPC操作超时，请重试：" + err.Error()), false
 	case codes.Unimplemented:
-		return errors.New("请求的RPC服务或方法不存在，可能是没有升级API节点或者当前节点没有升级：" + err.Error())
+		return errors.New("请求的RPC服务或方法不存在，可能是没有升级API节点或者当前节点没有升级：" + err.Error()), false
 	case codes.Unavailable:
-		return errors.New("RPC当前不可用，1、请确保当前节点的api.yaml配置中的地址填写正确；2、请确保API节点已启动，并检查当前节点和API节点之间的网络连接是正常的。错误信息：" + err.Error())
+		return errors.New("RPC当前不可用：<br/>1、请确认当前节点的api.yaml（<em>" + configFile + "</em>）配置中的地址（<em>" + strings.Join(endpoints, ", ") + "</em>）是否已填写正确；<br/>2、请确保API节点已启动，并检查当前节点和API节点之间的网络连接是正常的。<hr/>错误信息：" + err.Error()), true
 	}
 
-	return err
+	return err, false
 }

pkg/rpc/jsons/http_access_log_ref.md

@@ -0,0 +1,43 @@
+# 访问日志引用
+## 定义
+~~~json
+{
+  "isPrior": "是否覆盖父级应用",
+  "isOn": "是否启用配置",
+  "fields": ["字段1", "字段2", ...] // 可以留空
+  "status1": "是否启用状态1xx",
+  "status2": "是否启用状态2xx",
+  "status3": "是否启用状态3xx",
+  "status4": "是否启用状态4xx",
+  "status5": "是否启用状态5xx",
+  "enableClientClosed": "是否记录客户端关闭事件",
+  "firewallOnly": "是否只记录防火墙（WAF）相关日志"
+}
+~~~
+
+### 字段值
+* `1` - 请求Header
+* `2` - 响应Header
+* `3` - 请求URL参数
+* `4` - Cookie
+* `5` - 扩展信息
+* `6` - Referer
+* `7` - UserAgent
+* `8` - 请求Body
+* `9` - 响应Body（目前不支持）
+
+## 示例
+~~~json
+{
+  "isPrior": true,
+  "isOn": true,
+  "fields": [],
+  "status1": true,
+  "status2": true,
+  "status3": true,
+  "status4": true,
+  "status5": true,
+  "enableClientClosed": true,
+  "firewallOnly": true
+}
+~~~

pkg/rpc/jsons/http_cache_config.md

@@ -0,0 +1,92 @@
+# HTTP缓存配置
+## 定义
+~~~json
+{
+  "isPrior": "是否覆盖上级配置",
+  "isOn": "是否启用配置",
+  "addStatusHeader": "是否增加命中状态Header（X-Cache）",
+  "addAgeHeader": "是否增加Age Header",
+  "enableCacheControlMaxAge": "是否支持Cache-Control: max-age=...",
+  "disablePolicyRefs": "是否停用策略中定义的条件",
+  "purgeIsOn": "是否允许使用Purge方法清理",
+  "purgeKey": "Purge时使用的X-Edge-Purge-Key",
+  "stale": "陈旧缓存使用策略",
+  "cacheRefs": ["缓存条件1", "缓存条件2", ...]
+}
+~~~
+其中：
+* `缓存条件` - 参考 {json:http_cache_ref}
+
+## 示例
+### 无缓存条件
+~~~json
+{
+  "isPrior": true,
+  "isOn": true,
+  "addStatusHeader": true,
+  "addAgeHeader": true,
+  "enableCacheControlMaxAge": true,
+  "disablePolicyRefs": false,
+  "purgeIsOn": false,
+  "purgeKey": "",
+  "stale": null,
+  "cacheRefs": []
+}
+~~~
+
+### 加入缓存条件
+~~~json
+{
+  "isPrior": true,
+  "isOn": true,
+  "addStatusHeader": true,
+  "addAgeHeader": true,
+  "enableCacheControlMaxAge": true,
+  "disablePolicyRefs": false,
+  "purgeIsOn": false,
+  "purgeKey": "",
+  "stale": null,
+  "cacheRefs": [
+    {
+	  "id": 0,
+	  "isOn": true,
+	  "key": "${scheme}://${host}${requestPath}${isArgs}${args}",
+	  "life": {"count": 2, "unit": "hour"},
+	  "status": [200],
+      "maxSize": {"count": 32, "unit": "mb"},
+      "minSize": {"count": 0, "unit": "kb"},
+      "skipCacheControlValues": ["private", "no-cache", "no-store"],
+      "skipSetCookie": true,
+      "enableRequestCachePragma": false,
+      "conds": {
+        "isOn": true,
+        "connector": "or",
+        "groups": [
+          {
+            "isOn": true,
+            "connector": "and",
+            "conds": [
+              {
+                "type": "url-extension",
+                "isRequest": true,
+                "param": "${requestPathExtension}",
+                "operator": "in",
+                "value": "[\".css\",\".png\",\".js\",\".woff2\"]",
+                "isReverse": false,
+                "isCaseInsensitive": false,
+                "typeName": "URL扩展名"
+              }
+            ],
+            "isReverse": false,
+            "description": ""
+          }
+        ]
+      },
+      "allowChunkedEncoding": true,
+      "allowPartialContent": false,
+      "isReverse": false,
+      "methods": []
+	}
+  ]
+}
+~~~

pkg/rpc/jsons/http_cache_ref.md

@@ -0,0 +1,91 @@
+# 缓存条件设置
+## 定义
+~~~json
+{
+  "isOn": "是否启用配置",
+  "key": "每个缓存的Key规则，里面可以有变量",
+  "life": "缓存时长",
+  "expiresTime": "客户端过期时间",
+  "status": ["缓存的状态码1", "缓存的状态码2", ...],
+  "minSize": "能够缓存的最小尺寸",
+  "maxSize": "能够缓存的最大尺寸",
+  "methods": ["支持的请求方法1", "支持的请求方法2", ...],
+  "skipCacheControlValues": "可以跳过的响应的Cache-Control值",
+  "skipSetCookie": "是否跳过响应的Set-Cookie Header",
+  "enableRequestCachePragma": "是否支持客户端的Pragma: no-cache",
+  "allowChunkedEncoding": "是否允许分片内容",
+  "allowPartialContent": "支持分段内容缓存",
+  "conds": "请求条件",
+  "isReverse": "是否为反向条件，反向条件的不缓存"
+}
+~~~
+
+## 示例
+~~~json
+{
+	"isOn": true,
+	"key": "${scheme}://${host}${requestURI}",
+	"life": {
+		"count": 1,
+		"unit": "day"
+	},
+	"expiresTime": {
+		"isPrior": true,
+		"isOn": true,
+		"overwrite": true,
+		"autoCalculate": false,
+		"duration": {
+			"count": 1,
+			"unit": "day"
+		}
+	},
+	"status": [
+		200
+	],
+	"minSize": {
+		"count": 0,
+		"unit": "kb"
+	},
+	"maxSize": {
+		"count": 32,
+		"unit": "mb"
+	},
+	"methods": [],
+	"skipCacheControlValues": [
+		"private",
+		"no-cache",
+		"no-store"
+	],
+	"skipSetCookie": true,
+	"enableRequestCachePragma": false,
+	"allowChunkedEncoding": true,
+	"allowPartialContent": false,
+	"conds": {
+		"isOn": true,
+		"connector": "or",
+		"groups": [
+			{
+				"isOn": true,
+				"connector": "and",
+				"conds": [
+					{
+						"type": "url-extension",
+						"isRequest": true,
+						"param": "${requestPathExtension}",
+						"operator": "in",
+						"value": "[\".css\",\".png\",\".js\",\".woff2\"]",
+						"isReverse": false,
+						"isCaseInsensitive": false,
+						"typeName": "URL扩展名"
+					}
+				],
+				"isReverse": false,
+				"description": ""
+			}
+		]
+	},
+	"cachePolicy": null,
+	"isReverse": false,
+	"id": 1
+}
+~~~

pkg/rpc/jsons/http_firewall_ref.md

@@ -0,0 +1,18 @@
+# HTTP防火墙（即WAF）引用
+## 定义
+~~~json
+{
+  "isPrior": "是否覆盖上级配置",
+  "isOn": "是否启用配置",
+  "firewallPolicyId": "WAF策略ID"
+}
+~~~
+
+## 示例
+~~~json
+{
+  "isPrior": true,
+  "isOn": true,
+  "firewallPolicyId": 123
+}
+~~~

pkg/rpc/jsons/http_remote_addr_config.md

@@ -0,0 +1,31 @@
+# HTTP获取客户端IP地址方式配置
+## 定义
+~~~json
+{
+  "isPrior": "是否覆盖父级应用",
+  "isOn": "是否启用配置",
+  "value": "自定义值变量",
+  "isCustomized": "是否自定义"
+}
+~~~
+
+## 示例
+### 不启用自定义
+~~~json
+{
+  "isPrior": false,
+  "isOn": false,
+  "value": "",
+  "isCustomized": false
+}
+~~~
+
+### 启用自定义
+~~~json
+{
+  "isPrior": true,
+  "isOn": true,
+  "value": "${remoteAddr}",
+  "isCustomized": true
+}
+~~~

pkg/rpc/jsons/http_stat_stat_ref.md

@@ -0,0 +1,16 @@
+# 统计引用
+## 定义
+~~~json
+{
+  "isPrior": "是否覆盖父级配置",
+  "isOn": "是否启用配置"
+}
+~~~
+
+## 示例
+~~~json
+{
+  "isPrior": true,
+  "isOn": true
+}
+~~~

pkg/rpc/jsons/http_websocket_ref.md

@@ -0,0 +1,21 @@
+# WebSocket引用
+
+## 定义
+~~~json
+{
+	"isPrior": "是否覆盖上级配置，true|false",
+	"isOn": "是否启用，true|false",
+	"websocketId": "Websocket配置ID"
+}
+~~~
+其中：
+* `Websocket配置ID` - 需要调用 `HTTPWebsocketService.CreateHTTPWebsocketRequest()` 生成 
+
+## 示例
+~~~json
+{
+	"isPrior": true,
+	"isOn": true,
+	"websocketId": 123
+}
+~~~

pkg/rpc/jsons/server_name.md

@@ -0,0 +1,9 @@
+# 域名信息
+
+## 示例
+~~~json
+{
+  "name": "example.com",
+  "type": "full"
+}
+~~~

pkg/rpc/jsons/server_names.md

@@ -0,0 +1,48 @@
+# 域名信息列表
+
+## 定义
+~~~
+[ 域名信息1, 域名信息2, ... ]
+~~~
+其中 `域名信息N` 等是单个域名信息定义，具体请参考 {json:server_name}
+
+## 示例
+### 示例1：单个域名
+~~~json
+[
+	{
+		"name": "example.com",
+		"type": "full"
+	}
+]
+~~~
+
+### 示例2：多个域名
+~~~json
+[
+	{
+		"name": "example.com",
+		"type": "full"
+	},
+	{
+      	"name": "google.com",
+      	"type": "full"
+  	},
+  	{
+		"name": "facebook.com",
+	  	"type": "full"
+  	}
+]
+~~~
+
+### 示例3：域名合集
+域名合集效果跟多个域名是一样的，只不过在界面上以一个目录的形式呈现。
+~~~json
+[
+  	{
+		"name": "",
+	  	"type": "full",
+	  	"subNames": ["example.com", "google.com", "facebook.com"]
+  	}
+]
+~~~

pkg/rpc/jsons/ssl_cert_refs.md

@@ -0,0 +1,18 @@
+# SSL证书引用
+
+## 示例
+~~~
+[
+  {
+    "isOn": true,
+    "certId": 12345
+  },
+  {
+    "isOn": true,
+    "certId": 12346
+  }
+]
+~~~
+
+其中：
+* `certId` - 证书的ID

pkg/rpc/pb/api_method_stat_service.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: api_method_stat_service.proto
 
 package pb

pkg/rpc/pb/model_acme_provider.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_acme_provider.proto
 
 package pb

pkg/rpc/pb/model_acme_provider_account.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_acme_provider_account.proto
 
 package pb

pkg/rpc/pb/model_acme_task.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_acme_task.proto
 
 package pb

pkg/rpc/pb/model_acme_task_log.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_acme_task_log.proto
 
 package pb

pkg/rpc/pb/model_acme_user.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_acme_user.proto
 
 package pb

pkg/rpc/pb/model_admin.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_admin.proto
 
 package pb

pkg/rpc/pb/model_admin_list.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_admin_list.proto
 
 package pb

pkg/rpc/pb/model_admin_module.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_admin_module.proto
 
 package pb

pkg/rpc/pb/model_api_method_stat.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_api_method_stat.proto
 
 package pb

pkg/rpc/pb/model_api_node.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_api_node.proto
 
 package pb
@@ -45,7 +45,9 @@ type APINode struct {
 	AccessAddrsJSON []byte   `protobuf:"bytes,10,opt,name=accessAddrsJSON,proto3" json:"accessAddrsJSON,omitempty"`
 	AccessAddrs     []string `protobuf:"bytes,11,rep,name=accessAddrs,proto3" json:"accessAddrs,omitempty"`
 	StatusJSON      []byte   `protobuf:"bytes,12,opt,name=statusJSON,proto3" json:"statusJSON,omitempty"`
+	IsPrimary       bool     `protobuf:"varint,16,opt,name=isPrimary,proto3" json:"isPrimary,omitempty"`
 	Debug           bool     `protobuf:"varint,30,opt,name=debug,proto3" json:"debug,omitempty"`
+	InstanceCode    string   `protobuf:"bytes,31,opt,name=instanceCode,proto3" json:"instanceCode,omitempty"`
 }
 
 func (x *APINode) Reset() {
@@ -185,6 +187,13 @@ func (x *APINode) GetStatusJSON() []byte {
 	return nil
 }
 
+func (x *APINode) GetIsPrimary() bool {
+	if x != nil {
+		return x.IsPrimary
+	}
+	return false
+}
+
 func (x *APINode) GetDebug() bool {
 	if x != nil {
 		return x.Debug
@@ -192,12 +201,19 @@ func (x *APINode) GetDebug() bool {
 	return false
 }
 
+func (x *APINode) GetInstanceCode() string {
+	if x != nil {
+		return x.InstanceCode
+	}
+	return ""
+}
+
 var File_models_model_api_node_proto protoreflect.FileDescriptor
 
 var file_models_model_api_node_proto_rawDesc = []byte{
 	0x0a, 0x1b, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x61,
 	0x70, 0x69, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70,
-	0x62, 0x22, 0xdf, 0x03, 0x0a, 0x07, 0x41, 0x50, 0x49, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x0e, 0x0a,
+	0x62, 0x22, 0xa1, 0x04, 0x0a, 0x07, 0x41, 0x50, 0x49, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x0e, 0x0a,
 	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a,
 	0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f,
 	0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
@@ -225,10 +241,14 @@ var file_models_model_api_node_proto_rawDesc = []byte{
 	0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x64, 0x64, 0x72, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x09,
 	0x52, 0x0b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x41, 0x64, 0x64, 0x72, 0x73, 0x12, 0x1e, 0x0a,
 	0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x0c, 0x20, 0x01, 0x28,
-	0x0c, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x14, 0x0a,
-	0x05, 0x64, 0x65, 0x62, 0x75, 0x67, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x64, 0x65,
-	0x62, 0x75, 0x67, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x0c, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x1c, 0x0a,
+	0x09, 0x69, 0x73, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x09, 0x69, 0x73, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x64,
+	0x65, 0x62, 0x75, 0x67, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x64, 0x65, 0x62, 0x75,
+	0x67, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x43, 0x6f, 0x64,
+	0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
+	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_api_token.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_api_token.proto
 
 package pb

pkg/rpc/pb/model_authority_key.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_authority_key.proto
 
 package pb

pkg/rpc/pb/model_authority_node.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_authority_node.proto
 
 package pb

pkg/rpc/pb/model_client_browser.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_client_browser.proto
 
 package pb

pkg/rpc/pb/model_client_system.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_client_system.proto
 
 package pb

pkg/rpc/pb/model_db_node.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_db_node.proto
 
 package pb

pkg/rpc/pb/model_db_table.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_db_table.proto
 
 package pb

pkg/rpc/pb/model_dns_domain.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_dns_domain.proto
 
 package pb

pkg/rpc/pb/model_dns_issue.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_dns_issue.proto
 
 package pb

pkg/rpc/pb/model_dns_provider.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_dns_provider.proto
 
 package pb

pkg/rpc/pb/model_dns_record.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_dns_record.proto
 
 package pb

pkg/rpc/pb/model_dns_route.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_dns_route.proto
 
 package pb

pkg/rpc/pb/model_dns_task.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_dns_task.proto
 
 package pb

pkg/rpc/pb/model_file.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_file.proto
 
 package pb
@@ -35,6 +35,8 @@ type File struct {
 	Size      int64  `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"`
 	CreatedAt int64  `protobuf:"varint,4,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
 	IsPublic  bool   `protobuf:"varint,5,opt,name=isPublic,proto3" json:"isPublic,omitempty"`
+	MimeType  string `protobuf:"bytes,6,opt,name=mimeType,proto3" json:"mimeType,omitempty"`
+	Type      string `protobuf:"bytes,7,opt,name=type,proto3" json:"type,omitempty"`
 }
 
 func (x *File) Reset() {
@@ -104,11 +106,25 @@ func (x *File) GetIsPublic() bool {
 	return false
 }
 
+func (x *File) GetMimeType() string {
+	if x != nil {
+		return x.MimeType
+	}
+	return ""
+}
+
+func (x *File) GetType() string {
+	if x != nil {
+		return x.Type
+	}
+	return ""
+}
+
 var File_models_model_file_proto protoreflect.FileDescriptor
 
 var file_models_model_file_proto_rawDesc = []byte{
 	0x0a, 0x17, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x66,
-	0x69, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x80, 0x01,
+	0x69, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xb0, 0x01,
 	0x0a, 0x04, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61,
 	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61,
@@ -117,6 +133,9 @@ var file_models_model_file_proto_rawDesc = []byte{
 	0x64, 0x41, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74,
 	0x65, 0x64, 0x41, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63,
 	0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63,
+	0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x69, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x6d, 0x69, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04,
+	0x74, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65,
 	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 

pkg/rpc/pb/model_file_chunk.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_file_chunk.proto
 
 package pb

pkg/rpc/pb/model_http_access_log.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_http_access_log.proto
 
 package pb

pkg/rpc/pb/model_http_access_log_policy.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_http_access_log_policy.proto
 
 package pb
@@ -30,13 +30,14 @@ type HTTPAccessLogPolicy struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id          int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	Name        string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	IsOn        bool   `protobuf:"varint,3,opt,name=isOn,proto3" json:"isOn,omitempty"`
-	Type        string `protobuf:"bytes,4,opt,name=type,proto3" json:"type,omitempty"`
-	OptionsJSON []byte `protobuf:"bytes,5,opt,name=optionsJSON,proto3" json:"optionsJSON,omitempty"`
-	CondsJSON   []byte `protobuf:"bytes,6,opt,name=condsJSON,proto3" json:"condsJSON,omitempty"`
-	IsPublic    bool   `protobuf:"varint,7,opt,name=isPublic,proto3" json:"isPublic,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"`
+	IsOn         bool   `protobuf:"varint,3,opt,name=isOn,proto3" json:"isOn,omitempty"`
+	Type         string `protobuf:"bytes,4,opt,name=type,proto3" json:"type,omitempty"`
+	OptionsJSON  []byte `protobuf:"bytes,5,opt,name=optionsJSON,proto3" json:"optionsJSON,omitempty"`
+	CondsJSON    []byte `protobuf:"bytes,6,opt,name=condsJSON,proto3" json:"condsJSON,omitempty"`
+	IsPublic     bool   `protobuf:"varint,7,opt,name=isPublic,proto3" json:"isPublic,omitempty"`
+	FirewallOnly bool   `protobuf:"varint,8,opt,name=firewallOnly,proto3" json:"firewallOnly,omitempty"`
 }
 
 func (x *HTTPAccessLogPolicy) Reset() {
@@ -120,13 +121,20 @@ func (x *HTTPAccessLogPolicy) GetIsPublic() bool {
 	return false
 }
 
+func (x *HTTPAccessLogPolicy) GetFirewallOnly() bool {
+	if x != nil {
+		return x.FirewallOnly
+	}
+	return false
+}
+
 var File_models_model_http_access_log_policy_proto protoreflect.FileDescriptor
 
 var file_models_model_http_access_log_policy_proto_rawDesc = []byte{
 	0x0a, 0x29, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x68,
 	0x74, 0x74, 0x70, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x70,
 	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22,
-	0xbd, 0x01, 0x0a, 0x13, 0x48, 0x54, 0x54, 0x50, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f,
+	0xe1, 0x01, 0x0a, 0x13, 0x48, 0x54, 0x54, 0x50, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f,
 	0x67, 0x50, 0x6f, 0x6c, 0x69, 0x63, 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, 0x12, 0x0a, 0x04, 0x69,
@@ -137,8 +145,11 @@ var file_models_model_http_access_log_policy_proto_rawDesc = []byte{
 	0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x4a, 0x53,
 	0x4f, 0x4e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x4a,
 	0x53, 0x4f, 0x4e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x42,
-	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x12,
+	0x22, 0x0a, 0x0c, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x4f, 0x6e, 0x6c, 0x79, 0x18,
+	0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x4f,
+	0x6e, 0x6c, 0x79, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (

pkg/rpc/pb/model_http_auth_policy.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_http_auth_policy.proto
 
 package pb

pkg/rpc/pb/model_http_cache_policy.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_http_cache_policy.proto
 
 package pb

pkg/rpc/pb/model_http_cache_task.pb.go

@@ -0,0 +1,256 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_http_cache_task.proto
+
+package pb
+
+import (
+	proto "github.com/golang/protobuf/proto"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
+
+type HTTPCacheTask struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id                int64               `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	UserId            int64               `protobuf:"varint,2,opt,name=userId,proto3" json:"userId,omitempty"`
+	Type              string              `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"`
+	KeyType           string              `protobuf:"bytes,4,opt,name=keyType,proto3" json:"keyType,omitempty"`
+	CreatedAt         int64               `protobuf:"varint,5,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
+	DoneAt            int64               `protobuf:"varint,6,opt,name=doneAt,proto3" json:"doneAt,omitempty"`
+	IsDone            bool                `protobuf:"varint,7,opt,name=isDone,proto3" json:"isDone,omitempty"`
+	IsOk              bool                `protobuf:"varint,8,opt,name=isOk,proto3" json:"isOk,omitempty"`
+	Description       string              `protobuf:"bytes,9,opt,name=description,proto3" json:"description,omitempty"`
+	User              *User               `protobuf:"bytes,30,opt,name=user,proto3" json:"user,omitempty"`
+	HttpCacheTaskKeys []*HTTPCacheTaskKey `protobuf:"bytes,31,rep,name=httpCacheTaskKeys,proto3" json:"httpCacheTaskKeys,omitempty"`
+}
+
+func (x *HTTPCacheTask) Reset() {
+	*x = HTTPCacheTask{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_http_cache_task_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HTTPCacheTask) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HTTPCacheTask) ProtoMessage() {}
+
+func (x *HTTPCacheTask) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_http_cache_task_proto_msgTypes[0]
+	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 HTTPCacheTask.ProtoReflect.Descriptor instead.
+func (*HTTPCacheTask) Descriptor() ([]byte, []int) {
+	return file_models_model_http_cache_task_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *HTTPCacheTask) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *HTTPCacheTask) GetUserId() int64 {
+	if x != nil {
+		return x.UserId
+	}
+	return 0
+}
+
+func (x *HTTPCacheTask) GetType() string {
+	if x != nil {
+		return x.Type
+	}
+	return ""
+}
+
+func (x *HTTPCacheTask) GetKeyType() string {
+	if x != nil {
+		return x.KeyType
+	}
+	return ""
+}
+
+func (x *HTTPCacheTask) GetCreatedAt() int64 {
+	if x != nil {
+		return x.CreatedAt
+	}
+	return 0
+}
+
+func (x *HTTPCacheTask) GetDoneAt() int64 {
+	if x != nil {
+		return x.DoneAt
+	}
+	return 0
+}
+
+func (x *HTTPCacheTask) GetIsDone() bool {
+	if x != nil {
+		return x.IsDone
+	}
+	return false
+}
+
+func (x *HTTPCacheTask) GetIsOk() bool {
+	if x != nil {
+		return x.IsOk
+	}
+	return false
+}
+
+func (x *HTTPCacheTask) GetDescription() string {
+	if x != nil {
+		return x.Description
+	}
+	return ""
+}
+
+func (x *HTTPCacheTask) GetUser() *User {
+	if x != nil {
+		return x.User
+	}
+	return nil
+}
+
+func (x *HTTPCacheTask) GetHttpCacheTaskKeys() []*HTTPCacheTaskKey {
+	if x != nil {
+		return x.HttpCacheTaskKeys
+	}
+	return nil
+}
+
+var File_models_model_http_cache_task_proto protoreflect.FileDescriptor
+
+var file_models_model_http_cache_task_proto_rawDesc = []byte{
+	0x0a, 0x22, 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, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x17, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73,
+	0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x1a, 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, 0x22, 0xcb, 0x02, 0x0a, 0x0d, 0x48, 0x54,
+	0x54, 0x50, 0x43, 0x61, 0x63, 0x68, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75,
+	0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65,
+	0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x54, 0x79,
+	0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x54, 0x79, 0x70,
+	0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12,
+	0x16, 0x0a, 0x06, 0x64, 0x6f, 0x6e, 0x65, 0x41, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x06, 0x64, 0x6f, 0x6e, 0x65, 0x41, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x44, 0x6f, 0x6e,
+	0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x44, 0x6f, 0x6e, 0x65, 0x12,
+	0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69,
+	0x73, 0x4f, 0x6b, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x1e, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75,
+	0x73, 0x65, 0x72, 0x12, 0x42, 0x0a, 0x11, 0x68, 0x74, 0x74, 0x70, 0x43, 0x61, 0x63, 0x68, 0x65,
+	0x54, 0x61, 0x73, 0x6b, 0x4b, 0x65, 0x79, 0x73, 0x18, 0x1f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14,
+	0x2e, 0x70, 0x62, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x43, 0x61, 0x63, 0x68, 0x65, 0x54, 0x61, 0x73,
+	0x6b, 0x4b, 0x65, 0x79, 0x52, 0x11, 0x68, 0x74, 0x74, 0x70, 0x43, 0x61, 0x63, 0x68, 0x65, 0x54,
+	0x61, 0x73, 0x6b, 0x4b, 0x65, 0x79, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_http_cache_task_proto_rawDescOnce sync.Once
+	file_models_model_http_cache_task_proto_rawDescData = file_models_model_http_cache_task_proto_rawDesc
+)
+
+func file_models_model_http_cache_task_proto_rawDescGZIP() []byte {
+	file_models_model_http_cache_task_proto_rawDescOnce.Do(func() {
+		file_models_model_http_cache_task_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_http_cache_task_proto_rawDescData)
+	})
+	return file_models_model_http_cache_task_proto_rawDescData
+}
+
+var file_models_model_http_cache_task_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_http_cache_task_proto_goTypes = []interface{}{
+	(*HTTPCacheTask)(nil),    // 0: pb.HTTPCacheTask
+	(*User)(nil),             // 1: pb.User
+	(*HTTPCacheTaskKey)(nil), // 2: pb.HTTPCacheTaskKey
+}
+var file_models_model_http_cache_task_proto_depIdxs = []int32{
+	1, // 0: pb.HTTPCacheTask.user:type_name -> pb.User
+	2, // 1: pb.HTTPCacheTask.httpCacheTaskKeys:type_name -> pb.HTTPCacheTaskKey
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
+}
+
+func init() { file_models_model_http_cache_task_proto_init() }
+func file_models_model_http_cache_task_proto_init() {
+	if File_models_model_http_cache_task_proto != nil {
+		return
+	}
+	file_models_model_user_proto_init()
+	file_models_model_http_cache_task_key_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_http_cache_task_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HTTPCacheTask); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_models_model_http_cache_task_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_http_cache_task_proto_goTypes,
+		DependencyIndexes: file_models_model_http_cache_task_proto_depIdxs,
+		MessageInfos:      file_models_model_http_cache_task_proto_msgTypes,
+	}.Build()
+	File_models_model_http_cache_task_proto = out.File
+	file_models_model_http_cache_task_proto_rawDesc = nil
+	file_models_model_http_cache_task_proto_goTypes = nil
+	file_models_model_http_cache_task_proto_depIdxs = nil
+}

pkg/rpc/pb/model_http_cache_task_key.pb.go

@@ -0,0 +1,225 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_http_cache_task_key.proto
+
+package pb
+
+import (
+	proto "github.com/golang/protobuf/proto"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
+
+type HTTPCacheTaskKey struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id            int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	TaskId        int64  `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId,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"`
+	KeyType       string `protobuf:"bytes,5,opt,name=keyType,proto3" json:"keyType,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"` // 是否执行中
+	ErrorsJSON    []byte `protobuf:"bytes,7,opt,name=errorsJSON,proto3" json:"errorsJSON,omitempty"`
+	NodeClusterId int64  `protobuf:"varint,8,opt,name=nodeClusterId,proto3" json:"nodeClusterId,omitempty"`
+}
+
+func (x *HTTPCacheTaskKey) Reset() {
+	*x = HTTPCacheTaskKey{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_http_cache_task_key_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HTTPCacheTaskKey) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HTTPCacheTaskKey) ProtoMessage() {}
+
+func (x *HTTPCacheTaskKey) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_http_cache_task_key_proto_msgTypes[0]
+	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 HTTPCacheTaskKey.ProtoReflect.Descriptor instead.
+func (*HTTPCacheTaskKey) Descriptor() ([]byte, []int) {
+	return file_models_model_http_cache_task_key_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *HTTPCacheTaskKey) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *HTTPCacheTaskKey) GetTaskId() int64 {
+	if x != nil {
+		return x.TaskId
+	}
+	return 0
+}
+
+func (x *HTTPCacheTaskKey) GetKey() string {
+	if x != nil {
+		return x.Key
+	}
+	return ""
+}
+
+func (x *HTTPCacheTaskKey) GetType() string {
+	if x != nil {
+		return x.Type
+	}
+	return ""
+}
+
+func (x *HTTPCacheTaskKey) GetKeyType() string {
+	if x != nil {
+		return x.KeyType
+	}
+	return ""
+}
+
+func (x *HTTPCacheTaskKey) GetIsDone() bool {
+	if x != nil {
+		return x.IsDone
+	}
+	return false
+}
+
+func (x *HTTPCacheTaskKey) GetIsDoing() bool {
+	if x != nil {
+		return x.IsDoing
+	}
+	return false
+}
+
+func (x *HTTPCacheTaskKey) GetErrorsJSON() []byte {
+	if x != nil {
+		return x.ErrorsJSON
+	}
+	return nil
+}
+
+func (x *HTTPCacheTaskKey) GetNodeClusterId() int64 {
+	if x != nil {
+		return x.NodeClusterId
+	}
+	return 0
+}
+
+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,
+	0x10, 0x48, 0x54, 0x54, 0x50, 0x43, 0x61, 0x63, 0x68, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4b, 0x65,
+	0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69,
+	0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x74,
+	0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12,
+	0x18, 0x0a, 0x07, 0x6b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x07, 0x6b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x44,
+	0x6f, 0x6e, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x44, 0x6f, 0x6e,
+	0x65, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x44, 0x6f, 0x69, 0x6e, 0x67, 0x18, 0x09, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x44, 0x6f, 0x69, 0x6e, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x65,
+	0x72, 0x72, 0x6f, 0x72, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x24, 0x0a, 0x0d, 0x6e,
+	0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49,
+	0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
+}
+
+var (
+	file_models_model_http_cache_task_key_proto_rawDescOnce sync.Once
+	file_models_model_http_cache_task_key_proto_rawDescData = file_models_model_http_cache_task_key_proto_rawDesc
+)
+
+func file_models_model_http_cache_task_key_proto_rawDescGZIP() []byte {
+	file_models_model_http_cache_task_key_proto_rawDescOnce.Do(func() {
+		file_models_model_http_cache_task_key_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_http_cache_task_key_proto_rawDescData)
+	})
+	return file_models_model_http_cache_task_key_proto_rawDescData
+}
+
+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
+}
+var file_models_model_http_cache_task_key_proto_depIdxs = []int32{
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_models_model_http_cache_task_key_proto_init() }
+func file_models_model_http_cache_task_key_proto_init() {
+	if File_models_model_http_cache_task_key_proto != nil {
+		return
+	}
+	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 {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_models_model_http_cache_task_key_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_http_cache_task_key_proto_goTypes,
+		DependencyIndexes: file_models_model_http_cache_task_key_proto_depIdxs,
+		MessageInfos:      file_models_model_http_cache_task_key_proto_msgTypes,
+	}.Build()
+	File_models_model_http_cache_task_key_proto = out.File
+	file_models_model_http_cache_task_key_proto_rawDesc = nil
+	file_models_model_http_cache_task_key_proto_goTypes = nil
+	file_models_model_http_cache_task_key_proto_depIdxs = nil
+}

pkg/rpc/pb/model_http_fastcgi.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_http_fastcgi.proto
 
 package pb

pkg/rpc/pb/model_http_firewall_policy.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_http_firewall_policy.proto
 
 package pb

pkg/rpc/pb/model_http_firewall_rule_group.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_http_firewall_rule_group.proto
 
 package pb

pkg/rpc/pb/model_http_firewall_rule_set.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_http_firewall_rule_set.proto
 
 package pb

pkg/rpc/pb/model_http_gzip.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_http_gzip.proto
 
 package pb

pkg/rpc/pb/model_http_web.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_http_web.proto
 
 package pb

pkg/rpc/pb/model_ip_item.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_ip_item.proto
 
 package pb

pkg/rpc/pb/model_ip_library.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_ip_library.proto
 
 package pb

pkg/rpc/pb/model_ip_list.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_ip_list.proto
 
 package pb

pkg/rpc/pb/model_log.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_log.proto
 
 package pb

pkg/rpc/pb/model_login.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_login.proto
 
 package pb

pkg/rpc/pb/model_message.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_message.proto
 
 package pb

pkg/rpc/pb/model_message_media.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_message_media.proto
 
 package pb

pkg/rpc/pb/model_message_media_instance.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_message_media_instance.proto
 
 package pb

pkg/rpc/pb/model_message_receiver.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_message_receiver.proto
 
 package pb

pkg/rpc/pb/model_message_recipient.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_message_recipient.proto
 
 package pb

pkg/rpc/pb/model_message_recipient_group.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_message_recipient_group.proto
 
 package pb

pkg/rpc/pb/model_message_task.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_message_task.proto
 
 package pb

pkg/rpc/pb/model_message_task_log.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_message_task_log.proto
 
 package pb

pkg/rpc/pb/model_metric_chart.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_metric_chart.proto
 
 package pb

pkg/rpc/pb/model_metric_item.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_metric_item.proto
 
 package pb
@@ -31,16 +31,17 @@ type MetricItem struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id         int64    `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	IsOn       bool     `protobuf:"varint,2,opt,name=isOn,proto3" json:"isOn,omitempty"`
-	Code       string   `protobuf:"bytes,3,opt,name=code,proto3" json:"code,omitempty"`
-	Category   string   `protobuf:"bytes,4,opt,name=category,proto3" json:"category,omitempty"`
-	Name       string   `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
-	Keys       []string `protobuf:"bytes,6,rep,name=keys,proto3" json:"keys,omitempty"`
-	Period     int32    `protobuf:"varint,7,opt,name=period,proto3" json:"period,omitempty"`
-	PeriodUnit string   `protobuf:"bytes,8,opt,name=periodUnit,proto3" json:"periodUnit,omitempty"`
-	Value      string   `protobuf:"bytes,10,opt,name=value,proto3" json:"value,omitempty"`
-	IsPublic   bool     `protobuf:"varint,11,opt,name=isPublic,proto3" json:"isPublic,omitempty"`
+	Id            int64    `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	IsOn          bool     `protobuf:"varint,2,opt,name=isOn,proto3" json:"isOn,omitempty"`
+	Code          string   `protobuf:"bytes,3,opt,name=code,proto3" json:"code,omitempty"`
+	Category      string   `protobuf:"bytes,4,opt,name=category,proto3" json:"category,omitempty"`
+	Name          string   `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"`
+	Keys          []string `protobuf:"bytes,6,rep,name=keys,proto3" json:"keys,omitempty"`
+	Period        int32    `protobuf:"varint,7,opt,name=period,proto3" json:"period,omitempty"`
+	PeriodUnit    string   `protobuf:"bytes,8,opt,name=periodUnit,proto3" json:"periodUnit,omitempty"`
+	ExpiresPeriod int32    `protobuf:"varint,12,opt,name=expiresPeriod,proto3" json:"expiresPeriod,omitempty"`
+	Value         string   `protobuf:"bytes,10,opt,name=value,proto3" json:"value,omitempty"`
+	IsPublic      bool     `protobuf:"varint,11,opt,name=isPublic,proto3" json:"isPublic,omitempty"`
 }
 
 func (x *MetricItem) Reset() {
@@ -131,6 +132,13 @@ func (x *MetricItem) GetPeriodUnit() string {
 	return ""
 }
 
+func (x *MetricItem) GetExpiresPeriod() int32 {
+	if x != nil {
+		return x.ExpiresPeriod
+	}
+	return 0
+}
+
 func (x *MetricItem) GetValue() string {
 	if x != nil {
 		return x.Value
@@ -150,7 +158,7 @@ var File_models_model_metric_item_proto protoreflect.FileDescriptor
 var file_models_model_metric_item_proto_rawDesc = []byte{
 	0x0a, 0x1e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6d,
 	0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x12, 0x02, 0x70, 0x62, 0x22, 0xf2, 0x01, 0x0a, 0x0a, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x49,
+	0x12, 0x02, 0x70, 0x62, 0x22, 0x98, 0x02, 0x0a, 0x0a, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x49,
 	0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
 	0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18,
@@ -162,11 +170,13 @@ var file_models_model_metric_item_proto_rawDesc = []byte{
 	0x16, 0x0a, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
 	0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x69, 0x6f,
 	0x64, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x72,
-	0x69, 0x6f, 0x64, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1a, 0x0a,
-	0x08, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x08, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x6f, 0x64, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x78, 0x70, 0x69, 0x72,
+	0x65, 0x73, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d,
+	0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x18,
+	0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pkg/rpc/pb/model_metric_stat.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_metric_stat.proto
 
 package pb

pkg/rpc/pb/model_monitor_node.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_monitor_node.proto
 
 package pb

pkg/rpc/pb/model_network_address.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_network_address.proto
 
 package pb

pkg/rpc/pb/model_node.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_node.proto
 
 package pb
@@ -48,6 +48,8 @@ type Node struct {
 	IsActive               bool               `protobuf:"varint,16,opt,name=isActive,proto3" json:"isActive,omitempty"`
 	MaxCacheDiskCapacity   *SizeCapacity      `protobuf:"bytes,17,opt,name=maxCacheDiskCapacity,proto3" json:"maxCacheDiskCapacity,omitempty"`
 	MaxCacheMemoryCapacity *SizeCapacity      `protobuf:"bytes,18,opt,name=maxCacheMemoryCapacity,proto3" json:"maxCacheMemoryCapacity,omitempty"`
+	CacheDiskDir           string             `protobuf:"bytes,19,opt,name=cacheDiskDir,proto3" json:"cacheDiskDir,omitempty"`
+	Level                  int32              `protobuf:"varint,20,opt,name=level,proto3" json:"level,omitempty"`
 	NodeCluster            *NodeCluster       `protobuf:"bytes,32,opt,name=nodeCluster,proto3" json:"nodeCluster,omitempty"` // 主集群
 	NodeLogin              *NodeLogin         `protobuf:"bytes,33,opt,name=nodeLogin,proto3" json:"nodeLogin,omitempty"`
 	InstallStatus          *NodeInstallStatus `protobuf:"bytes,34,opt,name=installStatus,proto3" json:"installStatus,omitempty"`
@@ -215,6 +217,20 @@ func (x *Node) GetMaxCacheMemoryCapacity() *SizeCapacity {
 	return nil
 }
 
+func (x *Node) GetCacheDiskDir() string {
+	if x != nil {
+		return x.CacheDiskDir
+	}
+	return ""
+}
+
+func (x *Node) GetLevel() int32 {
+	if x != nil {
+		return x.Level
+	}
+	return 0
+}
+
 func (x *Node) GetNodeCluster() *NodeCluster {
 	if x != nil {
 		return x.NodeCluster
@@ -273,6 +289,7 @@ type BasicNode struct {
 	Name        string       `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	IsOn        bool         `protobuf:"varint,3,opt,name=isOn,proto3" json:"isOn,omitempty"`
 	IsUp        bool         `protobuf:"varint,4,opt,name=isUp,proto3" json:"isUp,omitempty"`
+	Level       int32        `protobuf:"varint,5,opt,name=level,proto3" json:"level,omitempty"`
 	NodeCluster *NodeCluster `protobuf:"bytes,30,opt,name=nodeCluster,proto3" json:"nodeCluster,omitempty"` // 主集群
 }
 
@@ -336,6 +353,13 @@ func (x *BasicNode) GetIsUp() bool {
 	return false
 }
 
+func (x *BasicNode) GetLevel() int32 {
+	if x != nil {
+		return x.Level
+	}
+	return 0
+}
+
 func (x *BasicNode) GetNodeCluster() *NodeCluster {
 	if x != nil {
 		return x.NodeCluster
@@ -364,7 +388,7 @@ var file_models_model_node_proto_rawDesc = []byte{
 	0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d,
 	0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69,
-	0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd4, 0x07, 0x0a, 0x04, 0x4e, 0x6f, 0x64,
+	0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8e, 0x08, 0x0a, 0x04, 0x4e, 0x6f, 0x64,
 	0x65, 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, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x4a,
@@ -402,36 +426,41 @@ var file_models_model_node_proto_rawDesc = []byte{
 	0x79, 0x43, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x10, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x69, 0x7a, 0x65, 0x43, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74,
 	0x79, 0x52, 0x16, 0x6d, 0x61, 0x78, 0x43, 0x61, 0x63, 0x68, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x72,
-	0x79, 0x43, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x31, 0x0a, 0x0b, 0x6e, 0x6f, 0x64,
-	0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x20, 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, 0x12, 0x2b, 0x0a, 0x09,
-	0x6e, 0x6f, 0x64, 0x65, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x09,
-	0x6e, 0x6f, 0x64, 0x65, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x3b, 0x0a, 0x0d, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x15, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c,
-	0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x33, 0x0a, 0x0b, 0x69, 0x70, 0x41, 0x64, 0x64, 0x72,
-	0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x62,
-	0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0b,
-	0x69, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x2b, 0x0a, 0x09, 0x6e,
-	0x6f, 0x64, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x24, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
-	0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x09, 0x6e,
-	0x6f, 0x64, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x2e, 0x0a, 0x0a, 0x6e, 0x6f, 0x64, 0x65,
-	0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70,
-	0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x6e, 0x6f,
-	0x64, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x12, 0x45, 0x0a, 0x15, 0x73, 0x65, 0x63, 0x6f,
-	0x6e, 0x64, 0x61, 0x72, 0x79, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x73, 0x18, 0x26, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64,
-	0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x15, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64,
-	0x61, 0x72, 0x79, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x22,
-	0x8a, 0x01, 0x0a, 0x09, 0x42, 0x61, 0x73, 0x69, 0x63, 0x4e, 0x6f, 0x64, 0x65, 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, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x55, 0x70, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x55, 0x70, 0x12, 0x31, 0x0a, 0x0b, 0x6e, 0x6f, 0x64,
+	0x79, 0x43, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x61, 0x63,
+	0x68, 0x65, 0x44, 0x69, 0x73, 0x6b, 0x44, 0x69, 0x72, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0c, 0x63, 0x61, 0x63, 0x68, 0x65, 0x44, 0x69, 0x73, 0x6b, 0x44, 0x69, 0x72, 0x12, 0x14, 0x0a,
+	0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65,
+	0x76, 0x65, 0x6c, 0x12, 0x31, 0x0a, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x18, 0x20, 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, 0x12, 0x2b, 0x0a, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x4c, 0x6f,
+	0x67, 0x69, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x4e,
+	0x6f, 0x64, 0x65, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x4c, 0x6f,
+	0x67, 0x69, 0x6e, 0x12, 0x3b, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x70, 0x62, 0x2e,
+	0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x52, 0x0d, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x12, 0x33, 0x0a, 0x0b, 0x69, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18,
+	0x23, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49,
+	0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0b, 0x69, 0x70, 0x41, 0x64, 0x64, 0x72,
+	0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x2b, 0x0a, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x47, 0x72, 0x6f,
+	0x75, 0x70, 0x18, 0x24, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f,
+	0x64, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x47, 0x72, 0x6f,
+	0x75, 0x70, 0x12, 0x2e, 0x0a, 0x0a, 0x6e, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e,
+	0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65,
+	0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x6e, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x67, 0x69,
+	0x6f, 0x6e, 0x12, 0x45, 0x0a, 0x15, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x4e,
+	0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x26, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x52, 0x15, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x4e, 0x6f, 0x64,
+	0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x22, 0xa0, 0x01, 0x0a, 0x09, 0x42, 0x61,
+	0x73, 0x69, 0x63, 0x4e, 0x6f, 0x64, 0x65, 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, 0x12, 0x0a, 0x04, 0x69,
+	0x73, 0x4f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12,
+	0x12, 0x0a, 0x04, 0x69, 0x73, 0x55, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69,
+	0x73, 0x55, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 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,

pkg/rpc/pb/model_node_cluster.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_node_cluster.proto
 
 package pb
@@ -30,22 +30,22 @@ type NodeCluster struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id                    int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	Name                  string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
-	CreatedAt             int64  `protobuf:"varint,3,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
-	NodeGrantId           int64  `protobuf:"varint,4,opt,name=nodeGrantId,proto3" json:"nodeGrantId,omitempty"`
-	InstallDir            string `protobuf:"bytes,5,opt,name=installDir,proto3" json:"installDir,omitempty"`
-	UniqueId              string `protobuf:"bytes,6,opt,name=uniqueId,proto3" json:"uniqueId,omitempty"`
-	Secret                string `protobuf:"bytes,7,opt,name=secret,proto3" json:"secret,omitempty"`
-	DnsName               string `protobuf:"bytes,8,opt,name=dnsName,proto3" json:"dnsName,omitempty"`
-	DnsDomainId           int64  `protobuf:"varint,9,opt,name=dnsDomainId,proto3" json:"dnsDomainId,omitempty"`
-	HttpCachePolicyId     int64  `protobuf:"varint,10,opt,name=httpCachePolicyId,proto3" json:"httpCachePolicyId,omitempty"`
-	HttpFirewallPolicyId  int64  `protobuf:"varint,11,opt,name=httpFirewallPolicyId,proto3" json:"httpFirewallPolicyId,omitempty"`
-	IsOn                  bool   `protobuf:"varint,12,opt,name=isOn,proto3" json:"isOn,omitempty"`
-	TimeZone              string `protobuf:"bytes,13,opt,name=timeZone,proto3" json:"timeZone,omitempty"`
-	NodeMaxThreads        int32  `protobuf:"varint,14,opt,name=nodeMaxThreads,proto3" json:"nodeMaxThreads,omitempty"`
-	NodeTCPMaxConnections int32  `protobuf:"varint,15,opt,name=nodeTCPMaxConnections,proto3" json:"nodeTCPMaxConnections,omitempty"`
-	AutoOpenPorts         bool   `protobuf:"varint,16,opt,name=autoOpenPorts,proto3" json:"autoOpenPorts,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"`
+	CreatedAt            int64  `protobuf:"varint,3,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
+	NodeGrantId          int64  `protobuf:"varint,4,opt,name=nodeGrantId,proto3" json:"nodeGrantId,omitempty"`
+	InstallDir           string `protobuf:"bytes,5,opt,name=installDir,proto3" json:"installDir,omitempty"`
+	UniqueId             string `protobuf:"bytes,6,opt,name=uniqueId,proto3" json:"uniqueId,omitempty"`
+	Secret               string `protobuf:"bytes,7,opt,name=secret,proto3" json:"secret,omitempty"`
+	DnsName              string `protobuf:"bytes,8,opt,name=dnsName,proto3" json:"dnsName,omitempty"`
+	DnsDomainId          int64  `protobuf:"varint,9,opt,name=dnsDomainId,proto3" json:"dnsDomainId,omitempty"`
+	HttpCachePolicyId    int64  `protobuf:"varint,10,opt,name=httpCachePolicyId,proto3" json:"httpCachePolicyId,omitempty"`
+	HttpFirewallPolicyId int64  `protobuf:"varint,11,opt,name=httpFirewallPolicyId,proto3" json:"httpFirewallPolicyId,omitempty"`
+	IsOn                 bool   `protobuf:"varint,12,opt,name=isOn,proto3" json:"isOn,omitempty"`
+	TimeZone             string `protobuf:"bytes,13,opt,name=timeZone,proto3" json:"timeZone,omitempty"`
+	NodeMaxThreads       int32  `protobuf:"varint,14,opt,name=nodeMaxThreads,proto3" json:"nodeMaxThreads,omitempty"`
+	AutoOpenPorts        bool   `protobuf:"varint,16,opt,name=autoOpenPorts,proto3" json:"autoOpenPorts,omitempty"`
+	IsPinned             bool   `protobuf:"varint,17,opt,name=isPinned,proto3" json:"isPinned,omitempty"`
 }
 
 func (x *NodeCluster) Reset() {
@@ -178,13 +178,6 @@ func (x *NodeCluster) GetNodeMaxThreads() int32 {
 	return 0
 }
 
-func (x *NodeCluster) GetNodeTCPMaxConnections() int32 {
-	if x != nil {
-		return x.NodeTCPMaxConnections
-	}
-	return 0
-}
-
 func (x *NodeCluster) GetAutoOpenPorts() bool {
 	if x != nil {
 		return x.AutoOpenPorts
@@ -192,12 +185,19 @@ func (x *NodeCluster) GetAutoOpenPorts() bool {
 	return false
 }
 
+func (x *NodeCluster) GetIsPinned() bool {
+	if x != nil {
+		return x.IsPinned
+	}
+	return false
+}
+
 var File_models_model_node_cluster_proto protoreflect.FileDescriptor
 
 var file_models_model_node_cluster_proto_rawDesc = []byte{
 	0x0a, 0x1f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e,
 	0x6f, 0x64, 0x65, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x97, 0x04, 0x0a, 0x0b, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c,
+	0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xfd, 0x03, 0x0a, 0x0b, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c,
 	0x75, 0x73, 0x74, 0x65, 0x72, 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, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65,
@@ -225,13 +225,12 @@ var file_models_model_node_cluster_proto_rawDesc = []byte{
 	0x09, 0x52, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x5a, 0x6f, 0x6e, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x6e,
 	0x6f, 0x64, 0x65, 0x4d, 0x61, 0x78, 0x54, 0x68, 0x72, 0x65, 0x61, 0x64, 0x73, 0x18, 0x0e, 0x20,
 	0x01, 0x28, 0x05, 0x52, 0x0e, 0x6e, 0x6f, 0x64, 0x65, 0x4d, 0x61, 0x78, 0x54, 0x68, 0x72, 0x65,
-	0x61, 0x64, 0x73, 0x12, 0x34, 0x0a, 0x15, 0x6e, 0x6f, 0x64, 0x65, 0x54, 0x43, 0x50, 0x4d, 0x61,
-	0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0f, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x15, 0x6e, 0x6f, 0x64, 0x65, 0x54, 0x43, 0x50, 0x4d, 0x61, 0x78, 0x43, 0x6f,
-	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x75, 0x74,
-	0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x50, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0d, 0x61, 0x75, 0x74, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x50, 0x6f, 0x72, 0x74, 0x73, 0x42,
-	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x64, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x75, 0x74, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x50,
+	0x6f, 0x72, 0x74, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x61, 0x75, 0x74, 0x6f,
+	0x4f, 0x70, 0x65, 0x6e, 0x50, 0x6f, 0x72, 0x74, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x50,
+	0x69, 0x6e, 0x6e, 0x65, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x50,
+	0x69, 0x6e, 0x6e, 0x65, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pkg/rpc/pb/model_node_cluster_firewall_action.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_node_cluster_firewall_action.proto
 
 package pb

pkg/rpc/pb/model_node_grant.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.25.0
-// 	protoc        v3.12.3
+// 	protoc        v3.19.4
 // source: models/model_node_grant.proto
 
 package pb