增加简化版的创建TCP网站API

.gitignore

@@ -0,0 +1,2 @@
+*_plus.go
+*_plus_test.go

README.md

@@ -14,6 +14,7 @@ pkg/
   userconfigs - 用户相关配置
   
   configutils/ - 配置公共函数等
+  iplibrary/ - IP库
   errors/  - 错误处理
   rpc/  - RPC通讯
      protos/   RPC数据和接口定义

build/build.sh

@@ -10,7 +10,7 @@ if [ "${RESULT}" != "0" ]; then
 	exit
 fi
 
-RESULT=`protoc --go_out=plugins=grpc:../pkg/rpc --proto_path=../pkg/rpc/protos ../pkg/rpc/protos/models/*.proto`
+protoc --go_out=plugins=grpc:../pkg/rpc --proto_path=../pkg/rpc/protos ../pkg/rpc/protos/models/*.proto
 RESULT=$?
 if [ "${RESULT}" != "0" ]; then
 	exit

cmd/proto-json/main.go

@@ -9,10 +9,12 @@ import (
 	"fmt"
 	"github.com/iwind/TeaGo/Tea"
 	_ "github.com/iwind/TeaGo/bootstrap"
+	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/types"
 	"os"
 	"path/filepath"
 	"regexp"
+	"sort"
 	"strings"
 )
 
@@ -30,6 +32,7 @@ type MethodInfo struct {
 	Code                string   `json:"code"`
 	Doc                 string   `json:"doc"`
 	Roles               []string `json:"roles"`
+	IsDeprecated        bool     `json:"isDeprecated"`
 }
 
 type MessageInfo struct {
@@ -95,73 +98,130 @@ func main() {
 	var methodRolesMap = map[string][]string{} // method => roles
 	{
 		var rootDir = filepath.Clean(Tea.Root + "/../../EdgeAPI/internal/rpc/services")
-		files, err := filepath.Glob(rootDir + "/service_*.go")
+		entries, err := os.ReadDir(rootDir)
 		if err != nil {
-			fmt.Println("[ERROR]list service implementation files failed: " + err.Error())
+			logs.Println("[ERROR]read api services from '" + rootDir + "' failed: " + err.Error())
 			return
 		}
 
-		var methodNameReg = regexp.MustCompile(`func\s*\(\w+\s+\*\s*(\w+Service)\)\s*(\w+)\s*\(`) // $1: serviceName, $2 methodName
-		for _, file := range files {
-			data, err := os.ReadFile(file)
+		var rootDirs = []string{rootDir}
+
+		for _, entry := range entries {
+			if entry.IsDir() {
+				rootDirs = append(rootDirs, rootDir+string(os.PathSeparator)+entry.Name())
+			}
+		}
+
+		// 排序以保证输出内容的稳定性
+		sort.Strings(rootDirs)
+
+		for _, rootDir := range rootDirs {
+			files, err := filepath.Glob(rootDir + "/service_*.go")
 			if err != nil {
-				fmt.Println("[ERROR]read file '" + file + "' failed: " + err.Error())
+				fmt.Println("[ERROR]list service implementation files failed: " + err.Error())
 				return
 			}
-			var sourceCode = string(data)
 
-			var locList = methodNameReg.FindAllStringIndex(sourceCode, -1)
-			for index, loc := range locList {
-				var methodSource = ""
-				if index == len(locList)-1 { // last one
-					methodSource = sourceCode[loc[0]:]
-				} else {
-					methodSource = sourceCode[loc[0]:locList[index+1][0]]
-				}
+			// 排序以保证输出内容的稳定性
+			sort.Strings(files)
 
-				// 方法名
-				var submatch = methodNameReg.FindStringSubmatch(methodSource)
-				if len(submatch) == 0 {
-					continue
-				}
-				var serviceName = submatch[1]
-				if serviceName == "BaseService" {
-					continue
-				}
-				var methodName = submatch[2]
-				if methodName[0] < 'A' || methodName[0] > 'Z' {
-					continue
-				}
-				var roles = []string{}
-				if strings.Contains(methodSource, ".ValidateNode(") {
-					roles = append(roles, "node")
-				} else if strings.Contains(methodSource, ".ValidateUserNode(") {
-					roles = append(roles, "user")
-				} else if strings.Contains(methodSource, ".ValidateAdmin(") {
-					roles = append(roles, "admin")
-				} else if strings.Contains(methodSource, ".ValidateAdminAndUser(") {
-					roles = append(roles, "admin", "user")
-				} else if strings.Contains(methodSource, ".ValidateNSNode(") {
-					roles = append(roles, "dns")
-				} else if strings.Contains(methodSource, ".ValidateMonitorNode(") {
-					roles = append(roles, "monitor")
-				} else if strings.Contains(methodSource, "rpcutils.UserTypeDNS") {
-					roles = append(roles, "dns")
-				} else if strings.Contains(methodSource, "rpcutils.UserTypeUser") {
-					roles = append(roles, "user")
-				} else if strings.Contains(methodSource, "rpcutils.UserTypeNode") {
-					roles = append(roles, "node")
-				} else if strings.Contains(methodSource, "rpcutils.UserTypeMonitor") {
-					roles = append(roles, "monitor")
-				} else if strings.Contains(methodSource, "rpcutils.UserTypeReport") {
-					roles = append(roles, "report")
-				} else if strings.Contains(methodSource, "rpcutils.UserTypeCluster") {
-					roles = append(roles, "cluster")
-				} else if strings.Contains(methodSource, "rpcutils.UserTypeAdmin") {
-					roles = append(roles, "admin")
+			var methodNameReg = regexp.MustCompile(`func\s*\(\w+\s+\*\s*(\w+Service)\)\s*(\w+)\s*\(`) // $1: serviceName, $2 methodName
+			for _, file := range files {
+				data, err := os.ReadFile(file)
+				if err != nil {
+					fmt.Println("[ERROR]read file '" + file + "' failed: " + err.Error())
+					return
 				}
+				var sourceCode = string(data)
 
-				methodRolesMap[strings.ToLower(methodName)] = removeDuplicates(roles)
+				var locList = methodNameReg.FindAllStringIndex(sourceCode, -1)
+				for index, loc := range locList {
+					var methodSource = ""
+					if index == len(locList)-1 { // last one
+						methodSource = sourceCode[loc[0]:]
+					} else {
+						methodSource = sourceCode[loc[0]:locList[index+1][0]]
+					}
+
+					// 方法名
+					var submatch = methodNameReg.FindStringSubmatch(methodSource)
+					if len(submatch) == 0 {
+						continue
+					}
+					var serviceName = submatch[1]
+					if serviceName == "BaseService" {
+						continue
+					}
+					var methodName = submatch[2]
+					if methodName[0] < 'A' || methodName[0] > 'Z' {
+						continue
+					}
+					var roles = []string{}
+					if strings.Contains(methodSource, ".ValidateNode(") {
+						roles = append(roles, "node")
+					}
+					if strings.Contains(methodSource, ".ValidateUserNode(") {
+						var hasRoles = false
+						var wordIndex = strings.Index(methodSource, ".ValidateUserNode(")
+						if wordIndex > 0 {
+							if len(methodSource[wordIndex:]) > 100 {
+								if strings.Contains(methodSource[wordIndex:wordIndex+100], ".ValidateUserNode(ctx, false)") {
+									hasRoles = true
+								}
+							}
+							if !hasRoles {
+								roles = append(roles, "user")
+							}
+						}
+					}
+					if strings.Contains(methodSource, ".ValidateAdmin(") {
+						roles = append(roles, "admin")
+					}
+					if strings.Contains(methodSource, ".ValidateAdminAndUser(") {
+						var hasRoles = false
+						var wordIndex = strings.Index(methodSource, ".ValidateAdminAndUser(")
+						if wordIndex > 0 {
+							if len(methodSource[wordIndex:]) > 100 {
+								if strings.Contains(methodSource[wordIndex:wordIndex+100], ".ValidateAdminAndUser(ctx, false)") {
+									roles = append(roles, "admin")
+									hasRoles = true
+								}
+							}
+							if !hasRoles {
+								roles = append(roles, "admin", "user")
+							}
+						}
+					}
+					if strings.Contains(methodSource, ".ValidateNSNode(") {
+						roles = append(roles, "dns")
+					}
+					if strings.Contains(methodSource, ".ValidateMonitorNode(") {
+						roles = append(roles, "monitor")
+					}
+					if strings.Contains(methodSource, "rpcutils.UserTypeDNS") {
+						roles = append(roles, "dns")
+					}
+					if strings.Contains(methodSource, "rpcutils.UserTypeUser") {
+						roles = append(roles, "user")
+					}
+					if strings.Contains(methodSource, "rpcutils.UserTypeNode") {
+						roles = append(roles, "node")
+					}
+					if strings.Contains(methodSource, "rpcutils.UserTypeMonitor") {
+						roles = append(roles, "monitor")
+					}
+					if strings.Contains(methodSource, "rpcutils.UserTypeReport") {
+						roles = append(roles, "report")
+					}
+					if strings.Contains(methodSource, "rpcutils.UserTypeCluster") {
+						roles = append(roles, "cluster")
+					}
+					if strings.Contains(methodSource, "rpcutils.UserTypeAdmin") {
+						roles = append(roles, "admin")
+					}
+
+					methodRolesMap[strings.ToLower(methodName)] = removeDuplicates(roles)
+				}
 			}
 		}
 	}
@@ -181,6 +241,9 @@ func main() {
 					return
 				}
 
+				// 排序以保持稳定性
+				sort.Strings(files)
+
 				for _, path := range files {
 					func(path string) {
 						var filename = filepath.Base(path)
@@ -197,7 +260,7 @@ func main() {
 						// 先将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*;`)
+						var methodReg = regexp.MustCompile(`(?s)rpc\s+(\w+)\s*\(\s*(\w+)\s*\)\s*returns\s*\(\s*(\w+)\s*\)\s*(\{.+})?\s*;`)
 						data = methodReg.ReplaceAllFunc(data, func(methodData []byte) []byte {
 							methodIndex++
 							var code = "METHOD" + types.String(methodIndex)
@@ -236,6 +299,7 @@ func main() {
 									Name:                string(methodPieces[1]),
 									RequestMessageName:  string(methodPieces[2]),
 									ResponseMessageName: string(methodPieces[3]),
+									IsDeprecated:        strings.Contains(string(methodPieces[4]), "deprecated"),
 									Code:                string(methodData),
 									Doc:                 readComments(serviceData[:methodCodePosition[0]]),
 									Roles:               roles,
@@ -331,6 +395,9 @@ func main() {
 					return
 				}
 
+				// 排序以保持稳定性
+				sort.Strings(files)
+
 				for _, path := range files {
 					func(path string) {
 						var name = strings.TrimSuffix(filepath.Base(path), ".md")
@@ -350,6 +417,11 @@ func main() {
 		}
 	}
 
+	// 对消息进行排序，以保持稳定性
+	sort.Slice(messages, func(i, j int) bool {
+		return messages[i].Name < messages[j].Name
+	})
+
 	var rpcList = &RPCList{
 		Services: services,
 		Messages: messages,

go.mod

@@ -5,14 +5,14 @@ go 1.18
 require (
 	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
+	golang.org/x/net v0.8.0
 	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
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
 	google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e // indirect
 )

go.sum

@@ -113,8 +113,8 @@ golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 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/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 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=
@@ -136,15 +136,15 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/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/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/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 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=

pkg/configutils/domain.go

@@ -50,8 +50,8 @@ func MatchDomain(pattern string, domain string) (isMatched bool) {
 	}
 
 	// 其他匹配
-	patternPieces := strings.Split(pattern, ".")
-	domainPieces := strings.Split(domain, ".")
+	var patternPieces = strings.Split(pattern, ".")
+	var domainPieces = strings.Split(domain, ".")
 	if len(patternPieces) != len(domainPieces) {
 		return
 	}
@@ -60,6 +60,15 @@ func MatchDomain(pattern string, domain string) (isMatched bool) {
 		if patternPiece == "" || patternPiece == "*" || patternPiece == domainPieces[index] {
 			continue
 		}
+		if strings.HasSuffix(patternPiece, ":*") {
+			var portIndex = strings.LastIndex(patternPiece, ":*")
+			if portIndex >= 0 {
+				var prefix = patternPiece[:portIndex]
+				if strings.HasPrefix(domainPieces[index], prefix+":") || domainPieces[index] == prefix {
+					continue
+				}
+			}
+		}
 		isMatched = false
 		break
 	}

pkg/configutils/domain_test.go

@@ -6,86 +6,110 @@ import (
 )
 
 func TestMatchDomain(t *testing.T) {
-	a := assert.NewAssertion(t)
+	var a = assert.NewAssertion(t)
 	{
-		ok := MatchDomains([]string{}, "example.com")
+		var ok = MatchDomains([]string{}, "example.com")
 		a.IsFalse(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{"example.com"}, "example.com")
+		var ok = MatchDomains([]string{"example.com"}, "example.com")
 		a.IsTrue(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{"www.example.com"}, "example.com")
+		var ok = MatchDomains([]string{"www.example.com"}, "example.com")
 		a.IsFalse(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{".example.com"}, "www.example.com")
+		var ok = MatchDomains([]string{".example.com"}, "www.example.com")
 		a.IsTrue(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{".example.com"}, "a.www.example.com")
+		var ok = MatchDomains([]string{".example.com"}, "a.www.example.com")
 		a.IsTrue(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{".example.com"}, "a.www.example123.com")
+		var ok = MatchDomains([]string{".example.com"}, "a.www.example123.com")
 		a.IsFalse(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{"*.example.com"}, "www.example.com")
+		var ok = MatchDomains([]string{"*.example.com"}, "www.example.com")
 		a.IsTrue(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{"*.*.com"}, "www.example.com")
+		var ok = MatchDomains([]string{"*.*.com"}, "www.example.com")
 		a.IsTrue(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{"www.*.com"}, "www.example.com")
+		var ok = MatchDomains([]string{"www.*.com"}, "www.example.com")
 		a.IsTrue(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{"gallery.*.com"}, "www.example.com")
+		var ok = MatchDomains([]string{"gallery.*.com"}, "www.example.com")
 		a.IsFalse(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{"~\\w+.example.com"}, "www.example.com")
+		var ok = MatchDomains([]string{"~\\w+.example.com"}, "www.example.com")
 		a.IsTrue(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{"~\\w+.example.com"}, "a.www.example.com")
+		var ok = MatchDomains([]string{"~\\w+.example.com"}, "a.www.example.com")
 		a.IsTrue(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{"~^\\d+.example.com$"}, "www.example.com")
+		var ok = MatchDomains([]string{"~^\\d+.example.com$"}, "www.example.com")
 		a.IsFalse(ok)
 	}
 
 	{
-		ok := MatchDomains([]string{"~^\\d+.example.com$"}, "123.example.com")
+		var ok = MatchDomains([]string{"~^\\d+.example.com$"}, "123.example.com")
 		a.IsTrue(ok)
 	}
 	{
-		ok := MatchDomains([]string{"*"}, "example.com")
+		var ok = MatchDomains([]string{"*"}, "example.com")
 		a.IsTrue(ok)
 	}
 
 	// port
 	{
-		ok := MatchDomains([]string{"example.com:8001"}, "example.com:8001")
+		var ok = MatchDomains([]string{"example.com:8001"}, "example.com:8001")
 		a.IsTrue(ok)
 	}
+	{
+		var ok = MatchDomains([]string{"example.com:8002"}, "example.com:8001")
+		a.IsFalse(ok)
+	}
+	{
+		var ok = MatchDomains([]string{"*.example.com:8001"}, "a.example.com:8001")
+		a.IsTrue(ok)
+	}
+	{
+		var ok = MatchDomains([]string{"a.example.com:*"}, "a.example.com:8001")
+		a.IsTrue(ok)
+	}
+	{
+		var ok = MatchDomains([]string{"a.example.com:*"}, "a.example.com")
+		a.IsTrue(ok)
+	}
+	{
+		var ok = MatchDomains([]string{"*.example.com:*"}, "a.example.com:8001")
+		a.IsTrue(ok)
+	}
+	{
+		var ok = MatchDomains([]string{"*.example.com:8002"}, "a.example.com:8001")
+		a.IsFalse(ok)
+	}
 }
 
 func TestIsSpecialDomain(t *testing.T) {

pkg/configutils/ip_test.go

@@ -39,3 +39,8 @@ func TestIPVersion(t *testing.T) {
 	a.IsTrue(configutils.IPVersion(net.ParseIP("::1")) == 6)
 	a.IsTrue(configutils.IPVersion(net.ParseIP("2001:0db8:85a3:0000:0000:8a2e:0370:7334")) == 6)
 }
+
+
+func TestQuoteIP(t *testing.T) {
+	t.Log(configutils.QuoteIP(configutils.QuoteIP("2001:da8:22::10")))
+}

pkg/configutils/variable_test.go

@@ -55,11 +55,13 @@ func BenchmarkParseVariables(b *testing.B) {
 
 	b.ResetTimer()
 
-	for i := 0; i < b.N; i++ {
-		_ = ParseVariables("hello, ${name}, ${age}, ${gender}, ${home}, world", func(s string) string {
-			return "Lu"
-		})
-	}
+	b.RunParallel(func(pb *testing.PB) {
+		for pb.Next() {
+			_ = ParseVariables("hello, ${name}, ${age}, ${gender}, ${home}, world", func(s string) string {
+				return "Lu"
+			})
+		}
+	})
 }
 
 func BenchmarkParseVariablesFromHolders(b *testing.B) {

pkg/dnsconfigs/.gitignore

@@ -0,0 +1 @@
+ns_*

pkg/dnsconfigs/cluster_dns_config.go

@@ -2,10 +2,18 @@ package dnsconfigs
 
 // ClusterDNSConfig 集群的DNS设置
 type ClusterDNSConfig struct {
-	CNameRecords  []string `yaml:"cnameRecords" json:"cnameRecords"`   // 自动加入的CNAME
-	TTL           int32    `yaml:"ttl" json:"ttl"`                     // 默认TTL，各个DNS服务商对记录的TTL的限制各有不同
-	CNameAsDomain bool     `yaml:"cnameAsDomain" json:"cnameAsDomain"` // 是否可以像域名一样直接访问CNAME
+	CNAMERecords     []string `yaml:"cnameRecords" json:"cnameRecords"`         // 自动加入的CNAME
+	TTL              int32    `yaml:"ttl" json:"ttl"`                           // 默认TTL，各个DNS服务商对记录的TTL的限制各有不同
+	CNAMEAsDomain    bool     `yaml:"cnameAsDomain" json:"cnameAsDomain"`       // 是否可以像域名一样直接访问CNAME
+	IncludingLnNodes bool     `yaml:"includingLnNodes" json:"includingLnNodes"` // 是否包含Ln节点
 
 	NodesAutoSync   bool `yaml:"nodesAutoSync" json:"nodesAutoSync"`     // 是否自动同步节点状态
 	ServersAutoSync bool `yaml:"serversAutoSync" json:"serversAutoSync"` // 是否自动同步服务状态
 }
+
+func DefaultClusterDNSConfig() *ClusterDNSConfig {
+	return &ClusterDNSConfig{
+		CNAMEAsDomain:    true,
+		IncludingLnNodes: true,
+	}
+}

pkg/dnsconfigs/consts.go

@@ -1,10 +0,0 @@
-// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
-
-package dnsconfigs
-
-type NSDomainStatus = string
-
-const (
-	NSDomainStatusNone     = "none"
-	NSDomainStatusVerified = "verified"
-)

pkg/dnsconfigs/defaults.go

@@ -1,30 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package dnsconfigs
-
-import "github.com/iwind/TeaGo/maps"
-
-// 一组系统默认值
-// 修改单个IP相关限制值时要考虑到NAT中每个IP会代表很多个主机，并非1对1的关系
-
-const (
-	DefaultMaxThreads    = 20000   // 单节点最大线程数
-	DefaultMaxThreadsMin = 1000    // 单节点最大线程数最小值
-	DefaultMaxThreadsMax = 100_000 // 单节点最大线程数最大值
-
-	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/dnsconfigs/dns_resolver.go

@@ -0,0 +1,29 @@
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package dnsconfigs
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
+	"github.com/iwind/TeaGo/types"
+)
+
+type DNSResolver struct {
+	Host     string `json:"host"`
+	Port     int    `json:"port"`
+	Protocol string `json:"protocol"`
+}
+
+func (this *DNSResolver) Addr() string {
+	var port = this.Port
+	if port <= 0 {
+		// 暂时不支持DoH
+		// 实际应用中只支持udp
+		switch this.Protocol {
+		case "tls":
+			port = 853
+		default:
+			port = 53
+		}
+	}
+	return configutils.QuoteIP(this.Host) + ":" + types.String(port)
+}

pkg/dnsconfigs/ns_access_log_ref.go

@@ -1,13 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package dnsconfigs
-
-type NSAccessLogRef struct {
-	IsPrior           bool `yaml:"isPrior" json:"isPrior"`                     // 是否覆盖
-	IsOn              bool `yaml:"isOn" json:"isOn"`                           // 是否启用
-	LogMissingDomains bool `yaml:"logMissingDomains" json:"logMissingDomains"` // 是否记录找不到的域名
-}
-
-func (this *NSAccessLogRef) Init() error {
-	return nil
-}

pkg/dnsconfigs/ns_key_algorithms.go

@@ -1,69 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package dnsconfigs
-
-type KeyAlgorithmType = string
-
-const (
-	KeyAlgorithmTypeHmacSHA1   KeyAlgorithmType = "hmac-sha1."
-	KeyAlgorithmTypeHmacSHA224 KeyAlgorithmType = "hmac-sha224."
-	KeyAlgorithmTypeHmacSHA256 KeyAlgorithmType = "hmac-sha256."
-	KeyAlgorithmTypeHmacSHA384 KeyAlgorithmType = "hmac-sha384."
-	KeyAlgorithmTypeHmacSHA512 KeyAlgorithmType = "hmac-sha512."
-)
-
-type KeyAlgorithmDefinition struct {
-	Name string `json:"name"`
-	Code string `json:"code"`
-}
-
-func FindAllKeyAlgorithmTypes() []*KeyAlgorithmDefinition {
-	return []*KeyAlgorithmDefinition{
-		{
-			Name: "HmacSHA1",
-			Code: KeyAlgorithmTypeHmacSHA1,
-		},
-		{
-			Name: "HmacSHA224",
-			Code: KeyAlgorithmTypeHmacSHA224,
-		},
-		{
-			Name: "HmacSHA256",
-			Code: KeyAlgorithmTypeHmacSHA256,
-		},
-		{
-			Name: "HmacSHA384",
-			Code: KeyAlgorithmTypeHmacSHA384,
-		},
-		{
-			Name: "HmacSHA512",
-			Code: KeyAlgorithmTypeHmacSHA512,
-		},
-	}
-}
-
-func FindKeyAlgorithmTypeName(algoType KeyAlgorithmType) string {
-	for _, def := range FindAllKeyAlgorithmTypes() {
-		if def.Code == algoType {
-			return def.Name
-		}
-	}
-	return ""
-}
-
-type NSKeySecretType = string
-
-const (
-	NSKeySecretTypeClear  NSKeySecretType = "clear"
-	NSKeySecretTypeBase64 NSKeySecretType = "base64"
-)
-
-func FindKeySecretTypeName(secretType NSKeySecretType) string {
-	switch secretType {
-	case NSKeySecretTypeClear:
-		return "明文"
-	case NSKeySecretTypeBase64:
-		return "BASE64"
-	}
-	return ""
-}

pkg/dnsconfigs/ns_node_config.go

@@ -1,84 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package dnsconfigs
-
-import (
-	"fmt"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ddosconfigs"
-)
-
-type NSNodeConfig struct {
-	Id              int64                         `yaml:"id" json:"id"`
-	NodeId          string                        `yaml:"nodeId" json:"nodeId"`
-	Secret          string                        `yaml:"secret" json:"secret"`
-	ClusterId       int64                         `yaml:"clusterId" json:"clusterId"`
-	AccessLogRef    *NSAccessLogRef               `yaml:"accessLogRef" json:"accessLogRef"`
-	RecursionConfig *RecursionConfig              `yaml:"recursionConfig" json:"recursionConfig"`
-	DDoSProtection  *ddosconfigs.ProtectionConfig `yaml:"ddosProtection" json:"ddosProtection"`
-	AllowedIPs      []string                      `yaml:"allowedIPs" json:"allowedIPs"`
-
-	TCP *serverconfigs.TCPProtocolConfig `yaml:"tcp" json:"tcp"` // TCP配置
-	TLS *serverconfigs.TLSProtocolConfig `yaml:"tls" json:"tls"` // TLS配置
-	UDP *serverconfigs.UDPProtocolConfig `yaml:"udp" json:"udp"` // UDP配置
-
-	paddedId string
-}
-
-func (this *NSNodeConfig) Init() error {
-	this.paddedId = fmt.Sprintf("%08d", this.Id)
-
-	// accessLog
-	if this.AccessLogRef != nil {
-		err := this.AccessLogRef.Init()
-		if err != nil {
-			return err
-		}
-	}
-
-	// 递归DNS
-	if this.RecursionConfig != nil {
-		err := this.RecursionConfig.Init()
-		if err != nil {
-			return err
-		}
-	}
-
-	// DDoS
-	if this.DDoSProtection != nil {
-		err := this.DDoSProtection.Init()
-		if err != nil {
-			return err
-		}
-	}
-
-	// tcp
-	if this.TCP != nil {
-		err := this.TCP.Init()
-		if err != nil {
-			return err
-		}
-	}
-
-	// tls
-	if this.TLS != nil {
-		err := this.TLS.Init()
-		if err != nil {
-			return err
-		}
-	}
-
-	// udp
-	if this.UDP != nil {
-		err := this.UDP.Init()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (this *NSNodeConfig) PaddedId() string {
-	return this.paddedId
-}

pkg/dnsconfigs/ns_setting.go

@@ -1,6 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package dnsconfigs
-
-type NSSetting struct {
-}

pkg/dnsconfigs/record_ttls.go

@@ -1,65 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package dnsconfigs
-
-type RecordTTL struct {
-	Name  string `json:"name"`
-	Value int    `json:"value"`
-}
-
-func FindAllRecordTTL() []*RecordTTL {
-	return []*RecordTTL{
-		{
-			Name:  "5秒",
-			Value: 5,
-		},
-		{
-			Name:  "10秒",
-			Value: 10,
-		},
-		{
-			Name:  "30秒",
-			Value: 30,
-		},
-		{
-			Name:  "1分钟",
-			Value: 60,
-		},
-		{
-			Name:  "3分钟",
-			Value: 3 * 60,
-		},
-		{
-			Name:  "5分钟",
-			Value: 5 * 60,
-		},
-		{
-			Name:  "10分钟",
-			Value: 10 * 60,
-		},
-		{
-			Name:  "30分钟",
-			Value: 30 * 60,
-		},
-		{
-			Name:  "1小时",
-			Value: 3600,
-		},
-		{
-			Name:  "12小时",
-			Value: 12 * 3600,
-		},
-		{
-			Name:  "1天",
-			Value: 86400,
-		},
-		{
-			Name:  "30天",
-			Value: 30 * 86400,
-		},
-		{
-			Name:  "一年",
-			Value: 365 * 86400,
-		},
-	}
-}

pkg/dnsconfigs/record_types.go

@@ -13,11 +13,13 @@ const (
 	RecordTypeSRV   RecordType = "SRV"
 	RecordTypeTXT   RecordType = "TXT"
 	RecordTypeCAA   RecordType = "CAA"
+	RecordTypeSOA   RecordType = "SOA"
 )
 
 type RecordTypeDefinition struct {
 	Type        RecordType `json:"type"`
 	Description string     `json:"description"`
+	CanDefine   bool       `json:"canDefine"` // 用户是否可以自定义
 }
 
 func FindAllRecordTypeDefinitions() []*RecordTypeDefinition {
@@ -25,34 +27,57 @@ func FindAllRecordTypeDefinitions() []*RecordTypeDefinition {
 		{
 			Type:        RecordTypeA,
 			Description: "将域名指向一个IPV4地址",
+			CanDefine:   true,
 		},
 		{
 			Type:        RecordTypeCNAME,
 			Description: "将域名指向另外一个域名",
+			CanDefine:   true,
 		},
 		{
 			Type:        RecordTypeAAAA,
 			Description: "将域名指向一个IPV6地址",
+			CanDefine:   true,
 		},
 		{
 			Type:        RecordTypeNS,
 			Description: "将子域名指定其他DNS服务器解析",
+			CanDefine:   false,
+		},
+		{
+			Type:        RecordTypeSOA,
+			Description: "起始授权机构记录",
+			CanDefine:   false,
 		},
 		{
 			Type:        RecordTypeMX,
 			Description: "将域名指向邮件服务器地址",
+			CanDefine:   true,
 		},
 		{
 			Type:        RecordTypeSRV,
 			Description: "记录提供特定的服务的服务器",
+			CanDefine:   true,
 		},
 		{
 			Type:        RecordTypeTXT,
 			Description: "文本长度限制512，通常做SPF记录或者校验域名所有者",
+			CanDefine:   true,
 		},
 		{
 			Type:        RecordTypeCAA,
 			Description: "CA证书颁发机构授权校验",
+			CanDefine:   true,
 		},
 	}
 }
+
+func FindAllUserRecordTypeDefinitions() []*RecordTypeDefinition {
+	var result = []*RecordTypeDefinition{}
+	for _, r := range FindAllRecordTypeDefinitions() {
+		if r.CanDefine {
+			result = append(result, r)
+		}
+	}
+	return result
+}

pkg/dnsconfigs/recursion_config.go

@@ -1,22 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package dnsconfigs
-
-type DNSHost struct {
-	Host     string `json:"host"`
-	Port     int    `json:"port"`
-	Protocol string `json:"protocol"`
-}
-
-// RecursionConfig 递归DNS设置
-type RecursionConfig struct {
-	IsOn          bool       `json:"isOn"`
-	Hosts         []*DNSHost `json:"hosts"`
-	UseLocalHosts bool       `json:"useLocalHosts"` // 自动从本机读取DNS
-	AllowDomains  []string   `json:"allowDomains"`
-	DenyDomains   []string   `json:"denyDomains"`
-}
-
-func (this *RecursionConfig) Init() error {
-	return nil
-}

pkg/dnsconfigs/route_ranges.go

@@ -1,262 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package dnsconfigs
-
-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" // 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 判断是否包含
-	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 {
-	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
-	}
-
-	return nil
-}
-
-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

@@ -1,98 +0,0 @@
-// 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_test.go

@@ -1,86 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package dnsconfigs
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestRoutes(t *testing.T) {
-	// 检查代号是否有空，或者代号是否重复
-
-	var codeMap = map[string]bool{} // code => true
-
-	for _, routes := range [][]*Route{
-		AllDefaultChinaProvinceRoutes,
-		AllDefaultISPRoutes,
-		AllDefaultWorldRegionRoutes,
-	} {
-		for _, route := range routes {
-			if len(route.Name) == 0 {
-				t.Fatal("route name should not empty:", route)
-			}
-			if len(route.AliasNames) == 0 {
-				t.Fatal("route alias names should not empty:", route)
-			}
-			if len(route.Code) == 0 || route.Code == "world:" {
-				t.Fatal("route code should not empty:", route)
-			}
-
-			_, ok := codeMap[route.Code]
-			if ok {
-				t.Fatal("code duplicated:", route)
-			}
-
-			codeMap[route.Code] = true
-
-			if strings.HasPrefix(route.Code, "world:sp:") || (strings.HasPrefix(route.Code, "world:") && route.Code != "world:UAR" && len(route.Code) != 8) {
-				t.Log("no shorten code:", route)
-			}
-		}
-	}
-}
-
-func TestFindDefaultRoute(t *testing.T) {
-	t.Log(FindDefaultRoute("isp:china_unicom"))
-	t.Log(FindDefaultRoute("china:province:beijing"))
-	t.Log(FindDefaultRoute("world:CN"))
-	t.Log(FindDefaultRoute("world:US"))
-}
-
-func TestRoutes_Markdown(t *testing.T) {
-	var markdown = ""
-
-	for index, routes := range [][]*Route{
-		AllDefaultRoutes,
-		AllDefaultChinaProvinceRoutes,
-		AllDefaultISPRoutes,
-		AllDefaultWorldRegionRoutes,
-	} {
-		switch index {
-		case 0:
-			markdown += "## 默认线路\n"
-		case 1:
-			markdown += "## 中国省市\n"
-		case 2:
-			markdown += "## 运营商\n"
-		case 3:
-			markdown += "## 全球地区\n"
-		}
-
-		markdown += "| 名称 | 代号 |\n"
-		markdown += "|-----------|-----------|\n"
-		for _, route := range routes {
-			markdown += "| "  + route.Name + " | " + route.Code + " |\n"
-		}
-		markdown += "\n"
-	}
-	t.Log(markdown)
-}
-
-func BenchmarkFindDefaultRoute(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = FindDefaultRoute("world:CN")
-	}
-}

pkg/dnsconfigs/tsig_config.go

@@ -1,8 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package dnsconfigs
-
-// TSIGConfig 配置
-type TSIGConfig struct {
-	IsOn bool `yaml:"isOn" json:"isOn"`
-}

pkg/errors/error.go

@@ -29,7 +29,7 @@ func (this *errorObj) Error() string {
 	return s
 }
 
-// 新错误
+// New 新错误
 func New(errText string) error {
 	ptr, file, line, ok := runtime.Caller(1)
 	funcName := ""
@@ -45,7 +45,7 @@ func New(errText string) error {
 	}
 }
 
-// 包装已有错误
+// Wrap 包装已有错误
 func Wrap(err error) error {
 	if err == nil {
 		return nil

pkg/iplibrary/.gitignore

@@ -1 +1 @@
-ip.db
+*-plus.db

pkg/iplibrary/default_ip_library.go

@@ -0,0 +1,124 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package iplibrary
+
+import (
+	"bytes"
+	"compress/gzip"
+	_ "embed"
+	"net"
+	"sync"
+)
+
+//go:embed internal-ip-library.db
+var ipLibraryData []byte
+
+var defaultLibrary = NewIPLibrary()
+var commonLibrary *IPLibrary
+
+var libraryLocker = &sync.Mutex{} // 为了保持加载顺序性
+
+func DefaultIPLibraryData() []byte {
+	return ipLibraryData
+}
+
+// InitDefault 加载默认的IP库
+func InitDefault() error {
+	libraryLocker.Lock()
+	defer libraryLocker.Unlock()
+
+	if commonLibrary != nil {
+		defaultLibrary = commonLibrary
+		return nil
+	}
+
+	var library = NewIPLibrary()
+	err := library.InitFromData(ipLibraryData, "")
+	if err != nil {
+		return err
+	}
+
+	commonLibrary = library
+	defaultLibrary = commonLibrary
+	return nil
+}
+
+// Lookup 查询IP信息
+func Lookup(ip net.IP) *QueryResult {
+	return defaultLibrary.Lookup(ip)
+}
+
+// LookupIP 查询IP信息
+func LookupIP(ip string) *QueryResult {
+	return defaultLibrary.LookupIP(ip)
+}
+
+type IPLibrary struct {
+	reader *Reader
+}
+
+func NewIPLibrary() *IPLibrary {
+	return &IPLibrary{}
+}
+
+func NewIPLibraryWithReader(reader *Reader) *IPLibrary {
+	return &IPLibrary{reader: reader}
+}
+
+func (this *IPLibrary) InitFromData(data []byte, password string) error {
+	if len(data) == 0 || this.reader != nil {
+		return nil
+	}
+
+	if len(password) > 0 {
+		srcData, err := NewEncrypt().Decode(data, password)
+		if err != nil {
+			return err
+		}
+		data = srcData
+	}
+
+	var reader = bytes.NewReader(data)
+	gzipReader, err := gzip.NewReader(reader)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = gzipReader.Close()
+	}()
+
+	libReader, err := NewReader(gzipReader)
+	if err != nil {
+		return err
+	}
+	this.reader = libReader
+
+	return nil
+}
+
+func (this *IPLibrary) Lookup(ip net.IP) *QueryResult {
+	if this.reader == nil {
+		return &QueryResult{}
+	}
+
+	var result = this.reader.Lookup(ip)
+	if result == nil {
+		result = &QueryResult{}
+	}
+
+	return result
+}
+
+func (this *IPLibrary) LookupIP(ip string) *QueryResult {
+	if this.reader == nil {
+		return &QueryResult{}
+	}
+	return this.Lookup(net.ParseIP(ip))
+}
+
+func (this *IPLibrary) Destroy() {
+	if this.reader != nil {
+		this.reader.Destroy()
+		this.reader = nil
+	}
+}

pkg/iplibrary/default_ip_library_test.go

@@ -0,0 +1,101 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package iplibrary_test
+
+import (
+	"fmt"
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
+	"net"
+	"runtime"
+	"runtime/debug"
+	"testing"
+	"time"
+)
+
+func TestIPLibrary_Init(t *testing.T) {
+	var lib = iplibrary.NewIPLibrary()
+
+	err := lib.InitFromData(iplibrary.DefaultIPLibraryData(), "")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestIPLibrary_Load(t *testing.T) {
+	for i := 0; i < 10; i++ {
+		err := iplibrary.InitDefault()
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+}
+
+func TestIPLibrary_Lookup(t *testing.T) {
+	var stat1 = &runtime.MemStats{}
+	runtime.ReadMemStats(stat1)
+
+	var lib = iplibrary.NewIPLibrary()
+
+	var before = time.Now()
+
+	err := lib.InitFromData(iplibrary.DefaultIPLibraryData(), "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var costMs = time.Since(before).Seconds() * 1000
+	runtime.GC()
+	debug.FreeOSMemory()
+
+	var stat2 = &runtime.MemStats{}
+	runtime.ReadMemStats(stat2)
+
+	t.Log((stat2.Alloc-stat1.Alloc)/1024/1024, "M", fmt.Sprintf("%.2f", costMs), "ms")
+
+	for _, ip := range []string{
+		"127.0.0.1",
+		"8.8.8.8",
+		"4.4.4.4",
+		"202.96.0.20",
+		"111.197.165.199",
+		"66.249.66.69",
+		"2222",                           // wrong ip
+		"2406:8c00:0:3401:133:18:168:70", // ipv6
+	} {
+		var result = lib.Lookup(net.ParseIP(ip))
+		t.Log(ip, "=>", result.IsOk(), "[", result.CountryName(), result.CountryId(), "][", result.ProvinceName(), result.ProvinceId(), "][", result.TownName(), result.TownId(), "][", result.ProviderName(), result.ProviderId(), "]")
+	}
+}
+
+func TestIPLibrary_LookupIP(t *testing.T) {
+	var lib = iplibrary.NewIPLibrary()
+	err := lib.InitFromData(iplibrary.DefaultIPLibraryData(), "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, ip := range []string{
+		"66.249.66.69",
+	} {
+		var result = lib.LookupIP(ip)
+		if result.IsOk() {
+			t.Log(ip, "=>", result.IsOk(), "[", result.CountryName(), result.CountryId(), "][", result.ProvinceName(), result.ProvinceId(), "][", result.TownName(), result.TownId(), "][", result.ProviderName(), result.ProviderId(), "]")
+		} else {
+			t.Log(ip, "=>", result.IsOk())
+		}
+	}
+}
+
+func BenchmarkIPLibrary_Lookup(b *testing.B) {
+	var lib = iplibrary.NewIPLibrary()
+	err := lib.InitFromData(iplibrary.DefaultIPLibraryData(), "")
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		_ = lib.LookupIP("66.249.66.69")
+	}
+}

pkg/iplibrary/encrypt.go

@@ -0,0 +1,32 @@
+// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package iplibrary
+
+import "github.com/TeaOSLab/EdgeCommon/pkg/nodeutils"
+
+type Encrypt struct {
+}
+
+func NewEncrypt() *Encrypt {
+	return &Encrypt{}
+}
+
+func (this *Encrypt) Encode(srcData []byte, password string) ([]byte, error) {
+	var method = nodeutils.AES256CFBMethod{}
+	err := method.Init([]byte(password), []byte(password))
+	if err != nil {
+		return nil, err
+	}
+
+	return method.Encrypt(srcData)
+}
+
+func (this *Encrypt) Decode(encodedData []byte, password string) ([]byte, error) {
+	var method = nodeutils.AES256CFBMethod{}
+	err := method.Init([]byte(password), []byte(password))
+	if err != nil {
+		return nil, err
+	}
+
+	return method.Decrypt(encodedData)
+}

pkg/iplibrary/ip_item.go

@@ -2,12 +2,46 @@
 
 package iplibrary
 
-type ipItem struct {
-	ipFrom     uint64
-	ipTo       uint64
-	countryId  int64
-	provinceId int64
-	cityId     int64
-	townId     int64
-	providerId int64
+import (
+	"github.com/iwind/TeaGo/types"
+)
+
+type ipv4Item struct {
+	IPFrom uint32
+	IPTo   uint32
+
+	Region *ipRegion
+}
+
+type ipv6Item struct {
+	IPFrom uint64
+	IPTo   uint64
+
+	Region *ipRegion
+}
+
+type ipRegion struct {
+	CountryId  uint16
+	ProvinceId uint16
+	CityId     uint32
+	TownId     uint32
+	ProviderId uint16
+}
+
+func HashRegion(countryId uint16, provinceId uint16, cityId uint32, townId uint32, providerId uint16) string {
+	var providerHash = ""
+	if providerId > 0 {
+		providerHash = "_" + types.String(providerId)
+	}
+
+	if townId > 0 {
+		return "t" + types.String(townId) + providerHash
+	}
+	if cityId > 0 {
+		return "c" + types.String(cityId) + providerHash
+	}
+	if provinceId > 0 {
+		return "p" + types.String(provinceId) + providerHash
+	}
+	return "a" + types.String(countryId) + providerHash
 }

pkg/iplibrary/meta.go

@@ -3,37 +3,38 @@
 package iplibrary
 
 type Country struct {
-	Id    int64    `json:"id"`
+	Id    uint16   `json:"id"`
 	Name  string   `json:"name"`
 	Codes []string `json:"codes"`
 }
 
 type Province struct {
-	Id    int64    `json:"id"`
+	Id    uint16   `json:"id"`
 	Name  string   `json:"name"`
 	Codes []string `json:"codes"`
 }
 
 type City struct {
-	Id    int64    `json:"id"`
+	Id    uint32   `json:"id"`
 	Name  string   `json:"name"`
 	Codes []string `json:"codes"`
 }
 
 type Town struct {
-	Id    int64    `json:"id"`
+	Id    uint32   `json:"id"`
 	Name  string   `json:"name"`
 	Codes []string `json:"codes"`
 }
 
 type Provider struct {
-	Id    int64    `json:"id"`
+	Id    uint16   `json:"id"`
 	Name  string   `json:"name"`
 	Codes []string `json:"codes"`
 }
 
 type Meta struct {
 	Version   int         `json:"version"` // IP库版本
+	Code      string      `json:"code"`    // 代号，用来区分不同的IP库
 	Author    string      `json:"author"`
 	Countries []*Country  `json:"countries"`
 	Provinces []*Province `json:"provinces"`
@@ -42,19 +43,19 @@ type Meta struct {
 	Providers []*Provider `json:"providers"`
 	CreatedAt int64       `json:"createdAt"`
 
-	countryMap  map[int64]*Country  // id => *Country
-	provinceMap map[int64]*Province // id => *Province
-	cityMap     map[int64]*City     // id => *City
-	townMap     map[int64]*Town     // id => *Town
-	providerMap map[int64]*Provider // id => *Provider
+	countryMap  map[uint16]*Country  // id => *Country
+	provinceMap map[uint16]*Province // id => *Province
+	cityMap     map[uint32]*City     // id => *City
+	townMap     map[uint32]*Town     // id => *Town
+	providerMap map[uint16]*Provider // id => *Provider
 }
 
 func (this *Meta) Init() {
-	this.countryMap = map[int64]*Country{}
-	this.provinceMap = map[int64]*Province{}
-	this.cityMap = map[int64]*City{}
-	this.townMap = map[int64]*Town{}
-	this.providerMap = map[int64]*Provider{}
+	this.countryMap = map[uint16]*Country{}
+	this.provinceMap = map[uint16]*Province{}
+	this.cityMap = map[uint32]*City{}
+	this.townMap = map[uint32]*Town{}
+	this.providerMap = map[uint16]*Provider{}
 
 	for _, country := range this.Countries {
 		this.countryMap[country.Id] = country
@@ -73,22 +74,22 @@ func (this *Meta) Init() {
 	}
 }
 
-func (this *Meta) CountryWithId(countryId int64) *Country {
+func (this *Meta) CountryWithId(countryId uint16) *Country {
 	return this.countryMap[countryId]
 }
 
-func (this *Meta) ProvinceWithId(provinceId int64) *Province {
+func (this *Meta) ProvinceWithId(provinceId uint16) *Province {
 	return this.provinceMap[provinceId]
 }
 
-func (this *Meta) CityWithId(cityId int64) *City {
+func (this *Meta) CityWithId(cityId uint32) *City {
 	return this.cityMap[cityId]
 }
 
-func (this *Meta) TownWithId(townId int64) *Town {
+func (this *Meta) TownWithId(townId uint32) *Town {
 	return this.townMap[townId]
 }
 
-func (this *Meta) ProviderWithId(providerId int64) *Provider {
+func (this *Meta) ProviderWithId(providerId uint16) *Provider {
 	return this.providerMap[providerId]
 }

pkg/iplibrary/reader.go

@@ -7,22 +7,35 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
-	"github.com/iwind/TeaGo/types"
 	"io"
 	"net"
 	"sort"
+	"strconv"
 	"strings"
 )
 
+// Reader IP库Reader
 type Reader struct {
 	meta *Meta
 
-	ipV4Items []*ipItem
-	ipV6Items []*ipItem
+	regionMap map[string]*ipRegion // 缓存重复的区域用来节约内存
+
+	ipV4Items []*ipv4Item
+	ipV6Items []*ipv6Item
+
+	lastIPFrom     uint64
+	lastCountryId  uint16
+	lastProvinceId uint16
+	lastCityId     uint32
+	lastTownId     uint32
+	lastProviderId uint16
 }
 
+// NewReader 创建新Reader对象
 func NewReader(reader io.Reader) (*Reader, error) {
-	var libReader = &Reader{}
+	var libReader = &Reader{
+		regionMap: map[string]*ipRegion{},
+	}
 	err := libReader.load(reader)
 	if err != nil {
 		return nil, err
@@ -30,6 +43,7 @@ func NewReader(reader io.Reader) (*Reader, error) {
 	return libReader, nil
 }
 
+// 从Reader中加载数据
 func (this *Reader) load(reader io.Reader) error {
 	var buf = make([]byte, 1024)
 	var metaLine = []byte{}
@@ -77,10 +91,10 @@ func (this *Reader) load(reader io.Reader) error {
 	}
 
 	sort.Slice(this.ipV4Items, func(i, j int) bool {
-		var from0 = this.ipV4Items[i].ipFrom
-		var to0 = this.ipV4Items[i].ipTo
-		var from1 = this.ipV4Items[j].ipFrom
-		var to1 = this.ipV4Items[j].ipTo
+		var from0 = this.ipV4Items[i].IPFrom
+		var to0 = this.ipV4Items[i].IPTo
+		var from1 = this.ipV4Items[j].IPFrom
+		var to1 = this.ipV4Items[j].IPTo
 		if from0 == from1 {
 			return to0 < to1
 		}
@@ -88,28 +102,35 @@ func (this *Reader) load(reader io.Reader) error {
 	})
 
 	sort.Slice(this.ipV6Items, func(i, j int) bool {
-		var from0 = this.ipV6Items[i].ipFrom
-		var to0 = this.ipV6Items[i].ipTo
-		var from1 = this.ipV6Items[j].ipFrom
-		var to1 = this.ipV6Items[j].ipTo
+		var from0 = this.ipV6Items[i].IPFrom
+		var to0 = this.ipV6Items[i].IPTo
+		var from1 = this.ipV6Items[j].IPFrom
+		var to1 = this.ipV6Items[j].IPTo
 		if from0 == from1 {
 			return to0 < to1
 		}
 		return from0 < from1
 	})
 
+	// 清理内存
+	this.regionMap = nil
+
 	return nil
 }
 
 func (this *Reader) Lookup(ip net.IP) *QueryResult {
+	if ip == nil {
+		return &QueryResult{}
+	}
+
 	var ipLong = configutils.IP2Long(ip)
 	var isV4 = configutils.IsIPv4(ip)
-	var resultItem *ipItem
+	var resultItem any
 	if isV4 {
 		sort.Search(len(this.ipV4Items), func(i int) bool {
 			var item = this.ipV4Items[i]
-			if item.ipFrom <= ipLong {
-				if item.ipTo >= ipLong {
+			if item.IPFrom <= uint32(ipLong) {
+				if item.IPTo >= uint32(ipLong) {
 					resultItem = item
 					return false
 				}
@@ -120,8 +141,8 @@ func (this *Reader) Lookup(ip net.IP) *QueryResult {
 	} else {
 		sort.Search(len(this.ipV6Items), func(i int) bool {
 			var item = this.ipV6Items[i]
-			if item.ipFrom <= ipLong {
-				if item.ipTo >= ipLong {
+			if item.IPFrom <= ipLong {
+				if item.IPTo >= ipLong {
 					resultItem = item
 					return false
 				}
@@ -141,69 +162,35 @@ func (this *Reader) Meta() *Meta {
 	return this.meta
 }
 
-func (this *Reader) IPv4Items() []*ipItem {
+func (this *Reader) IPv4Items() []*ipv4Item {
 	return this.ipV4Items
 }
 
-func (this *Reader) IPv6Items() []*ipItem {
+func (this *Reader) IPv6Items() []*ipv6Item {
 	return this.ipV6Items
 }
 
+func (this *Reader) Destroy() {
+	this.meta = nil
+	this.regionMap = nil
+	this.ipV4Items = nil
+	this.ipV6Items = nil
+}
+
+// 分析数据
 func (this *Reader) parse(data []byte) (left []byte, err error) {
 	if len(data) == 0 {
 		return
 	}
+
 	for {
 		var index = bytes.IndexByte(data, '\n')
 		if index >= 0 {
 			var line = data[:index]
-			var pieces = strings.Split(string(line), "|")
-			if len(pieces) != 8 {
-				return nil, errors.New("invalid ip definition '" + string(line) + "'")
+			err = this.parseLine(line)
+			if err != nil {
+				return nil, err
 			}
-
-			var version = pieces[0]
-			if len(version) == 0 {
-				version = "4"
-			}
-
-			if version != "4" && version != "6" {
-				return nil, errors.New("invalid ip version '" + string(line) + "'")
-			}
-
-			var ipFrom uint64
-			var ipTo uint64
-			if len(pieces[2]) == 0 {
-				pieces[2] = pieces[1]
-				ipFrom = types.Uint64(pieces[1])
-				ipTo = types.Uint64(pieces[2])
-			} else {
-				ipFrom = types.Uint64(pieces[1])
-				ipTo = types.Uint64(pieces[2]) + ipFrom
-			}
-
-			if version == "4" {
-				this.ipV4Items = append(this.ipV4Items, &ipItem{
-					ipFrom:     ipFrom,
-					ipTo:       ipTo,
-					countryId:  types.Int64(pieces[3]),
-					provinceId: types.Int64(pieces[4]),
-					cityId:     types.Int64(pieces[5]),
-					townId:     types.Int64(pieces[6]),
-					providerId: types.Int64(pieces[7]),
-				})
-			} else {
-				this.ipV6Items = append(this.ipV6Items, &ipItem{
-					ipFrom:     ipFrom,
-					ipTo:       ipTo,
-					countryId:  types.Int64(pieces[3]),
-					provinceId: types.Int64(pieces[4]),
-					cityId:     types.Int64(pieces[5]),
-					townId:     types.Int64(pieces[6]),
-					providerId: types.Int64(pieces[7]),
-				})
-			}
-
 			data = data[index+1:]
 		} else {
 			left = data
@@ -212,3 +199,124 @@ func (this *Reader) parse(data []byte) (left []byte, err error) {
 	}
 	return
 }
+
+// 单行分析
+func (this *Reader) parseLine(line []byte) error {
+	const maxPieces = 8
+	var pieces = strings.Split(string(line), "|")
+	var countPieces = len(pieces)
+	if countPieces < maxPieces { // 补足一行
+		for i := 0; i < maxPieces-countPieces; i++ {
+			pieces = append(pieces, "")
+		}
+	} else if countPieces > maxPieces {
+		return errors.New("invalid ip definition '" + string(line) + "'")
+	}
+
+	var version = pieces[0]
+	if len(version) == 0 {
+		version = "4"
+	}
+
+	if version != "4" && version != "6" {
+		return errors.New("invalid ip version '" + string(line) + "'")
+	}
+
+	// ip range
+	var ipFrom uint64
+	var ipTo uint64
+	if strings.HasPrefix(pieces[1], "+") {
+		ipFrom = this.lastIPFrom + this.decodeUint64(pieces[1][1:])
+	} else {
+		ipFrom = this.decodeUint64(pieces[1])
+	}
+	if len(pieces[2]) == 0 {
+		ipTo = ipFrom
+	} else {
+		ipTo = this.decodeUint64(pieces[2]) + ipFrom
+	}
+	this.lastIPFrom = ipFrom
+
+	// country
+	var countryId uint16
+	if pieces[3] == "+" {
+		countryId = this.lastCountryId
+	} else {
+		countryId = uint16(this.decodeUint64(pieces[3]))
+	}
+	this.lastCountryId = countryId
+
+	var provinceId uint16
+	if pieces[4] == "+" {
+		provinceId = this.lastProvinceId
+	} else {
+		provinceId = uint16(this.decodeUint64(pieces[4]))
+	}
+	this.lastProvinceId = provinceId
+
+	// city
+	var cityId uint32
+	if pieces[5] == "+" {
+		cityId = this.lastCityId
+	} else {
+		cityId = uint32(this.decodeUint64(pieces[5]))
+	}
+	this.lastCityId = cityId
+
+	// town
+	var townId uint32
+	if pieces[6] == "+" {
+		townId = this.lastTownId
+	} else {
+		townId = uint32(this.decodeUint64(pieces[6]))
+	}
+	this.lastTownId = townId
+
+	// provider
+	var providerId uint16
+	if pieces[7] == "+" {
+		providerId = this.lastProviderId
+	} else {
+		providerId = uint16(this.decodeUint64(pieces[7]))
+	}
+	this.lastProviderId = providerId
+
+	var hash = HashRegion(countryId, provinceId, cityId, townId, providerId)
+
+	region, ok := this.regionMap[hash]
+	if !ok {
+		region = &ipRegion{
+			CountryId:  countryId,
+			ProvinceId: provinceId,
+			CityId:     cityId,
+			TownId:     townId,
+			ProviderId: providerId,
+		}
+		this.regionMap[hash] = region
+	}
+
+	if version == "4" {
+		this.ipV4Items = append(this.ipV4Items, &ipv4Item{
+			IPFrom: uint32(ipFrom),
+			IPTo:   uint32(ipTo),
+			Region: region,
+		})
+	} else {
+		this.ipV6Items = append(this.ipV6Items, &ipv6Item{
+			IPFrom: ipFrom,
+			IPTo:   ipTo,
+			Region: region,
+		})
+	}
+
+	return nil
+}
+
+func (this *Reader) decodeUint64(s string) uint64 {
+	if this.meta != nil && this.meta.Version == Version2 {
+		i, _ := strconv.ParseUint(s, 32, 64)
+		return i
+	}
+	i, _ := strconv.ParseUint(s, 10, 64)
+	return i
+}

pkg/iplibrary/reader_file.go

@@ -3,16 +3,20 @@
 package iplibrary
 
 import (
+	"bytes"
 	"compress/gzip"
+	"errors"
+	"io"
 	"net"
 	"os"
 )
 
 type FileReader struct {
 	rawReader *Reader
+	password  string
 }
 
-func NewFileReader(path string) (*FileReader, error) {
+func NewFileReader(path string, password string) (*FileReader, error) {
 	fp, err := os.Open(path)
 	if err != nil {
 		return nil, err
@@ -21,9 +25,27 @@ func NewFileReader(path string) (*FileReader, error) {
 		_ = fp.Close()
 	}()
 
-	gzReader, err := gzip.NewReader(fp)
+	return NewFileDataReader(fp, password)
+}
+
+func NewFileDataReader(dataReader io.Reader, password string) (*FileReader, error) {
+	if len(password) > 0 {
+		data, err := io.ReadAll(dataReader)
+		if err != nil {
+			return nil, err
+		}
+
+		sourceData, err := NewEncrypt().Decode(data, password)
+		if err != nil {
+			return nil, err
+		}
+
+		dataReader = bytes.NewReader(sourceData)
+	}
+
+	gzReader, err := gzip.NewReader(dataReader)
 	if err != nil {
-		return nil, err
+		return nil, errors.New("create gzip reader failed: " + err.Error())
 	}
 
 	reader, err := NewReader(gzReader)
@@ -43,3 +65,7 @@ func (this *FileReader) Meta() *Meta {
 func (this *FileReader) Lookup(ip net.IP) *QueryResult {
 	return this.rawReader.Lookup(ip)
 }
+
+func (this *FileReader) RawReader() *Reader {
+	return this.rawReader
+}

pkg/iplibrary/reader_file_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 func TestNewFileReader(t *testing.T) {
-	reader, err := iplibrary.NewFileReader("./ip.db")
+	reader, err := iplibrary.NewFileReader("./ip-20c1461c.db", "123456")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -37,6 +37,7 @@ func TestNewFileReader(t *testing.T) {
 				"townName":     result.TownName(),
 				"providerId":   result.ProviderId(),
 				"providerName": result.ProviderName(),
+				"summary":      result.Summary(),
 			}
 			dataJSON, err := json.MarshalIndent(data, "", "  ")
 			if err != nil {

pkg/iplibrary/reader_result.go

@@ -2,8 +2,13 @@
 
 package iplibrary
 
+import (
+	"github.com/iwind/TeaGo/lists"
+	"strings"
+)
+
 type QueryResult struct {
-	item *ipItem
+	item any
 	meta *Meta
 }
 
@@ -12,15 +17,16 @@ func (this *QueryResult) IsOk() bool {
 }
 
 func (this *QueryResult) CountryId() int64 {
-	if this.item != nil {
-		return this.item.countryId
-	}
-	return 0
+	return int64(this.realCountryId())
 }
 
 func (this *QueryResult) CountryName() string {
-	if this.item.countryId > 0 {
-		var country = this.meta.CountryWithId(this.item.countryId)
+	if this.item == nil {
+		return ""
+	}
+	var countryId = this.realCountryId()
+	if countryId > 0 {
+		var country = this.meta.CountryWithId(countryId)
 		if country != nil {
 			return country.Name
 		}
@@ -28,16 +34,31 @@ func (this *QueryResult) CountryName() string {
 	return ""
 }
 
-func (this *QueryResult) ProvinceId() int64 {
-	if this.item != nil {
-		return this.item.provinceId
+func (this *QueryResult) CountryCodes() []string {
+	if this.item == nil {
+		return nil
 	}
-	return 0
+	var countryId = this.realCountryId()
+	if countryId > 0 {
+		var country = this.meta.CountryWithId(countryId)
+		if country != nil {
+			return country.Codes
+		}
+	}
+	return nil
+}
+
+func (this *QueryResult) ProvinceId() int64 {
+	return int64(this.realProvinceId())
 }
 
 func (this *QueryResult) ProvinceName() string {
-	if this.item.provinceId > 0 {
-		var province = this.meta.ProvinceWithId(this.item.provinceId)
+	if this.item == nil {
+		return ""
+	}
+	var provinceId = this.realProvinceId()
+	if provinceId > 0 {
+		var province = this.meta.ProvinceWithId(provinceId)
 		if province != nil {
 			return province.Name
 		}
@@ -45,16 +66,31 @@ func (this *QueryResult) ProvinceName() string {
 	return ""
 }
 
-func (this *QueryResult) CityId() int64 {
-	if this.item != nil {
-		return this.item.cityId
+func (this *QueryResult) ProvinceCodes() []string {
+	if this.item == nil {
+		return nil
 	}
-	return 0
+	var provinceId = this.realProvinceId()
+	if provinceId > 0 {
+		var province = this.meta.ProvinceWithId(provinceId)
+		if province != nil {
+			return province.Codes
+		}
+	}
+	return nil
+}
+
+func (this *QueryResult) CityId() int64 {
+	return int64(this.realCityId())
 }
 
 func (this *QueryResult) CityName() string {
-	if this.item.cityId > 0 {
-		var city = this.meta.CityWithId(this.item.cityId)
+	if this.item == nil {
+		return ""
+	}
+	var cityId = this.realCityId()
+	if cityId > 0 {
+		var city = this.meta.CityWithId(cityId)
 		if city != nil {
 			return city.Name
 		}
@@ -63,15 +99,16 @@ func (this *QueryResult) CityName() string {
 }
 
 func (this *QueryResult) TownId() int64 {
-	if this.item != nil {
-		return this.item.townId
-	}
-	return 0
+	return int64(this.realTownId())
 }
 
 func (this *QueryResult) TownName() string {
-	if this.item.townId > 0 {
-		var town = this.meta.TownWithId(this.item.townId)
+	if this.item == nil {
+		return ""
+	}
+	var townId = this.realTownId()
+	if townId > 0 {
+		var town = this.meta.TownWithId(townId)
 		if town != nil {
 			return town.Name
 		}
@@ -80,18 +117,133 @@ func (this *QueryResult) TownName() string {
 }
 
 func (this *QueryResult) ProviderId() int64 {
-	if this.item != nil {
-		return this.item.providerId
-	}
-	return 0
+	return int64(this.realProviderId())
 }
 
 func (this *QueryResult) ProviderName() string {
-	if this.item.providerId > 0 {
-		var provider = this.meta.ProviderWithId(this.item.providerId)
+	if this.item == nil {
+		return ""
+	}
+	var providerId = this.realProviderId()
+	if providerId > 0 {
+		var provider = this.meta.ProviderWithId(providerId)
 		if provider != nil {
 			return provider.Name
 		}
 	}
 	return ""
 }
+
+func (this *QueryResult) ProviderCodes() []string {
+	if this.item == nil {
+		return nil
+	}
+	var providerId = this.realProviderId()
+	if providerId > 0 {
+		var provider = this.meta.ProviderWithId(providerId)
+		if provider != nil {
+			return provider.Codes
+		}
+	}
+	return nil
+}
+
+func (this *QueryResult) Summary() string {
+	if this.item == nil {
+		return ""
+	}
+
+	var pieces = []string{}
+	var countryName = this.CountryName()
+	var provinceName = this.ProvinceName()
+	var cityName = this.CityName()
+	var townName = this.TownName()
+	var providerName = this.ProviderName()
+
+	if len(countryName) > 0 {
+		pieces = append(pieces, countryName)
+	}
+	if len(provinceName) > 0 && !lists.ContainsString(pieces, provinceName) {
+		pieces = append(pieces, provinceName)
+	}
+	if len(cityName) > 0 && !lists.ContainsString(pieces, cityName) && !lists.ContainsString(pieces, strings.TrimSuffix(cityName, "市")) {
+		pieces = append(pieces, cityName)
+	}
+	if len(townName) > 0 && !lists.ContainsString(pieces, townName) && !lists.ContainsString(pieces, strings.TrimSuffix(townName, "县")) {
+		pieces = append(pieces, townName)
+	}
+
+	if len(providerName) > 0 && !lists.ContainsString(pieces, providerName) {
+		if len(pieces) > 0 {
+			pieces = append(pieces, "|")
+		}
+		pieces = append(pieces, providerName)
+	}
+
+	return strings.Join(pieces, " ")
+}
+
+func (this *QueryResult) realCountryId() uint16 {
+	if this.item != nil {
+		switch item := this.item.(type) {
+		case *ipv4Item:
+			return item.Region.CountryId
+		case *ipv6Item:
+			return item.Region.CountryId
+		}
+
+	}
+	return 0
+}
+
+func (this *QueryResult) realProvinceId() uint16 {
+	if this.item != nil {
+		switch item := this.item.(type) {
+		case *ipv4Item:
+			return item.Region.ProvinceId
+		case *ipv6Item:
+			return item.Region.ProvinceId
+		}
+
+	}
+	return 0
+}
+
+func (this *QueryResult) realCityId() uint32 {
+	if this.item != nil {
+		switch item := this.item.(type) {
+		case *ipv4Item:
+			return item.Region.CityId
+		case *ipv6Item:
+			return item.Region.CityId
+		}
+
+	}
+	return 0
+}
+
+func (this *QueryResult) realTownId() uint32 {
+	if this.item != nil {
+		switch item := this.item.(type) {
+		case *ipv4Item:
+			return item.Region.TownId
+		case *ipv6Item:
+			return item.Region.TownId
+		}
+
+	}
+	return 0
+}
+
+func (this *QueryResult) realProviderId() uint16 {
+	if this.item != nil {
+		switch item := this.item.(type) {
+		case *ipv4Item:
+			return item.Region.ProviderId
+		case *ipv6Item:
+			return item.Region.ProviderId
+		}
+
+	}
+	return 0
+}

pkg/iplibrary/template.go

@@ -38,7 +38,7 @@ func (this *Template) init() error {
 
 		return keyword
 	})
-	reg, err := regexp.Compile(template)
+	reg, err := regexp.Compile("^(?U)" + template + "\n?$")
 	if err != nil {
 		return err
 	}
@@ -57,7 +57,7 @@ func (this *Template) Extract(text string, emptyValues []string) (values map[str
 			continue
 		}
 		var v = matches[index]
-		if name != "ipFrom" && name != "ipTo" && (v == "0" || v == "无" || lists.ContainsString(emptyValues, v)) {
+		if name != "ipFrom" && name != "ipTo" && (v == "0" || v == "无" || v == "空" || lists.ContainsString(emptyValues, v)) {
 			v = ""
 		}
 		values[name] = v

pkg/iplibrary/template_test.go

@@ -13,11 +13,25 @@ func TestNewTemplate(t *testing.T) {
 		t.Fatal(err)
 	}
 	for _, s := range []string{
+		"0.0.0.0|0.255.255.255|0|0|0|内网IP|内网IP",
 		"42.0.32.0|42.0.63.255|中国|0|广东省|广州市|电信",
 		"42.0.32.0|42.0.63.255|中国|0|广东省|广州市|电信\n123",
 		"42.0.32.0|42.0.63.255|中国||广东省|广州市|电信",
 		"42.0.32.0|42.0.63.255|中国|0||广州市|电信",
 		"42.0.32.0|42.0.63.255|中国|0|广东省|广州市",
+	} {
+		values, ok := template.Extract(s, []string{})
+		t.Log(ok, s, "=>\n", values)
+	}
+}
+
+func TestNewTemplate2(t *testing.T) {
+	template, err := iplibrary.NewTemplate("${any},${any},${ipFrom},${ipTo},${country},${province},${city},${town},${provider},${any},${any}")
+	if err != nil {
+		t.Fatal(err)
+	}
+	for _, s := range []string{
+		"22723584,22723839,1.90.188.0,1.90.188.255,中国,北京,北京,房山,歌华有线,102400,010,城域网",
 	} {
 		values, _ := template.Extract(s, []string{})
 		t.Log(s, "=>\n", values)

pkg/iplibrary/updater.go

@@ -0,0 +1,268 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package iplibrary
+
+import (
+	"errors"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"io"
+	"os"
+	"strings"
+	"time"
+)
+
+type UpdaterSource interface {
+	// DataDir 文件目录
+	DataDir() string
+
+	// FindLatestFile 检查最新的IP库文件
+	FindLatestFile() (code string, fileId int64, err error)
+
+	// DownloadFile 下载文件
+	DownloadFile(fileId int64, writer io.Writer) error
+
+	// LogInfo 普通日志
+	LogInfo(message string)
+
+	// LogError 错误日志
+	LogError(err error)
+}
+
+type Updater struct {
+	source UpdaterSource
+
+	currentCode string
+	ticker      *time.Ticker
+
+	isUpdating bool
+}
+
+func NewUpdater(source UpdaterSource, interval time.Duration) *Updater {
+	return &Updater{
+		source: source,
+		ticker: time.NewTicker(interval),
+	}
+}
+
+func (this *Updater) Start() {
+	// 初始化
+	err := this.Init()
+	if err != nil {
+		this.source.LogError(err)
+	}
+
+	// 先运行一次
+	err = this.Loop()
+	if err != nil {
+		this.source.LogError(err)
+	}
+
+	// 开始定时运行
+	for range this.ticker.C {
+		err = this.Loop()
+		if err != nil {
+			this.source.LogError(err)
+		}
+	}
+}
+
+func (this *Updater) Init() error {
+	// 检查当前正在使用的IP库
+	var path = this.source.DataDir() + "/ip-library.db"
+	fp, err := os.Open(path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil
+		}
+
+		return errors.New("read ip library file failed '" + err.Error() + "'")
+	}
+	defer func() {
+		_ = fp.Close()
+	}()
+
+	return this.loadFile(fp)
+}
+
+func (this *Updater) Loop() error {
+	if this.isUpdating {
+		return nil
+	}
+
+	this.isUpdating = true
+
+	defer func() {
+		this.isUpdating = false
+	}()
+
+	code, fileId, err := this.source.FindLatestFile()
+	if err != nil {
+		// 不提示连接错误
+		if this.isConnError(err) {
+			return nil
+		}
+		return err
+	}
+	if len(code) == 0 || fileId <= 0 {
+		// 还原到内置IP库
+		if len(this.currentCode) > 0 {
+			this.currentCode = ""
+			this.source.LogInfo("resetting to default ip library ...")
+
+			var defaultPath = this.source.DataDir() + "/ip-library.db"
+			_, err = os.Stat(defaultPath)
+			if err == nil {
+				err = os.Remove(defaultPath)
+				if err != nil {
+					this.source.LogError(errors.New("can not remove default 'ip-library.db'"))
+				}
+			}
+
+			err = InitDefault()
+			if err != nil {
+				this.source.LogError(errors.New("initialize default ip library failed: " + err.Error()))
+			}
+		}
+
+		return nil
+	}
+
+	// 下载
+	if this.currentCode == code {
+		// 不再重复下载
+		return nil
+	}
+
+	// 检查是否存在
+	var dir = this.source.DataDir()
+	var path = dir + "/ip-" + code + ".db"
+	stat, err := os.Stat(path)
+	if err == nil && !stat.IsDir() && stat.Size() > 0 {
+		fp, err := os.Open(path)
+		if err != nil {
+			return err
+		}
+
+		defer func() {
+			_ = fp.Close()
+		}()
+
+		err = this.loadFile(fp)
+		if err != nil {
+			// 尝试删除
+			_ = os.Remove(path)
+		} else {
+			this.currentCode = code
+
+			// 拷贝到 ip-library.db
+			err = this.createDefaultFile(path, dir)
+			if err != nil {
+				this.source.LogError(err)
+			}
+		}
+		return err
+	}
+
+	// write to file
+	fp, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
+	if err != nil {
+		return errors.New("create ip library file failed: " + err.Error())
+	}
+
+	var isOk = false
+	defer func() {
+		if !isOk {
+			_ = os.Remove(path)
+		}
+	}()
+
+	err = this.source.DownloadFile(fileId, fp)
+	if err != nil {
+		_ = fp.Close()
+		return err
+	}
+	err = fp.Close()
+	if err != nil {
+		return nil
+	}
+
+	// load library from file
+	fp, err = os.Open(path)
+	if err != nil {
+		return nil
+	}
+	err = this.loadFile(fp)
+	_ = fp.Close()
+	if err != nil {
+		return errors.New("load file failed: " + err.Error())
+	}
+
+	isOk = true
+	this.currentCode = code
+
+	// 拷贝到 ip-library.db
+	err = this.createDefaultFile(path, dir)
+	if err != nil {
+		this.source.LogError(err)
+	}
+
+	return nil
+}
+
+func (this *Updater) loadFile(fp *os.File) error {
+	this.source.LogInfo("load ip library from '" + fp.Name() + "' ...")
+
+	fileReader, err := NewFileDataReader(fp, "")
+	if err != nil {
+		return errors.New("load ip library from reader failed: " + err.Error())
+	}
+
+	var reader = fileReader.RawReader()
+	defaultLibrary = NewIPLibraryWithReader(reader)
+	this.currentCode = reader.Meta().Code
+	return nil
+}
+
+func (this *Updater) createDefaultFile(sourcePath string, dir string) error {
+	sourceFp, err := os.Open(sourcePath)
+	if err != nil {
+		return errors.New("prepare to copy file to 'ip-library.db' failed: " + err.Error())
+	}
+	defer func() {
+		_ = sourceFp.Close()
+	}()
+
+	dstFp, err := os.Create(dir + "/ip-library.db")
+	if err != nil {
+		return errors.New("prepare to copy file to 'ip-library.db' failed: " + err.Error())
+	}
+	defer func() {
+		_ = dstFp.Close()
+	}()
+	_, err = io.Copy(dstFp, sourceFp)
+	if err != nil {
+		return errors.New("copy file to 'ip-library.db' failed: " + err.Error())
+	}
+	return nil
+}
+
+// isConnError 是否为连接错误
+func (this *Updater) isConnError(err error) bool {
+	if err == nil {
+		return false
+	}
+
+	// 检查是否为连接错误
+	statusErr, ok := status.FromError(err)
+	if ok {
+		var errorCode = statusErr.Code()
+		return errorCode == codes.Unavailable || errorCode == codes.Canceled
+	}
+
+	if strings.Contains(err.Error(), "code = Canceled") {
+		return true
+	}
+
+	return false
+}

pkg/iplibrary/updater_test.go

@@ -0,0 +1,53 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package iplibrary_test
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
+	"github.com/iwind/TeaGo/Tea"
+	_ "github.com/iwind/TeaGo/bootstrap"
+	"io"
+	"testing"
+	"time"
+)
+
+type updaterSource struct {
+	t *testing.T
+}
+
+func (this *updaterSource) DataDir() string {
+	return Tea.Root + "/data"
+}
+
+func (this *updaterSource) FindLatestFile() (code string, fileId int64, err error) {
+	return "CODE", 1, nil
+}
+
+func (this *updaterSource) DownloadFile(fileId int64, writer io.Writer) error {
+	this.t.Log("downloading file:", fileId, "writer:", writer)
+	_, err := writer.Write(iplibrary.DefaultIPLibraryData())
+	return err
+}
+
+func (this *updaterSource) LogInfo(message string) {
+	this.t.Log(message)
+}
+
+func (this *updaterSource) LogError(err error) {
+	this.t.Fatal(err)
+}
+
+func TestNewUpdater(t *testing.T) {
+	var updater = iplibrary.NewUpdater(&updaterSource{
+		t: t,
+	}, 1*time.Minute)
+	err := updater.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = updater.Loop()
+	if err != nil {
+		t.Fatal(err)
+	}
+}

pkg/iplibrary/version.go

@@ -6,4 +6,5 @@ type Version = int
 
 const (
 	Version1 Version = 1
+	Version2 Version = 2 // 主要变更为数字使用32进制
 )

pkg/iplibrary/writer.go

@@ -8,10 +8,10 @@ import (
 	"errors"
 	"fmt"
 	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
-	"github.com/iwind/TeaGo/types"
 	"hash"
 	"io"
 	"net"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -41,13 +41,20 @@ func (this *hashWriter) Sum() string {
 type Writer struct {
 	writer *hashWriter
 	meta   *Meta
+
+	lastIPFrom     uint64 // 上一次的IP
+	lastCountryId  int64
+	lastProvinceId int64
+	lastCityId     int64
+	lastTownId     int64
+	lastProviderId int64
 }
 
 func NewWriter(writer io.Writer, meta *Meta) *Writer {
 	if meta == nil {
 		meta = &Meta{}
 	}
-	meta.Version = Version1
+	meta.Version = Version2
 	meta.CreatedAt = time.Now().Unix()
 
 	var libWriter = &Writer{
@@ -103,51 +110,81 @@ func (this *Writer) Write(ipFrom string, ipTo string, countryId int64, provinceI
 		fromIPLong, toIPLong = toIPLong, fromIPLong
 	}
 
-	pieces = append(pieces, types.String(fromIPLong))
+	if this.lastIPFrom > 0 && fromIPLong > this.lastIPFrom {
+		pieces = append(pieces, "+"+this.formatUint64(fromIPLong-this.lastIPFrom))
+	} else {
+		pieces = append(pieces, this.formatUint64(fromIPLong))
+	}
+	this.lastIPFrom = fromIPLong
 	if ipFrom == ipTo {
 		// 2
 		pieces = append(pieces, "")
 	} else {
 		// 2
-		pieces = append(pieces, types.String(toIPLong-fromIPLong))
+		pieces = append(pieces, this.formatUint64(toIPLong-fromIPLong))
 	}
 
 	// 3
 	if countryId > 0 {
-		pieces = append(pieces, types.String(countryId))
+		if countryId == this.lastCountryId {
+			pieces = append(pieces, "+")
+		} else {
+			pieces = append(pieces, this.formatUint64(uint64(countryId)))
+		}
 	} else {
 		pieces = append(pieces, "")
 	}
+	this.lastCountryId = countryId
 
 	// 4
 	if provinceId > 0 {
-		pieces = append(pieces, types.String(provinceId))
+		if provinceId == this.lastProvinceId {
+			pieces = append(pieces, "+")
+		} else {
+			pieces = append(pieces, this.formatUint64(uint64(provinceId)))
+		}
 	} else {
 		pieces = append(pieces, "")
 	}
+	this.lastProvinceId = provinceId
 
 	// 5
 	if cityId > 0 {
-		pieces = append(pieces, types.String(cityId))
+		if cityId == this.lastCityId {
+			pieces = append(pieces, "+")
+		} else {
+			pieces = append(pieces, this.formatUint64(uint64(cityId)))
+		}
 	} else {
 		pieces = append(pieces, "")
 	}
+	this.lastCityId = cityId
 
 	// 6
 	if townId > 0 {
-		pieces = append(pieces, types.String(townId))
+		if townId == this.lastTownId {
+			pieces = append(pieces, "+")
+		} else {
+			pieces = append(pieces, this.formatUint64(uint64(townId)))
+		}
 	} else {
 		pieces = append(pieces, "")
 	}
+	this.lastTownId = townId
 
 	// 7
 	if providerId > 0 {
-		pieces = append(pieces, types.String(providerId))
+		if providerId == this.lastProviderId {
+			pieces = append(pieces, "+")
+		} else {
+			pieces = append(pieces, this.formatUint64(uint64(providerId)))
+		}
 	} else {
 		pieces = append(pieces, "")
 	}
+	this.lastProviderId = providerId
 
-	_, err := this.writer.Write([]byte(strings.Join(pieces, "|")))
+	_, err := this.writer.Write([]byte(strings.TrimRight(strings.Join(pieces, "|"), "|")))
 	if err != nil {
 		return err
 	}
@@ -159,3 +196,7 @@ func (this *Writer) Write(ipFrom string, ipTo string, countryId int64, provinceI
 func (this *Writer) Sum() string {
 	return this.writer.Sum()
 }
+
+func (this *Writer) formatUint64(i uint64) string {
+	return strconv.FormatUint(i, 32)
+}

pkg/iplibrary/writer_file.go

@@ -10,11 +10,12 @@ import (
 type FileWriter struct {
 	fp       *os.File
 	gzWriter *gzip.Writer
+	password string
 
 	rawWriter *Writer
 }
 
-func NewFileWriter(path string, meta *Meta) (*FileWriter, error) {
+func NewFileWriter(path string, meta *Meta, password string) (*FileWriter, error) {
 	fp, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
 	if err != nil {
 		return nil, err
@@ -29,6 +30,7 @@ func NewFileWriter(path string, meta *Meta) (*FileWriter, error) {
 		fp:        fp,
 		gzWriter:  gzWriter,
 		rawWriter: NewWriter(gzWriter, meta),
+		password:  password,
 	}
 	return writer, nil
 }
@@ -54,5 +56,25 @@ func (this *FileWriter) Close() error {
 	if err2 != nil {
 		return err2
 	}
+
+	// 加密内容
+	if len(this.password) > 0 {
+		var filePath = this.fp.Name()
+		data, err := os.ReadFile(filePath)
+		if err != nil {
+			return err
+		}
+		if len(data) > 0 {
+			encodedData, err := NewEncrypt().Encode(data, this.password)
+			if err != nil {
+				return err
+			}
+			err = os.WriteFile(filePath, encodedData, 0666)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
 	return nil
 }

pkg/iplibrary/writer_file_test.go

@@ -10,9 +10,9 @@ import (
 )
 
 func TestNewFileWriter(t *testing.T) {
-	writer, err := iplibrary.NewFileWriter("./ip.db", &iplibrary.Meta{
+	writer, err := iplibrary.NewFileWriter("./internal-ip-library-test.db", &iplibrary.Meta{
 		Author: "GoEdge",
-	})
+	}, "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -41,7 +41,7 @@ func TestNewFileWriter(t *testing.T) {
 		return types.String(rands.Int(0, 255))
 	}
 
-	for i := 0; i < 1_000_000; i++ {
+	for i := 0; i < 1; i++ {
 		err = writer.Write(n()+"."+n()+"."+n()+"."+n(), n()+"."+n()+"."+n()+"."+n(), int64(i)+100, 201, 301, 401, 501)
 		if err != nil {
 			t.Fatal(err)

pkg/nodeconfigs/clock_config.go

@@ -0,0 +1,22 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package nodeconfigs
+
+func DefaultClockConfig() *ClockConfig {
+	return &ClockConfig{
+		AutoSync:    true,
+		Server:      "",
+		CheckChrony: true,
+	}
+}
+
+// ClockConfig 时钟相关配置
+type ClockConfig struct {
+	AutoSync    bool   `yaml:"autoSync" json:"autoSync"`       // 自动尝试同步时钟
+	Server      string `yaml:"server" json:"server"`           // 时钟同步服务器
+	CheckChrony bool   `yaml:"checkChrony" json:"checkChrony"` // 检查 chronyd 是否在运行
+}
+
+func (this *ClockConfig) Init() error {
+	return nil
+}

pkg/nodeconfigs/defaults.go

@@ -12,19 +12,26 @@ const (
 	DefaultMaxThreadsMin = 1000    // 单节点最大线程数最小值
 	DefaultMaxThreadsMax = 100_000 // 单节点最大线程数最大值
 
-	DefaultTCPMaxConnections        = 100_000 // 单节点TCP最大连接数
-	DefaultTCPMaxConnectionsPerIP   = 1000    // 单IP最大连接数
-	DefaultTCPMinConnectionsPerIP   = 5       // 单IP最小连接数
-	DefaultTCPNewConnectionsRate    = 500     // 单IP连接速率限制（按分钟）
-	DefaultTCPNewConnectionsMinRate = 5       // 单IP最小连接速率
-	DefaultTCPLinger                = 3       // 单节点TCP Linger值
-	DefaultTLSHandshakeTimeout      = 3       // TLS握手超时时间
+	DefaultTCPMaxConnections      = 100_000 // 单节点TCP最大连接数
+	DefaultTCPMaxConnectionsPerIP = 1000    // 单IP最大连接数
+	DefaultTCPMinConnectionsPerIP = 5       // 单IP最小连接数
+
+	DefaultTCPNewConnectionsMinutelyRate    = 500 // 单IP连接速率限制（按分钟）
+	DefaultTCPNewConnectionsMinMinutelyRate = 3   // 单IP最小连接速率
+
+	DefaultTCPNewConnectionsSecondlyRate    = 300 // 单IP连接速率限制（按秒）
+	DefaultTCPNewConnectionsMinSecondlyRate = 3   // 单IP最小连接速率
+
+	DefaultTCPLinger           = 3 // 单节点TCP Linger值
+	DefaultTLSHandshakeTimeout = 3 // TLS握手超时时间
 )
 
 var DefaultConfigs = maps.Map{
-	"tcpMaxConnections":        DefaultTCPMaxConnections,
-	"tcpMaxConnectionsPerIP":   DefaultTCPMaxConnectionsPerIP,
-	"tcpMinConnectionsPerIP":   DefaultTCPMinConnectionsPerIP,
-	"tcpNewConnectionsRate":    DefaultTCPNewConnectionsRate,
-	"tcpNewConnectionsMinRate": DefaultTCPNewConnectionsMinRate,
+	"tcpMaxConnections":                DefaultTCPMaxConnections,
+	"tcpMaxConnectionsPerIP":           DefaultTCPMaxConnectionsPerIP,
+	"tcpMinConnectionsPerIP":           DefaultTCPMinConnectionsPerIP,
+	"tcpNewConnectionsMinutelyRate":    DefaultTCPNewConnectionsMinutelyRate,
+	"tcpNewConnectionsMinMinutelyRate": DefaultTCPNewConnectionsMinMinutelyRate,
+	"tcpNewConnectionsSecondlyRate":    DefaultTCPNewConnectionsSecondlyRate,
+	"tcpNewConnectionsMinSecondlyRate": DefaultTCPNewConnectionsMinSecondlyRate,
 }

pkg/nodeconfigs/http3_policy.go

@@ -0,0 +1,23 @@
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package nodeconfigs
+
+const DefaultHTTP3Port = 443
+
+type HTTP3Policy struct {
+	IsOn bool `yaml:"isOn" json:"isOn"`
+	Port int  `yaml:"port" json:"port"`
+}
+
+func NewHTTP3Policy() *HTTP3Policy {
+	return &HTTP3Policy{
+		Port: DefaultHTTP3Port,
+	}
+}
+
+func (this *HTTP3Policy) Init() error {
+	if this.Port <= 0 {
+		this.Port = DefaultHTTP3Port
+	}
+	return nil
+}

pkg/nodeconfigs/http_cc_policy.go

@@ -0,0 +1,22 @@
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+//go:build !plus
+
+package nodeconfigs
+
+import "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+
+// HTTPCCPolicy CC策略
+type HTTPCCPolicy struct {
+	IsOn       bool                             `json:"isOn" yaml:"isOn"`
+	Thresholds []*serverconfigs.HTTPCCThreshold `json:"thresholds" yaml:"thresholds"` // 阈值
+}
+
+func NewHTTPCCPolicy() *HTTPCCPolicy {
+	return &HTTPCCPolicy{
+		IsOn: true,
+	}
+}
+
+func (this *HTTPCCPolicy) Init() error {
+	return nil
+}

pkg/nodeconfigs/http_pages_policy.go

@@ -0,0 +1,28 @@
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package nodeconfigs
+
+import "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+
+// HTTPPagesPolicy 全局的HTTP自定义页面设置
+type HTTPPagesPolicy struct {
+	IsOn  bool                            `json:"isOn" yaml:"isOn"`   // 是否启用
+	Pages []*serverconfigs.HTTPPageConfig `json:"pages" yaml:"pages"` // 自定义页面
+}
+
+func NewHTTPPagesPolicy() *HTTPPagesPolicy {
+	return &HTTPPagesPolicy{}
+}
+
+func (this *HTTPPagesPolicy) Init() error {
+	if len(this.Pages) > 0 {
+		for _, page := range this.Pages {
+			err := page.Init()
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}

pkg/nodeconfigs/node_config.go

@@ -1,22 +1,33 @@
 package nodeconfigs
 
 import (
+	"bytes"
+	"context"
 	"crypto/sha256"
+	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeutils"
 	"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"
+	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
 	"os"
 	"reflect"
 	"strconv"
+	"strings"
+	"sync"
 )
 
 var sharedNodeConfig *NodeConfig = nil
+var uamPolicyLocker = &sync.RWMutex{}
+var httpCCPolicyLocker = &sync.RWMutex{}
+var http3PolicyLocker = &sync.RWMutex{}
+var httpPagesPolicyLocker = &sync.RWMutex{}
 
 type ServerError struct {
 	Id      int64
@@ -29,42 +40,54 @@ 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"`
-	GroupId      int64                         `yaml:"groupId" json:"groupId"`
-	RegionId     int64                         `yaml:"regionId" json:"regionId"`
-	OCSPVersion  int64                         `yaml:"ocspVersion" json:"ocspVersion"`
+	Id                   int64                         `yaml:"id" json:"id"`
+	Edition              string                        `yaml:"edition" json:"edition"`
+	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"`
+	DataMap              *shared.DataMap               `yaml:"dataMap" json:"dataMap"`
+	UpdatingServerListId int64                         `yaml:"updatingServerListId" json:"updatingServerListId"`
 
 	// 性能
-	MaxCPU                 int32                         `yaml:"maxCPU" json:"maxCPU"`
-	CacheDiskDir           string                        `yaml:"cacheDiskDir" json:"cacheDiskDir"`                     // 文件缓存目录
-	MaxCacheDiskCapacity   *shared.SizeCapacity          `yaml:"maxCacheDiskCapacity" json:"maxCacheDiskCapacity"`     // 文件缓存容量
+	MaxCPU       int32                                 `yaml:"maxCPU" json:"maxCPU"`
+	APINodeAddrs []*serverconfigs.NetworkAddressConfig `yaml:"apiNodeAddrs" json:"apiNodeAddrs"`
+
+	CacheDiskDir         string               `yaml:"cacheDiskDir" json:"cacheDiskDir"`                 // 文件缓存目录
+	MaxCacheDiskCapacity *shared.SizeCapacity `yaml:"maxCacheDiskCapacity" json:"maxCacheDiskCapacity"` // 文件缓存容量
+
+	CacheDiskSubDirs []*serverconfigs.CacheDir `yaml:"cacheDiskSubDirs" json:"cacheDiskSubDirs"` // 其余缓存目录
+
 	MaxCacheMemoryCapacity *shared.SizeCapacity          `yaml:"maxCacheMemoryCapacity" json:"maxCacheMemoryCapacity"` // 内容缓存容量
 	MaxThreads             int                           `yaml:"maxThreads" json:"maxThreads"`                         // 最大线程数
-	DDoSProtection         *ddosconfigs.ProtectionConfig `yaml:"ddosProtection" json:"ddosProtection"`
+	DDoSProtection         *ddosconfigs.ProtectionConfig `yaml:"ddosProtection" json:"ddosProtection"`                 // DDoS防护
+	EnableIPLists          bool                          `yaml:"enableIPLists" json:"enableIPLists"`                   // 启用IP名单
 
 	// 级别
 	Level       int32                         `yaml:"level" json:"level"`
 	ParentNodes map[int64][]*ParentNodeConfig `yaml:"parentNodes" json:"parentNodes"` // clusterId => []*ParentNodeConfig
 
 	// 全局配置
-	GlobalConfig  *serverconfigs.GlobalConfig `yaml:"globalConfig" json:"globalConfig"` // 全局配置
-	ProductConfig *ProductConfig              `yaml:"productConfig" json:"productConfig"`
+	GlobalConfig       *serverconfigs.GlobalConfig       `yaml:"globalConfig" json:"globalConfig"`             // 全局配置
+	GlobalServerConfig *serverconfigs.GlobalServerConfig `yaml:"globalServerConfig" json:"globalServerConfig"` // 服务全局配置，用来替代 GlobalConfig
+	ProductConfig      *ProductConfig                    `yaml:"productConfig" json:"productConfig"`
 
 	// 集群统一配置
 	HTTPFirewallPolicies []*firewallconfigs.HTTPFirewallPolicy   `yaml:"httpFirewallPolicies" json:"httpFirewallPolicies"`
 	HTTPCachePolicies    []*serverconfigs.HTTPCachePolicy        `yaml:"httpCachePolicies" json:"httpCachePolicies"`
 	TOA                  *TOAConfig                              `yaml:"toa" json:"toa"`
-	SystemServices       map[string]maps.Map                     `yaml:"systemServices" json:"systemServices"` // 系统服务配置 type => params
-	FirewallActions      []*firewallconfigs.FirewallActionConfig `yaml:"firewallActions" json:"firewallActions"`
-	TimeZone             string                                  `yaml:"timeZone" json:"timeZone"`
-	AutoOpenPorts        bool                                    `yaml:"autoOpenPorts" json:"autoOpenPorts"`
+	SystemServices       map[string]maps.Map                     `yaml:"systemServices" json:"systemServices"`           // 系统服务配置 type => params
+	FirewallActions      []*firewallconfigs.FirewallActionConfig `yaml:"firewallActions" json:"firewallActions"`         // 防火墙动作
+	TimeZone             string                                  `yaml:"timeZone" json:"timeZone"`                       // 自动设置时区
+	AutoOpenPorts        bool                                    `yaml:"autoOpenPorts" json:"autoOpenPorts"`             // 自动开放所需端口
+	Clock                *ClockConfig                            `yaml:"clock" json:"clock"`                             // 时钟配置
+	AutoInstallNftables  bool                                    `yaml:"autoInstallNftables" json:"autoInstallNftables"` // 自动安装nftables
 
 	// 指标
 	MetricItems []*serverconfigs.MetricItemConfig `yaml:"metricItems" json:"metricItems"`
@@ -75,11 +98,11 @@ type NodeConfig struct {
 	// 脚本
 	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
+	WebPImagePolicies map[int64]*WebPImagePolicy `yaml:"webpImagePolicies" json:"webpImagePolicies"` // WebP相关配置，clusterId => *WebPImagePolicy
+	UAMPolicies       map[int64]*UAMPolicy       `yaml:"uamPolicies" json:"uamPolicies"`             // UAM相关配置，clusterId => *UAMPolicy
+	HTTPCCPolicies    map[int64]*HTTPCCPolicy    `yaml:"httpCCPolicies" json:"httpCCPolicies"`       // CC相关配置， clusterId => *HTTPCCPolicy
+	HTTP3Policies     map[int64]*HTTP3Policy     `yaml:"http3Policies" json:"http3Policies"`         // HTTP3相关配置， clusterId => *HTTP3Policy
+	HTTPPagesPolicies map[int64]*HTTPPagesPolicy `yaml:"httpPagesPolicies" json:"httpPagesPolicies"` // 自定义页面，clusterId => *HTTPPagesPolicy
 
 	// DNS
 	DNSResolver *DNSResolverConfig `yaml:"dnsResolver" json:"dnsResolver"`
@@ -113,17 +136,50 @@ func SharedNodeConfig() (*NodeConfig, error) {
 		return sharedNodeConfig, nil
 	}
 
-	data, err := os.ReadFile(Tea.ConfigFile("node.json"))
+	// 从本地缓存读取
+	var configFile = Tea.ConfigFile("node.json")
+	var readCacheOk = false
+	defer func() {
+		if !readCacheOk {
+			_ = os.Remove(configFile)
+		}
+	}()
+
+	data, err := os.ReadFile(configFile)
 	if err != nil {
 		return &NodeConfig{}, err
 	}
 
-	config := &NodeConfig{}
-	err = json.Unmarshal(data, &config)
+	encodedNodeInfo, encodedJSONData, found := bytes.Cut(data, []byte("\n"))
+	if !found {
+		// 删除缓存文件
+		return &NodeConfig{}, errors.New("node.json: invalid data format")
+	}
+
+	encodedNodeInfoData, err := base64.StdEncoding.DecodeString(string(encodedNodeInfo))
+	if err != nil {
+		// 删除缓存文件
+		return &NodeConfig{}, err
+	}
+
+	nodeUniqueId, nodeSecret, found := strings.Cut(string(encodedNodeInfoData), "|")
+	if !found {
+		// 删除缓存文件
+		return &NodeConfig{}, errors.New("node.json: node info: invalid data format")
+	}
+
+	jsonData, err := nodeutils.DecryptData(nodeUniqueId, nodeSecret, string(encodedJSONData))
 	if err != nil {
 		return &NodeConfig{}, err
 	}
 
+	var config = &NodeConfig{}
+	err = json.Unmarshal(jsonData, &config)
+	if err != nil {
+		return &NodeConfig{}, err
+	}
+
+	readCacheOk = true
 	sharedNodeConfig = config
 	return config, nil
 }
@@ -141,6 +197,18 @@ func CloneNodeConfig(nodeConfig *NodeConfig) (*NodeConfig, error) {
 		return nil, errors.New("node config should not be nil")
 	}
 
+	uamPolicyLocker.RLock()
+	defer uamPolicyLocker.RUnlock()
+
+	httpCCPolicyLocker.RLock()
+	defer httpCCPolicyLocker.RUnlock()
+
+	http3PolicyLocker.RLock()
+	defer http3PolicyLocker.RUnlock()
+
+	httpPagesPolicyLocker.RLock()
+	defer httpPagesPolicyLocker.RUnlock()
+
 	var newConfigValue = reflect.Indirect(reflect.ValueOf(&NodeConfig{}))
 	var oldValue = reflect.Indirect(reflect.ValueOf(nodeConfig))
 	var valueType = oldValue.Type()
@@ -163,14 +231,25 @@ func CloneNodeConfig(nodeConfig *NodeConfig) (*NodeConfig, error) {
 }
 
 // Init 初始化
-func (this *NodeConfig) Init() (err error, serverErrors []*ServerError) {
+func (this *NodeConfig) Init(ctx context.Context) (err error, serverErrors []*ServerError) {
+	// 设置Context
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	ctx = context.WithValue(ctx, "DataMap", this.DataMap)
+
 	this.secretHash = fmt.Sprintf("%x", sha256.Sum256([]byte(this.NodeId+"@"+this.Secret)))
 	this.paddedId = fmt.Sprintf("%08d", this.Id)
 
 	// servers
 	for _, server := range this.Servers {
+		// 避免在运行时重新初始化
+		if server.IsInitialized() {
+			continue
+		}
+
 		// 初始化
-		errs := server.Init()
+		errs := server.Init(ctx)
 		if len(errs) > 0 {
 			// 这里不返回错误，而是继续往下，防止单个服务错误而影响其他服务
 			for _, serverErr := range errs {
@@ -314,14 +393,56 @@ func (this *NodeConfig) Init() (err error, serverErrors []*ServerError) {
 	}
 
 	// uam policy
-	if this.UAMPolicies != nil {
+	uamPolicyLocker.RLock()
+	if len(this.UAMPolicies) > 0 {
 		for _, policy := range this.UAMPolicies {
 			err = policy.Init()
 			if err != nil {
+				uamPolicyLocker.RUnlock()
 				return
 			}
 		}
 	}
+	uamPolicyLocker.RUnlock()
+
+	// http cc policy
+	httpCCPolicyLocker.RLock()
+	if len(this.HTTPCCPolicies) > 0 {
+		for _, policy := range this.HTTPCCPolicies {
+			err = policy.Init()
+			if err != nil {
+				httpCCPolicyLocker.RUnlock()
+				return
+			}
+		}
+	}
+	httpCCPolicyLocker.RUnlock()
+
+	// http3 policy
+	http3PolicyLocker.RLock()
+	if len(this.HTTP3Policies) > 0 {
+		for _, policy := range this.HTTP3Policies {
+			err = policy.Init()
+			if err != nil {
+				http3PolicyLocker.RUnlock()
+				return
+			}
+		}
+	}
+	http3PolicyLocker.RUnlock()
+
+	// http pages policy
+	httpPagesPolicyLocker.RLock()
+	if len(this.HTTPPagesPolicies) > 0 {
+		for _, policy := range this.HTTPPagesPolicies {
+			err = policy.Init()
+			if err != nil {
+				httpPagesPolicyLocker.RUnlock()
+				return
+			}
+		}
+	}
+	httpPagesPolicyLocker.RUnlock()
 
 	// dns resolver
 	if this.DNSResolver != nil {
@@ -331,6 +452,24 @@ func (this *NodeConfig) Init() (err error, serverErrors []*ServerError) {
 		}
 	}
 
+	// 全局服务设置
+	if this.GlobalServerConfig != nil {
+		err = this.GlobalServerConfig.Init()
+		if err != nil {
+			return
+		}
+	}
+
+	// api node addrs
+	if len(this.APINodeAddrs) > 0 {
+		for _, addr := range this.APINodeAddrs {
+			err := addr.Init()
+			if err != nil {
+				return err, nil
+			}
+		}
+	}
+
 	return
 }
 
@@ -365,7 +504,7 @@ func (this *NodeConfig) RemoveServer(serverId int64) {
 
 // AvailableGroups 根据网络地址和协议分组
 func (this *NodeConfig) AvailableGroups() []*serverconfigs.ServerAddressGroup {
-	groupMapping := map[string]*serverconfigs.ServerAddressGroup{} // protocol://addr => Server Group
+	var groupMapping = map[string]*serverconfigs.ServerAddressGroup{} // protocol://addr => Server Group
 	for _, server := range this.Servers {
 		if !server.IsOk() || !server.IsOn {
 			continue
@@ -381,13 +520,26 @@ func (this *NodeConfig) AvailableGroups() []*serverconfigs.ServerAddressGroup {
 			groupMapping[addr] = group
 		}
 	}
-	result := []*serverconfigs.ServerAddressGroup{}
+	var result = []*serverconfigs.ServerAddressGroup{}
 	for _, group := range groupMapping {
 		result = append(result, group)
 	}
 	return result
 }
 
+// HTTP3Group HTTP/3网站分组
+// 这里暂时不区分集群
+func (this *NodeConfig) HTTP3Group() *serverconfigs.ServerAddressGroup {
+	var group = serverconfigs.NewServerAddressGroup("HTTP3")
+	for _, server := range this.Servers {
+		if !server.SupportsHTTP3() {
+			continue
+		}
+		group.Add(server)
+	}
+	return group
+}
+
 // FindAllFirewallPolicies 获取所有的防火墙策略
 func (this *NodeConfig) FindAllFirewallPolicies() []*firewallconfigs.HTTPFirewallPolicy {
 	return this.firewallPolicies
@@ -403,7 +555,14 @@ func (this *NodeConfig) Save() error {
 		return err
 	}
 
-	return os.WriteFile(Tea.ConfigFile("node.json"), data, 0777)
+	var headerData = []byte(base64.StdEncoding.EncodeToString([]byte(this.NodeId+"|"+this.Secret)) + "\n")
+
+	encodedData, err := nodeutils.EncryptData(this.NodeId, this.Secret, data)
+	if err != nil {
+		return err
+	}
+
+	return os.WriteFile(Tea.ConfigFile("node.json"), append(headerData, encodedData...), 0777)
 }
 
 // PaddedId 获取填充后的ID
@@ -523,12 +682,90 @@ func (this *NodeConfig) FindWebPImagePolicyWithClusterId(clusterId int64) *WebPI
 
 // FindUAMPolicyWithClusterId 使用集群ID查找UAM策略
 func (this *NodeConfig) FindUAMPolicyWithClusterId(clusterId int64) *UAMPolicy {
+	uamPolicyLocker.RLock()
+	defer uamPolicyLocker.RUnlock()
 	if this.UAMPolicies == nil {
 		return nil
 	}
 	return this.UAMPolicies[clusterId]
 }
 
+// UpdateUAMPolicies 修改集群UAM策略
+func (this *NodeConfig) UpdateUAMPolicies(policies map[int64]*UAMPolicy) {
+	uamPolicyLocker.Lock()
+	defer uamPolicyLocker.Unlock()
+	this.UAMPolicies = policies
+}
+
+// FindHTTPCCPolicyWithClusterId 使用集群ID查找CC策略
+func (this *NodeConfig) FindHTTPCCPolicyWithClusterId(clusterId int64) *HTTPCCPolicy {
+	httpCCPolicyLocker.RLock()
+	defer httpCCPolicyLocker.RUnlock()
+	if this.HTTPCCPolicies == nil {
+		return nil
+	}
+	return this.HTTPCCPolicies[clusterId]
+}
+
+// UpdateHTTPCCPolicies 修改集群CC策略
+func (this *NodeConfig) UpdateHTTPCCPolicies(policies map[int64]*HTTPCCPolicy) {
+	httpCCPolicyLocker.Lock()
+	defer httpCCPolicyLocker.Unlock()
+	this.HTTPCCPolicies = policies
+}
+
+// FindHTTP3PolicyWithClusterId 使用集群ID查找HTTP/3策略
+func (this *NodeConfig) FindHTTP3PolicyWithClusterId(clusterId int64) *HTTP3Policy {
+	http3PolicyLocker.RLock()
+	defer http3PolicyLocker.RUnlock()
+	if this.HTTP3Policies == nil {
+		return nil
+	}
+	return this.HTTP3Policies[clusterId]
+}
+
+// FindHTTP3Ports 查询HTTP/3所有端口
+func (this *NodeConfig) FindHTTP3Ports() (ports []int) {
+	http3PolicyLocker.RLock()
+	defer http3PolicyLocker.RUnlock()
+	for _, policy := range this.HTTP3Policies {
+		if !policy.IsOn {
+			continue
+		}
+		if policy.Port <= 0 {
+			policy.Port = DefaultHTTP3Port
+		}
+		if !lists.ContainsInt(ports, policy.Port) {
+			ports = append(ports, policy.Port)
+		}
+	}
+	return
+}
+
+// UpdateHTTP3Policies 修改集群HTTP/3策略
+func (this *NodeConfig) UpdateHTTP3Policies(policies map[int64]*HTTP3Policy) {
+	http3PolicyLocker.Lock()
+	defer http3PolicyLocker.Unlock()
+	this.HTTP3Policies = policies
+}
+
+// UpdateHTTPPagesPolicies 修改集群自定义页面策略
+func (this *NodeConfig) UpdateHTTPPagesPolicies(policies map[int64]*HTTPPagesPolicy) {
+	httpPagesPolicyLocker.Lock()
+	defer httpPagesPolicyLocker.Unlock()
+	this.HTTPPagesPolicies = policies
+}
+
+// FindHTTPPagesPolicyWithClusterId 使用集群ID查找自定义页面策略
+func (this *NodeConfig) FindHTTPPagesPolicyWithClusterId(clusterId int64) *HTTPPagesPolicy {
+	httpPagesPolicyLocker.RLock()
+	defer httpPagesPolicyLocker.RUnlock()
+	if this.HTTPPagesPolicies == nil {
+		return nil
+	}
+	return this.HTTPPagesPolicies[clusterId]
+}
+
 // SecretHash 对Id和Secret的Hash计算
 func (this *NodeConfig) SecretHash() string {
 	return this.secretHash

pkg/nodeconfigs/node_config_test.go

@@ -97,5 +97,24 @@ func TestNodeConfig_AddServer(t *testing.T) {
 	for _, s := range config.Servers {
 		t.Log(s.Id)
 	}
-
+}
+
+func TestCloneNodeConfig_UAMPolicies(t *testing.T) {
+	var config = &NodeConfig{}
+	config.UAMPolicies = map[int64]*UAMPolicy{}
+	t.Logf("%p", config.UAMPolicies)
+
+	clonedConfig, err := CloneNodeConfig(config)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("%p", clonedConfig.UAMPolicies)
+}
+
+func BenchmarkNodeConfig(b *testing.B) {
+	var config = &NodeConfig{}
+
+	for i := 0; i < b.N; i++ {
+		_, _ = CloneNodeConfig(config)
+	}
 }

pkg/nodeconfigs/node_status.go

@@ -24,8 +24,10 @@ type NodeStatus struct {
 	Load1m                float64 `json:"load1m"`
 	Load5m                float64 `json:"load5m"`
 	Load15m               float64 `json:"load15m"`
-	ConnectionCount       int     `json:"connectionCount"` // 连接数
-	ExePath               string  `json:"exePath"`         // 可执行文件路径
+	ConnectionCount       int     `json:"connectionCount"`   // 连接数
+	ExePath               string  `json:"exePath"`           // 可执行文件路径
+	APISuccessPercent     float64 `json:"apiSuccessPercent"` // API成功比例
+	APIAvgCostSeconds     float64 `json:"apiAvgCostSeconds"` // API平均耗时
 
 	TrafficInBytes  uint64 `json:"trafficInBytes"`
 	TrafficOutBytes uint64 `json:"trafficOutBytes"`

pkg/nodeconfigs/node_value_item.go

@@ -10,11 +10,14 @@ import (
 type NodeValueItem = string
 
 const (
-	NodeValueItemCPU            NodeValueItem = "cpu"            // CPU
-	NodeValueItemMemory         NodeValueItem = "memory"         // 内存
-	NodeValueItemLoad           NodeValueItem = "load"           // 负载
-	NodeValueItemTrafficIn      NodeValueItem = "trafficIn"      // 上行流量
-	NodeValueItemTrafficOut     NodeValueItem = "trafficOut"     // 下行流量
+	NodeValueItemCPU    NodeValueItem = "cpu"    // CPU
+	NodeValueItemMemory NodeValueItem = "memory" // 内存
+	NodeValueItemLoad   NodeValueItem = "load"   // 负载
+
+	NodeValueItemTrafficIn  NodeValueItem = "trafficIn"  // 业务上行流量
+	NodeValueItemTrafficOut NodeValueItem = "trafficOut" // 业务下行流量
+	NodeValueItemAllTraffic NodeValueItem = "allTraffic" // 所有流量
+
 	NodeValueItemConnections    NodeValueItem = "connections"    // 连接数
 	NodeValueItemRequests       NodeValueItem = "requests"       // 请求访问量
 	NodeValueItemAttackRequests NodeValueItem = "attackRequests" // 攻击请求访问量

pkg/nodeconfigs/ssh_params.go

@@ -0,0 +1,11 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package nodeconfigs
+
+func DefaultSSHParams() *SSHParams {
+	return &SSHParams{Port: 22}
+}
+
+type SSHParams struct {
+	Port int `json:"port"`
+}

pkg/nodeconfigs/uam_policy.go

@@ -1,26 +1,12 @@
-// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+//go:build !plus
 
 package nodeconfigs
 
-func init() {
-	_ = DefaultUAMPolicy.Init()
-}
-
-var DefaultUAMPolicy = &UAMPolicy{
-	IsOn:               true,
-	AllowSearchEngines: true,
-	DenySpiders:        true,
-	UITitle:            "",
-	UIBody:             "",
-}
+var DefaultUAMPolicy = &UAMPolicy{}
 
 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"`   // 页面内容
+	IsOn bool `yaml:"isOn" json:"isOn"`
 }
 
 func (this *UAMPolicy) Init() error {

pkg/nodeutils/aes_256.go

@@ -13,7 +13,7 @@ type AES256CFBMethod struct {
 
 func (this *AES256CFBMethod) Init(key, iv []byte) error {
 	// 判断key是否为32长度
-	l := len(key)
+	var l = len(key)
 	if l > 32 {
 		key = key[:32]
 	} else if l < 32 {
@@ -27,7 +27,7 @@ func (this *AES256CFBMethod) Init(key, iv []byte) error {
 	this.block = block
 
 	// 判断iv长度
-	l2 := len(iv)
+	var l2 = len(iv)
 	if l2 > aes.BlockSize {
 		iv = iv[:aes.BlockSize]
 	} else if l2 < aes.BlockSize {
@@ -49,7 +49,7 @@ func (this *AES256CFBMethod) Encrypt(src []byte) (dst []byte, err error) {
 
 	dst = make([]byte, len(src))
 
-	encrypter := cipher.NewCFBEncrypter(this.block, this.iv)
+	var encrypter = cipher.NewCFBEncrypter(this.block, this.iv)
 	encrypter.XORKeyStream(dst, src)
 
 	return
@@ -65,7 +65,7 @@ func (this *AES256CFBMethod) Decrypt(dst []byte) (src []byte, err error) {
 	}()
 
 	src = make([]byte, len(dst))
-	decrypter := cipher.NewCFBDecrypter(this.block, this.iv)
+	var decrypter = cipher.NewCFBDecrypter(this.block, this.iv)
 	decrypter.XORKeyStream(src, dst)
 
 	return

pkg/nodeutils/aes_utils.go

@@ -10,8 +10,8 @@ import (
 	"time"
 )
 
-// EncryptData 加密
-func EncryptData(nodeUniqueId string, nodeSecret string, data maps.Map, timeout int32) (string, error) {
+// EncryptMap 加密
+func EncryptMap(nodeUniqueId string, nodeSecret string, data maps.Map, timeout int32) (string, error) {
 	if data == nil {
 		data = maps.Map{}
 	}
@@ -42,8 +42,8 @@ func EncryptData(nodeUniqueId string, nodeSecret string, data maps.Map, timeout
 	return base64.StdEncoding.EncodeToString(result), nil
 }
 
-// DecryptData 解密
-func DecryptData(nodeUniqueId string, nodeSecret string, encodedString string) (maps.Map, error) {
+// DecryptMap 解密
+func DecryptMap(nodeUniqueId string, nodeSecret string, encodedString string) (maps.Map, error) {
 	var method = &AES256CFBMethod{}
 	err := method.Init([]byte(nodeUniqueId), []byte(nodeSecret))
 	if err != nil {
@@ -73,3 +73,42 @@ func DecryptData(nodeUniqueId string, nodeSecret string, encodedString string) (
 
 	return result.GetMap("data"), nil
 }
+
+// EncryptData 加密
+func EncryptData(nodeUniqueId string, nodeSecret string, data []byte) (string, error) {
+	if len(data) == 0 {
+		return "", nil
+	}
+
+	var method = &AES256CFBMethod{}
+	err := method.Init([]byte(nodeUniqueId), []byte(nodeSecret))
+	if err != nil {
+		return "", err
+	}
+	result, err := method.Encrypt(data)
+	if err != nil {
+		return "", err
+	}
+
+	return base64.StdEncoding.EncodeToString(result), nil
+}
+
+// DecryptData 解密
+func DecryptData(nodeUniqueId string, nodeSecret string, encodedString string) ([]byte, error) {
+	if len(encodedString) == 0 {
+		return nil, nil
+	}
+
+	var method = &AES256CFBMethod{}
+	err := method.Init([]byte(nodeUniqueId), []byte(nodeSecret))
+	if err != nil {
+		return nil, err
+	}
+
+	encodedData, err := base64.StdEncoding.DecodeString(encodedString)
+	if err != nil {
+		return nil, errors.New("base64 decode failed: " + err.Error())
+	}
+
+	return method.Decrypt(encodedData)
+}

pkg/nodeutils/aes_utils_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 )
 
-func TestEncryptData(t *testing.T) {
-	e, err := EncryptData("a", "b", maps.Map{
+func TestEncryptMap(t *testing.T) {
+	e, err := EncryptMap("a", "b", maps.Map{
 		"c": 1,
 	}, 5)
 	if err != nil {
@@ -16,16 +16,30 @@ func TestEncryptData(t *testing.T) {
 	}
 	t.Log("e:", e)
 
-	s, err := DecryptData("a", "b", e)
+	s, err := DecryptMap("a", "b", e)
 	if err != nil {
 		t.Fatal(err)
 	}
 	t.Log("s:", s)
 }
 
+func TestEncryptData(t *testing.T) {
+	encoded, err := EncryptData("a", "b", []byte("Hello, World"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("encoded:", encoded)
+
+	source, err := DecryptData("a", "b", encoded)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("source:", string(source))
+}
+
 func BenchmarkEncryptData(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		_, _ = EncryptData("a", "b", maps.Map{
+		_, _ = EncryptMap("a", "b", maps.Map{
 			"c": 1,
 		}, 5)
 	}

pkg/rpc/dao/rpc_client.go

@@ -12,7 +12,6 @@ type RPCClient interface {
 	SysSettingRPC() pb.SysSettingServiceClient
 	NodeClusterRPC() pb.NodeClusterServiceClient
 	NodeRegionRPC() pb.NodeRegionServiceClient
-	NodePriceItemRPC() pb.NodePriceItemServiceClient
 	ServerRPC() pb.ServerServiceClient
 	ServerGroupRPC() pb.ServerGroupServiceClient
 	OriginRPC() pb.OriginServiceClient
@@ -46,6 +45,4 @@ type RPCClient interface {
 	ACMEUserRPC() pb.ACMEUserServiceClient
 	ACMETaskRPC() pb.ACMETaskServiceClient
 	UserRPC() pb.UserServiceClient
-	UserBillRPC() pb.UserBillServiceClient
-	UserNodeRPC() pb.UserNodeServiceClient
 }

pkg/rpc/jsons/hsts.md

@@ -0,0 +1,39 @@
+# HSTS
+
+## 定义
+~~~json
+{
+  "isOn": "是否启用",
+  "maxAge": "最大有效期，单位秒",
+  "includeSubDomains": "可选项，是否包含子域名",
+  "preload": "可选项，是否预加载",
+  "domains": ["可选项，支持的域名1", "可选项，支持的域名2" ...]
+}
+~~~
+
+其中：
+* `maxAge` 可以填写一天（86400秒）或者更长时间
+* 如果不填写 `domains` 则支持所有域名
+
+## 示例
+### 不限制任何域名
+~~~json
+{
+  "isOn": true,
+  "maxAge": 86400,
+  "includeSubDomains":false, 
+  "preload":false,
+  "domains":[]
+}
+~~~
+
+### 限制域名
+~~~json
+{
+  "isOn": true,
+  "maxAge": 86400,
+  "includeSubDomains":false, 
+  "preload":false,
+  "domains":["example.com", "www.example.com"]
+}
+~~~

pkg/rpc/jsons/http_cache_config.md

@@ -69,7 +69,7 @@
               {
                 "type": "url-extension",
                 "isRequest": true,
-                "param": "${requestPathExtension}",
+                "param": "${requestPathLowerExtension}",
                 "operator": "in",
                 "value": "[\".css\",\".png\",\".js\",\".woff2\"]",
                 "isReverse": false,

pkg/rpc/jsons/http_cache_ref.md

@@ -71,7 +71,7 @@
 					{
 						"type": "url-extension",
 						"isRequest": true,
-						"param": "${requestPathExtension}",
+						"param": "${requestPathLowerExtension}",
 						"operator": "in",
 						"value": "[\".css\",\".png\",\".js\",\".woff2\"]",
 						"isReverse": false,

pkg/rpc/jsons/http_protocol.md

@@ -0,0 +1,49 @@
+# HTTP协议配置
+
+## 定义
+~~~json
+{
+	"isOn": "是否启用",
+  	"listen": [
+      {
+		"protocol": "协议",
+		"host": "主机地址，通常为空",
+		"portRange": "端口或者端口范围"
+	  },
+	  ...
+	]
+}
+~~~
+
+## 示例
+
+### 监听80端口
+~~~json
+{
+  "isOn": true,
+  "listen": [
+    {
+      "protocol": "http",
+      "host": "",
+      "portRange": "80"
+	}
+  ]
+}
+~~~
+
+### 监听80和8080端口
+~~~json
+{
+  "isOn": true,
+  "listen": [
+    {
+      "protocol": "http",
+      "portRange": "80"
+	},
+    {
+      "protocol": "http",
+      "portRange": "8080"
+	}
+  ]
+}
+~~~

pkg/rpc/jsons/https_protocol.md

@@ -0,0 +1,67 @@
+# HTTPS协议配置
+
+## 定义
+~~~json
+{
+	"isOn": "是否启用",
+  	"listen": [
+      {
+		"protocol": "协议",
+		"host": "主机地址，通常为空",
+		"portRange": "端口或者端口范围"
+	  },
+	  ...
+	],
+  	"sslPolicyRef": {
+	  "isOn": "启用SSL策略",
+	  "sslPolicyId": "SSL策略ID"
+	}
+}
+~~~
+
+其中 `SSL策略ID` 通过 `/SSLPolicyService/createSSLPolicy` 接口创建。
+
+## 示例
+
+### 监听443端口
+~~~json
+{
+  "isOn": true,
+  "listen": [
+    {
+      "protocol": "https",
+      "host": "",
+      "portRange": "443"
+	}
+  ],
+  "sslPolicyRef": {
+    "isOn": true,
+    "sslPolicyId": 123
+  }
+}
+~~~
+
+其中SSL策略ID `123` 通过 `/SSLPolicyService/createSSLPolicy` 接口创建。
+
+### 监听443和8443端口
+~~~json
+{
+  "isOn": true,
+  "listen": [
+    {
+      "protocol": "https",
+      "portRange": "443"
+	},
+    {
+      "protocol": "https",
+      "portRange": "8443"
+	}
+  ],
+  "sslPolicyRef": {
+    "isOn": true,
+    "sslPolicyId": 123
+  }
+}
+~~~
+
+其中SSL策略ID `123` 通过 `/SSLPolicyService/createSSLPolicy` 接口创建。

pkg/rpc/jsons/origin_refs.md

@@ -0,0 +1,33 @@
+# 源站引用列表
+
+## 定义
+~~~json
+[
+  {
+	"isOn": "是否启用",
+	"originId": "源站ID 1"
+  },
+  {
+    "isOn": "是否启用",
+    "originId": "源站ID 2"
+  },
+  ...
+]
+~~~
+
+其中：
+* `originId` - 源站ID，可以通过 `/OriginService/createOrigin` 接口创建源站后获得
+
+## 示例
+~~~json
+[
+  {
+	"isOn": true,
+	"originId": 1
+  },
+  {
+    "isOn": true,
+    "originId": 2,
+  }
+]
+~~~

pkg/rpc/jsons/reverse_proxy_ref.md

@@ -0,0 +1,19 @@
+# 反向代理引用
+## 定义
+~~~json
+{
+  "isOn": "是否启用",
+  "isPrior": "是否覆盖上级配置，用于路由规则",
+  "reverseProxyId": "反向代理ID"
+}
+~~~
+其中：
+* `reverseProxyId` - 反向代理ID，可以通过 `/ReverseProxyService/createReverseProxy` 创建
+
+## 示例
+~~~json
+{
+  "isOn": true,
+  "reverseProxyId": 123
+}
+~~~

pkg/rpc/jsons/scheduling.md

@@ -0,0 +1,27 @@
+# 反向代理调度
+## 定义
+~~~json
+{
+	"code": "调度方法代号",
+    "options": "调度选项"
+}
+~~~
+
+其中：
+* `code` 调度方法代号
+  * `random` - 随机
+  * `roundRobin` - 轮询
+  * `hash` - Hash算法
+    * `key` - 自定义Key，可以使用请求变量，比如 `${remoteAddr}`
+  * `sticky` - Sticky算法
+    * `type` - 类型：cookie、header、argument
+    * `param` - 参数值
+
+
+## 示例
+~~~json
+{
+  "code": "random",
+  "options": null
+}
+~~~

pkg/rpc/jsons/ssl_cert_refs.md

@@ -1,7 +1,24 @@
 # SSL证书引用
 
-## 示例
+可以用来引用一组证书。
+
+## 定义
+~~~json
+[
+  {
+	"isOn": "是否启用",
+	"certId": "证书ID 1"
+  },
+  {
+    "isOn": "是否启用",
+    "certId": "证书ID 2"
+  },
+  ...
+]
 ~~~
+
+## 示例
+~~~json
 [
   {
     "isOn": true,

pkg/rpc/jsons/tcp_protocol.md

@@ -0,0 +1,63 @@
+# TCP协议配置
+
+## 定义
+~~~json
+{
+	"isOn": "是否启用",
+  	"listen": [
+      {
+		"protocol": "协议",
+		"host": "主机地址，通常为空",
+		"portRange": "端口或者端口范围"
+	  },
+	  ...
+	]
+}
+~~~
+
+## 示例
+
+### 监听1234端口
+~~~json
+{
+  "isOn": true,
+  "listen": [
+    {
+      "protocol": "tcp",
+      "host": "",
+      "portRange": "1234"
+	}
+  ]
+}
+~~~
+
+### 监听1234和2345端口
+~~~json
+{
+  "isOn": true,
+  "listen": [
+    {
+      "protocol": "tcp",
+      "portRange": "1234"
+	},
+    {
+      "protocol": "tcp",
+      "portRange": "2345"
+	}
+  ]
+}
+~~~
+
+### 监听1234到1240之间的所有端口
+~~~json
+{
+  "isOn": true,
+  "listen": [
+    {
+      "protocol": "tcp",
+      "host": "",
+      "portRange": "1234-1240"
+	}
+  ]
+}
+~~~

pkg/rpc/jsons/tls_protocol.md

@@ -0,0 +1,68 @@
+# TLS协议配置
+
+## 定义
+~~~json
+{
+	"isOn": "是否启用",
+  	"listen": [
+      {
+		"protocol": "协议",
+		"host": "主机地址，通常为空",
+		"portRange": "端口或者端口范围"
+	  },
+	  ...
+	],
+  	"sslPolicyRef": {
+	  "isOn": "启用SSL策略",
+	  "sslPolicyId": "SSL策略ID"
+	}
+}
+~~~
+
+其中 `SSL策略ID` 通过 `/SSLPolicyService/createSSLPolicy` 接口创建。
+
+## 示例
+
+### 监听8443端口
+~~~json
+{
+  "isOn": true,
+  "listen": [
+    {
+      "protocol": "tls",
+      "host": "",
+      "portRange": "8443"
+	}
+  ],
+  "sslPolicyRef": {
+    "isOn": true,
+    "sslPolicyId": 123
+  }
+}
+~~~
+
+其中SSL策略ID `123` 通过 `/SSLPolicyService/createSSLPolicy` 接口创建。
+
+### 监听8443和8543端口
+~~~json
+{
+  "isOn": true,
+  "listen": [
+    {
+      "protocol": "tls",
+      "portRange": "8443"
+	},
+    {
+      "protocol": "tls",
+      "portRange": "8543"
+	}
+  ],
+  "sslPolicyRef": {
+    "isOn": true,
+    "sslPolicyId": 123
+  }
+}
+~~~
+
+其中SSL策略ID `123` 通过 `/SSLPolicyService/createSSLPolicy` 接口创建。
+

pkg/rpc/jsons/udp_protocol.md

@@ -0,0 +1,63 @@
+# UDP协议配置
+
+## 定义
+~~~json
+{
+	"isOn": "是否启用",
+  	"listen": [
+      {
+		"protocol": "协议",
+		"host": "主机地址，通常为空",
+		"portRange": "端口或者端口范围"
+	  },
+	  ...
+	]
+}
+~~~
+
+## 示例
+
+### 监听1234端口
+~~~json
+{
+  "isOn": true,
+  "listen": [
+    {
+      "protocol": "udp",
+      "host": "",
+      "portRange": "1234"
+	}
+  ]
+}
+~~~
+
+### 监听1234和2345端口
+~~~json
+{
+  "isOn": true,
+  "listen": [
+    {
+      "protocol": "udp",
+      "portRange": "1234"
+	},
+    {
+      "protocol": "udp",
+      "portRange": "2345"
+	}
+  ]
+}
+~~~
+
+### 监听1234到1240之间的所有端口
+~~~json
+{
+  "isOn": true,
+  "listen": [
+    {
+      "protocol": "udp",
+      "host": "",
+      "portRange": "1234-1240"
+	}
+  ]
+}
+~~~

pkg/rpc/pb/model_ad_network.pb.go

@@ -0,0 +1,176 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_ad_network.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 ADNetwork struct {
+	state         protoimpl.MessageState
+	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"`
+	Name        string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
+}
+
+func (x *ADNetwork) Reset() {
+	*x = ADNetwork{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_ad_network_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ADNetwork) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ADNetwork) ProtoMessage() {}
+
+func (x *ADNetwork) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_ad_network_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 ADNetwork.ProtoReflect.Descriptor instead.
+func (*ADNetwork) Descriptor() ([]byte, []int) {
+	return file_models_model_ad_network_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ADNetwork) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *ADNetwork) GetIsOn() bool {
+	if x != nil {
+		return x.IsOn
+	}
+	return false
+}
+
+func (x *ADNetwork) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *ADNetwork) GetDescription() string {
+	if x != nil {
+		return x.Description
+	}
+	return ""
+}
+
+var File_models_model_ad_network_proto protoreflect.FileDescriptor
+
+var file_models_model_ad_network_proto_rawDesc = []byte{
+	0x0a, 0x1d, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x61,
+	0x64, 0x5f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
+	0x02, 0x70, 0x62, 0x22, 0x65, 0x0a, 0x09, 0x41, 0x44, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b,
+	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, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_ad_network_proto_rawDescOnce sync.Once
+	file_models_model_ad_network_proto_rawDescData = file_models_model_ad_network_proto_rawDesc
+)
+
+func file_models_model_ad_network_proto_rawDescGZIP() []byte {
+	file_models_model_ad_network_proto_rawDescOnce.Do(func() {
+		file_models_model_ad_network_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_ad_network_proto_rawDescData)
+	})
+	return file_models_model_ad_network_proto_rawDescData
+}
+
+var file_models_model_ad_network_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_ad_network_proto_goTypes = []interface{}{
+	(*ADNetwork)(nil), // 0: pb.ADNetwork
+}
+var file_models_model_ad_network_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_ad_network_proto_init() }
+func file_models_model_ad_network_proto_init() {
+	if File_models_model_ad_network_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_ad_network_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ADNetwork); 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_ad_network_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_ad_network_proto_goTypes,
+		DependencyIndexes: file_models_model_ad_network_proto_depIdxs,
+		MessageInfos:      file_models_model_ad_network_proto_msgTypes,
+	}.Build()
+	File_models_model_ad_network_proto = out.File
+	file_models_model_ad_network_proto_rawDesc = nil
+	file_models_model_ad_network_proto_goTypes = nil
+	file_models_model_ad_network_proto_depIdxs = nil
+}

pkg/rpc/pb/model_ad_package.pb.go

@@ -0,0 +1,250 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_ad_package.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 ADPackage struct {
+	state         protoimpl.MessageState
+	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"`
+	AdNetworkId                 int64      `protobuf:"varint,3,opt,name=adNetworkId,proto3" json:"adNetworkId,omitempty"`
+	ProtectionBandwidthSize     int32      `protobuf:"varint,4,opt,name=protectionBandwidthSize,proto3" json:"protectionBandwidthSize,omitempty"`
+	ProtectionBandwidthUnit     string     `protobuf:"bytes,5,opt,name=protectionBandwidthUnit,proto3" json:"protectionBandwidthUnit,omitempty"`
+	ServerBandwidthSize         int32      `protobuf:"varint,6,opt,name=serverBandwidthSize,proto3" json:"serverBandwidthSize,omitempty"`
+	ServerBandwidthUnit         string     `protobuf:"bytes,7,opt,name=serverBandwidthUnit,proto3" json:"serverBandwidthUnit,omitempty"`
+	AdNetwork                   *ADNetwork `protobuf:"bytes,30,opt,name=adNetwork,proto3" json:"adNetwork,omitempty"`
+	Summary                     string     `protobuf:"bytes,31,opt,name=summary,proto3" json:"summary,omitempty"`                                          // 概述
+	CountIdleADPackageInstances int64      `protobuf:"varint,32,opt,name=countIdleADPackageInstances,proto3" json:"countIdleADPackageInstances,omitempty"` // 剩余可用的实例数，只有在获取可用高防产品的时候才会返回
+}
+
+func (x *ADPackage) Reset() {
+	*x = ADPackage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_ad_package_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ADPackage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ADPackage) ProtoMessage() {}
+
+func (x *ADPackage) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_ad_package_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 ADPackage.ProtoReflect.Descriptor instead.
+func (*ADPackage) Descriptor() ([]byte, []int) {
+	return file_models_model_ad_package_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ADPackage) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *ADPackage) GetIsOn() bool {
+	if x != nil {
+		return x.IsOn
+	}
+	return false
+}
+
+func (x *ADPackage) GetAdNetworkId() int64 {
+	if x != nil {
+		return x.AdNetworkId
+	}
+	return 0
+}
+
+func (x *ADPackage) GetProtectionBandwidthSize() int32 {
+	if x != nil {
+		return x.ProtectionBandwidthSize
+	}
+	return 0
+}
+
+func (x *ADPackage) GetProtectionBandwidthUnit() string {
+	if x != nil {
+		return x.ProtectionBandwidthUnit
+	}
+	return ""
+}
+
+func (x *ADPackage) GetServerBandwidthSize() int32 {
+	if x != nil {
+		return x.ServerBandwidthSize
+	}
+	return 0
+}
+
+func (x *ADPackage) GetServerBandwidthUnit() string {
+	if x != nil {
+		return x.ServerBandwidthUnit
+	}
+	return ""
+}
+
+func (x *ADPackage) GetAdNetwork() *ADNetwork {
+	if x != nil {
+		return x.AdNetwork
+	}
+	return nil
+}
+
+func (x *ADPackage) GetSummary() string {
+	if x != nil {
+		return x.Summary
+	}
+	return ""
+}
+
+func (x *ADPackage) GetCountIdleADPackageInstances() int64 {
+	if x != nil {
+		return x.CountIdleADPackageInstances
+	}
+	return 0
+}
+
+var File_models_model_ad_package_proto protoreflect.FileDescriptor
+
+var file_models_model_ad_package_proto_rawDesc = []byte{
+	0x0a, 0x1d, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x61,
+	0x64, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
+	0x02, 0x70, 0x62, 0x1a, 0x1d, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65,
+	0x6c, 0x5f, 0x61, 0x64, 0x5f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x22, 0xb2, 0x03, 0x0a, 0x09, 0x41, 0x44, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 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, 0x20, 0x0a, 0x0b, 0x61, 0x64, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72,
+	0x6b, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x61, 0x64, 0x4e, 0x65, 0x74,
+	0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x17, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x53, 0x69, 0x7a,
+	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x17, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x53, 0x69, 0x7a, 0x65,
+	0x12, 0x38, 0x0a, 0x17, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x61,
+	0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x17, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x61, 0x6e,
+	0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x30, 0x0a, 0x13, 0x73, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x53, 0x69, 0x7a,
+	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x13, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x42,
+	0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x30, 0x0a, 0x13,
+	0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x55,
+	0x6e, 0x69, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x73, 0x65, 0x72, 0x76, 0x65,
+	0x72, 0x42, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x2b,
+	0x0a, 0x09, 0x61, 0x64, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x1e, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x44, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b,
+	0x52, 0x09, 0x61, 0x64, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x73,
+	0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75,
+	0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x40, 0x0a, 0x1b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64,
+	0x6c, 0x65, 0x41, 0x44, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x63, 0x65, 0x73, 0x18, 0x20, 0x20, 0x01, 0x28, 0x03, 0x52, 0x1b, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x49, 0x64, 0x6c, 0x65, 0x41, 0x44, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x49, 0x6e,
+	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_ad_package_proto_rawDescOnce sync.Once
+	file_models_model_ad_package_proto_rawDescData = file_models_model_ad_package_proto_rawDesc
+)
+
+func file_models_model_ad_package_proto_rawDescGZIP() []byte {
+	file_models_model_ad_package_proto_rawDescOnce.Do(func() {
+		file_models_model_ad_package_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_ad_package_proto_rawDescData)
+	})
+	return file_models_model_ad_package_proto_rawDescData
+}
+
+var file_models_model_ad_package_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_ad_package_proto_goTypes = []interface{}{
+	(*ADPackage)(nil), // 0: pb.ADPackage
+	(*ADNetwork)(nil), // 1: pb.ADNetwork
+}
+var file_models_model_ad_package_proto_depIdxs = []int32{
+	1, // 0: pb.ADPackage.adNetwork:type_name -> pb.ADNetwork
+	1, // [1:1] is the sub-list for method output_type
+	1, // [1:1] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
+}
+
+func init() { file_models_model_ad_package_proto_init() }
+func file_models_model_ad_package_proto_init() {
+	if File_models_model_ad_package_proto != nil {
+		return
+	}
+	file_models_model_ad_network_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_ad_package_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ADPackage); 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_ad_package_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_ad_package_proto_goTypes,
+		DependencyIndexes: file_models_model_ad_package_proto_depIdxs,
+		MessageInfos:      file_models_model_ad_package_proto_msgTypes,
+	}.Build()
+	File_models_model_ad_package_proto = out.File
+	file_models_model_ad_package_proto_rawDesc = nil
+	file_models_model_ad_package_proto_goTypes = nil
+	file_models_model_ad_package_proto_depIdxs = nil
+}

pkg/rpc/pb/model_ad_package_instance.pb.go

@@ -0,0 +1,274 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_ad_package_instance.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 ADPackageInstance struct {
+	state         protoimpl.MessageState
+	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"`
+	AdPackageId    int64        `protobuf:"varint,3,opt,name=adPackageId,proto3" json:"adPackageId,omitempty"`
+	NodeClusterId  int64        `protobuf:"varint,4,opt,name=nodeClusterId,proto3" json:"nodeClusterId,omitempty"`
+	NodeIds        []int64      `protobuf:"varint,5,rep,packed,name=nodeIds,proto3" json:"nodeIds,omitempty"`
+	IpAddresses    []string     `protobuf:"bytes,6,rep,name=ipAddresses,proto3" json:"ipAddresses,omitempty"`
+	UserId         int64        `protobuf:"varint,7,opt,name=userId,proto3" json:"userId,omitempty"`                 // 租用用户ID
+	UserDayTo      string       `protobuf:"bytes,8,opt,name=userDayTo,proto3" json:"userDayTo,omitempty"`            // 租用日期
+	UserInstanceId int64        `protobuf:"varint,9,opt,name=userInstanceId,proto3" json:"userInstanceId,omitempty"` // 当前绑定的用户实例ID
+	NodeCluster    *NodeCluster `protobuf:"bytes,30,opt,name=nodeCluster,proto3" json:"nodeCluster,omitempty"`
+	AdPackage      *ADPackage   `protobuf:"bytes,31,opt,name=adPackage,proto3" json:"adPackage,omitempty"`
+	User           *User        `protobuf:"bytes,32,opt,name=user,proto3" json:"user,omitempty"`
+}
+
+func (x *ADPackageInstance) Reset() {
+	*x = ADPackageInstance{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_ad_package_instance_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ADPackageInstance) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ADPackageInstance) ProtoMessage() {}
+
+func (x *ADPackageInstance) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_ad_package_instance_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 ADPackageInstance.ProtoReflect.Descriptor instead.
+func (*ADPackageInstance) Descriptor() ([]byte, []int) {
+	return file_models_model_ad_package_instance_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ADPackageInstance) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *ADPackageInstance) GetIsOn() bool {
+	if x != nil {
+		return x.IsOn
+	}
+	return false
+}
+
+func (x *ADPackageInstance) GetAdPackageId() int64 {
+	if x != nil {
+		return x.AdPackageId
+	}
+	return 0
+}
+
+func (x *ADPackageInstance) GetNodeClusterId() int64 {
+	if x != nil {
+		return x.NodeClusterId
+	}
+	return 0
+}
+
+func (x *ADPackageInstance) GetNodeIds() []int64 {
+	if x != nil {
+		return x.NodeIds
+	}
+	return nil
+}
+
+func (x *ADPackageInstance) GetIpAddresses() []string {
+	if x != nil {
+		return x.IpAddresses
+	}
+	return nil
+}
+
+func (x *ADPackageInstance) GetUserId() int64 {
+	if x != nil {
+		return x.UserId
+	}
+	return 0
+}
+
+func (x *ADPackageInstance) GetUserDayTo() string {
+	if x != nil {
+		return x.UserDayTo
+	}
+	return ""
+}
+
+func (x *ADPackageInstance) GetUserInstanceId() int64 {
+	if x != nil {
+		return x.UserInstanceId
+	}
+	return 0
+}
+
+func (x *ADPackageInstance) GetNodeCluster() *NodeCluster {
+	if x != nil {
+		return x.NodeCluster
+	}
+	return nil
+}
+
+func (x *ADPackageInstance) GetAdPackage() *ADPackage {
+	if x != nil {
+		return x.AdPackage
+	}
+	return nil
+}
+
+func (x *ADPackageInstance) GetUser() *User {
+	if x != nil {
+		return x.User
+	}
+	return nil
+}
+
+var File_models_model_ad_package_instance_proto protoreflect.FileDescriptor
+
+var file_models_model_ad_package_instance_proto_rawDesc = []byte{
+	0x0a, 0x26, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x61,
+	0x64, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 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, 0x1a, 0x1d, 0x6d,
+	0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x61, 0x64, 0x5f, 0x70,
+	0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 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, 0x22, 0x97, 0x03, 0x0a, 0x11, 0x41, 0x44, 0x50, 0x61, 0x63, 0x6b,
+	0x61, 0x67, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 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,
+	0x20, 0x0a, 0x0b, 0x61, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x61, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x49,
+	0x64, 0x12, 0x24, 0x0a, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6e, 0x6f, 0x64, 0x65, 0x49,
+	0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x03, 0x52, 0x07, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64,
+	0x73, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73,
+	0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x75,
+	0x73, 0x65, 0x72, 0x44, 0x61, 0x79, 0x54, 0x6f, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x75, 0x73, 0x65, 0x72, 0x44, 0x61, 0x79, 0x54, 0x6f, 0x12, 0x26, 0x0a, 0x0e, 0x75, 0x73, 0x65,
+	0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x0e, 0x75, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49,
+	0x64, 0x12, 0x31, 0x0a, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x09, 0x61, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67,
+	0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x41, 0x44, 0x50,
+	0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x52, 0x09, 0x61, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67,
+	0x65, 0x12, 0x1c, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x20, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x08, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_ad_package_instance_proto_rawDescOnce sync.Once
+	file_models_model_ad_package_instance_proto_rawDescData = file_models_model_ad_package_instance_proto_rawDesc
+)
+
+func file_models_model_ad_package_instance_proto_rawDescGZIP() []byte {
+	file_models_model_ad_package_instance_proto_rawDescOnce.Do(func() {
+		file_models_model_ad_package_instance_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_ad_package_instance_proto_rawDescData)
+	})
+	return file_models_model_ad_package_instance_proto_rawDescData
+}
+
+var file_models_model_ad_package_instance_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_ad_package_instance_proto_goTypes = []interface{}{
+	(*ADPackageInstance)(nil), // 0: pb.ADPackageInstance
+	(*NodeCluster)(nil),       // 1: pb.NodeCluster
+	(*ADPackage)(nil),         // 2: pb.ADPackage
+	(*User)(nil),              // 3: pb.User
+}
+var file_models_model_ad_package_instance_proto_depIdxs = []int32{
+	1, // 0: pb.ADPackageInstance.nodeCluster:type_name -> pb.NodeCluster
+	2, // 1: pb.ADPackageInstance.adPackage:type_name -> pb.ADPackage
+	3, // 2: pb.ADPackageInstance.user:type_name -> pb.User
+	3, // [3:3] is the sub-list for method output_type
+	3, // [3:3] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
+}
+
+func init() { file_models_model_ad_package_instance_proto_init() }
+func file_models_model_ad_package_instance_proto_init() {
+	if File_models_model_ad_package_instance_proto != nil {
+		return
+	}
+	file_models_model_node_cluster_proto_init()
+	file_models_model_ad_package_proto_init()
+	file_models_model_user_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_ad_package_instance_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ADPackageInstance); 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_ad_package_instance_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_ad_package_instance_proto_goTypes,
+		DependencyIndexes: file_models_model_ad_package_instance_proto_depIdxs,
+		MessageInfos:      file_models_model_ad_package_instance_proto_msgTypes,
+	}.Build()
+	File_models_model_ad_package_instance_proto = out.File
+	file_models_model_ad_package_instance_proto_rawDesc = nil
+	file_models_model_ad_package_instance_proto_goTypes = nil
+	file_models_model_ad_package_instance_proto_depIdxs = nil
+}

pkg/rpc/pb/model_ad_package_period.pb.go

@@ -0,0 +1,186 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_ad_package_period.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 ADPackagePeriod struct {
+	state         protoimpl.MessageState
+	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"`
+	Count  int32  `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"`
+	Unit   string `protobuf:"bytes,4,opt,name=unit,proto3" json:"unit,omitempty"`
+	Months int32  `protobuf:"varint,5,opt,name=months,proto3" json:"months,omitempty"`
+}
+
+func (x *ADPackagePeriod) Reset() {
+	*x = ADPackagePeriod{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_ad_package_period_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ADPackagePeriod) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ADPackagePeriod) ProtoMessage() {}
+
+func (x *ADPackagePeriod) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_ad_package_period_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 ADPackagePeriod.ProtoReflect.Descriptor instead.
+func (*ADPackagePeriod) Descriptor() ([]byte, []int) {
+	return file_models_model_ad_package_period_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ADPackagePeriod) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *ADPackagePeriod) GetIsOn() bool {
+	if x != nil {
+		return x.IsOn
+	}
+	return false
+}
+
+func (x *ADPackagePeriod) GetCount() int32 {
+	if x != nil {
+		return x.Count
+	}
+	return 0
+}
+
+func (x *ADPackagePeriod) GetUnit() string {
+	if x != nil {
+		return x.Unit
+	}
+	return ""
+}
+
+func (x *ADPackagePeriod) GetMonths() int32 {
+	if x != nil {
+		return x.Months
+	}
+	return 0
+}
+
+var File_models_model_ad_package_period_proto protoreflect.FileDescriptor
+
+var file_models_model_ad_package_period_proto_rawDesc = []byte{
+	0x0a, 0x24, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x61,
+	0x64, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x77, 0x0a, 0x0f, 0x41, 0x44,
+	0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 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, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6d,
+	0x6f, 0x6e, 0x74, 0x68, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6d, 0x6f, 0x6e,
+	0x74, 0x68, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_ad_package_period_proto_rawDescOnce sync.Once
+	file_models_model_ad_package_period_proto_rawDescData = file_models_model_ad_package_period_proto_rawDesc
+)
+
+func file_models_model_ad_package_period_proto_rawDescGZIP() []byte {
+	file_models_model_ad_package_period_proto_rawDescOnce.Do(func() {
+		file_models_model_ad_package_period_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_ad_package_period_proto_rawDescData)
+	})
+	return file_models_model_ad_package_period_proto_rawDescData
+}
+
+var file_models_model_ad_package_period_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_ad_package_period_proto_goTypes = []interface{}{
+	(*ADPackagePeriod)(nil), // 0: pb.ADPackagePeriod
+}
+var file_models_model_ad_package_period_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_ad_package_period_proto_init() }
+func file_models_model_ad_package_period_proto_init() {
+	if File_models_model_ad_package_period_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_ad_package_period_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ADPackagePeriod); 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_ad_package_period_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_ad_package_period_proto_goTypes,
+		DependencyIndexes: file_models_model_ad_package_period_proto_depIdxs,
+		MessageInfos:      file_models_model_ad_package_period_proto_msgTypes,
+	}.Build()
+	File_models_model_ad_package_period_proto = out.File
+	file_models_model_ad_package_period_proto_rawDesc = nil
+	file_models_model_ad_package_period_proto_goTypes = nil
+	file_models_model_ad_package_period_proto_depIdxs = nil
+}

pkg/rpc/pb/model_ad_package_price.pb.go

@@ -0,0 +1,170 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_ad_package_price.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 ADPackagePrice struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	AdPackageId       int64   `protobuf:"varint,1,opt,name=adPackageId,proto3" json:"adPackageId,omitempty"`
+	AdPackagePeriodId int64   `protobuf:"varint,2,opt,name=adPackagePeriodId,proto3" json:"adPackagePeriodId,omitempty"`
+	Price             float64 `protobuf:"fixed64,3,opt,name=price,proto3" json:"price,omitempty"`
+}
+
+func (x *ADPackagePrice) Reset() {
+	*x = ADPackagePrice{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_ad_package_price_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ADPackagePrice) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ADPackagePrice) ProtoMessage() {}
+
+func (x *ADPackagePrice) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_ad_package_price_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 ADPackagePrice.ProtoReflect.Descriptor instead.
+func (*ADPackagePrice) Descriptor() ([]byte, []int) {
+	return file_models_model_ad_package_price_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ADPackagePrice) GetAdPackageId() int64 {
+	if x != nil {
+		return x.AdPackageId
+	}
+	return 0
+}
+
+func (x *ADPackagePrice) GetAdPackagePeriodId() int64 {
+	if x != nil {
+		return x.AdPackagePeriodId
+	}
+	return 0
+}
+
+func (x *ADPackagePrice) GetPrice() float64 {
+	if x != nil {
+		return x.Price
+	}
+	return 0
+}
+
+var File_models_model_ad_package_price_proto protoreflect.FileDescriptor
+
+var file_models_model_ad_package_price_proto_rawDesc = []byte{
+	0x0a, 0x23, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x61,
+	0x64, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x76, 0x0a, 0x0e, 0x41, 0x44, 0x50,
+	0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x61,
+	0x64, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x0b, 0x61, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x2c, 0x0a,
+	0x11, 0x61, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64,
+	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x61, 0x64, 0x50, 0x61, 0x63, 0x6b,
+	0x61, 0x67, 0x65, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70,
+	0x72, 0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63,
+	0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
+}
+
+var (
+	file_models_model_ad_package_price_proto_rawDescOnce sync.Once
+	file_models_model_ad_package_price_proto_rawDescData = file_models_model_ad_package_price_proto_rawDesc
+)
+
+func file_models_model_ad_package_price_proto_rawDescGZIP() []byte {
+	file_models_model_ad_package_price_proto_rawDescOnce.Do(func() {
+		file_models_model_ad_package_price_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_ad_package_price_proto_rawDescData)
+	})
+	return file_models_model_ad_package_price_proto_rawDescData
+}
+
+var file_models_model_ad_package_price_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_ad_package_price_proto_goTypes = []interface{}{
+	(*ADPackagePrice)(nil), // 0: pb.ADPackagePrice
+}
+var file_models_model_ad_package_price_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_ad_package_price_proto_init() }
+func file_models_model_ad_package_price_proto_init() {
+	if File_models_model_ad_package_price_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_ad_package_price_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ADPackagePrice); 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_ad_package_price_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_ad_package_price_proto_goTypes,
+		DependencyIndexes: file_models_model_ad_package_price_proto_depIdxs,
+		MessageInfos:      file_models_model_ad_package_price_proto_msgTypes,
+	}.Build()
+	File_models_model_ad_package_price_proto = out.File
+	file_models_model_ad_package_price_proto_rawDesc = nil
+	file_models_model_ad_package_price_proto_goTypes = nil
+	file_models_model_ad_package_price_proto_depIdxs = nil
+}

pkg/rpc/pb/model_admin.pb.go

@@ -30,15 +30,16 @@ type Admin struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id        int64          `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	Fullname  string         `protobuf:"bytes,2,opt,name=fullname,proto3" json:"fullname,omitempty"`
-	Username  string         `protobuf:"bytes,3,opt,name=username,proto3" json:"username,omitempty"`
-	IsOn      bool           `protobuf:"varint,4,opt,name=isOn,proto3" json:"isOn,omitempty"`
-	IsSuper   bool           `protobuf:"varint,5,opt,name=isSuper,proto3" json:"isSuper,omitempty"`
-	CreatedAt int64          `protobuf:"varint,6,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
-	Modules   []*AdminModule `protobuf:"bytes,7,rep,name=Modules,proto3" json:"Modules,omitempty"`
-	OtpLogin  *Login         `protobuf:"bytes,8,opt,name=otpLogin,proto3" json:"otpLogin,omitempty"`  // OTP认证
-	CanLogin  bool           `protobuf:"varint,9,opt,name=canLogin,proto3" json:"canLogin,omitempty"` // 是否可以登录
+	Id              int64          `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`                            // ID
+	Fullname        string         `protobuf:"bytes,2,opt,name=fullname,proto3" json:"fullname,omitempty"`                 // 全称
+	Username        string         `protobuf:"bytes,3,opt,name=username,proto3" json:"username,omitempty"`                 // 用户名
+	IsOn            bool           `protobuf:"varint,4,opt,name=isOn,proto3" json:"isOn,omitempty"`                        // 是否启用
+	IsSuper         bool           `protobuf:"varint,5,opt,name=isSuper,proto3" json:"isSuper,omitempty"`                  // 是否为超级用户
+	CreatedAt       int64          `protobuf:"varint,6,opt,name=createdAt,proto3" json:"createdAt,omitempty"`              // 创建时间
+	Modules         []*AdminModule `protobuf:"bytes,7,rep,name=Modules,proto3" json:"Modules,omitempty"`                   // 有权限的模块
+	OtpLogin        *Login         `protobuf:"bytes,8,opt,name=otpLogin,proto3" json:"otpLogin,omitempty"`                 // OTP认证
+	CanLogin        bool           `protobuf:"varint,9,opt,name=canLogin,proto3" json:"canLogin,omitempty"`                // 是否可以登录
+	HasWeakPassword bool           `protobuf:"varint,10,opt,name=hasWeakPassword,proto3" json:"hasWeakPassword,omitempty"` // 是否设置了弱密码，只有超级管理员能看到此项
 }
 
 func (x *Admin) Reset() {
@@ -136,6 +137,13 @@ func (x *Admin) GetCanLogin() bool {
 	return false
 }
 
+func (x *Admin) GetHasWeakPassword() bool {
+	if x != nil {
+		return x.HasWeakPassword
+	}
+	return false
+}
+
 var File_models_model_admin_proto protoreflect.FileDescriptor
 
 var file_models_model_admin_proto_rawDesc = []byte{
@@ -144,7 +152,7 @@ var file_models_model_admin_proto_rawDesc = []byte{
 	0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x61, 0x64, 0x6d,
 	0x69, 0x6e, 0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
 	0x18, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6c, 0x6f,
-	0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x89, 0x02, 0x0a, 0x05, 0x41, 0x64,
+	0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb3, 0x02, 0x0a, 0x05, 0x41, 0x64,
 	0x6d, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
 	0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x12,
@@ -161,8 +169,10 @@ var file_models_model_admin_proto_rawDesc = []byte{
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52,
 	0x08, 0x6f, 0x74, 0x70, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x6e,
 	0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x61, 0x6e,
-	0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x28, 0x0a, 0x0f, 0x68, 0x61, 0x73, 0x57, 0x65, 0x61, 0x6b,
+	0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f,
+	0x68, 0x61, 0x73, 0x57, 0x65, 0x61, 0x6b, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pkg/rpc/pb/model_authority_key.pb.go

@@ -40,6 +40,8 @@ type AuthorityKey struct {
 	Company      string   `protobuf:"bytes,7,opt,name=company,proto3" json:"company,omitempty"`
 	Nodes        int32    `protobuf:"varint,8,opt,name=nodes,proto3" json:"nodes,omitempty"`
 	Components   []string `protobuf:"bytes,9,rep,name=components,proto3" json:"components,omitempty"`
+	Edition      string   `protobuf:"bytes,10,opt,name=edition,proto3" json:"edition,omitempty"`
+	RequestCode  string   `protobuf:"bytes,11,opt,name=requestCode,proto3" json:"requestCode,omitempty"`
 }
 
 func (x *AuthorityKey) Reset() {
@@ -137,12 +139,26 @@ func (x *AuthorityKey) GetComponents() []string {
 	return nil
 }
 
+func (x *AuthorityKey) GetEdition() string {
+	if x != nil {
+		return x.Edition
+	}
+	return ""
+}
+
+func (x *AuthorityKey) GetRequestCode() string {
+	if x != nil {
+		return x.RequestCode
+	}
+	return ""
+}
+
 var File_models_model_authority_key_proto protoreflect.FileDescriptor
 
 var file_models_model_authority_key_proto_rawDesc = []byte{
 	0x0a, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x61,
 	0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x6b, 0x65, 0x79, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x82, 0x02, 0x0a, 0x0c, 0x41, 0x75, 0x74, 0x68, 0x6f,
+	0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xbe, 0x02, 0x0a, 0x0c, 0x41, 0x75, 0x74, 0x68, 0x6f,
 	0x72, 0x69, 0x74, 0x79, 0x4b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x18, 0x0a,
 	0x07, 0x64, 0x61, 0x79, 0x46, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
@@ -158,8 +174,12 @@ var file_models_model_authority_key_proto_rawDesc = []byte{
 	0x6d, 0x70, 0x61, 0x6e, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x08,
 	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63,
 	0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e,
-	0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65,
+	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x64,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x43, 0x6f, 0x64, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 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_client_agent.pb.go

@@ -0,0 +1,185 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_client_agent.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 ClientAgent struct {
+	state         protoimpl.MessageState
+	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"`
+	Code        string `protobuf:"bytes,3,opt,name=code,proto3" json:"code,omitempty"`
+	Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
+	CountIPs    int64  `protobuf:"varint,5,opt,name=countIPs,proto3" json:"countIPs,omitempty"`
+}
+
+func (x *ClientAgent) Reset() {
+	*x = ClientAgent{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_client_agent_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ClientAgent) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ClientAgent) ProtoMessage() {}
+
+func (x *ClientAgent) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_client_agent_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 ClientAgent.ProtoReflect.Descriptor instead.
+func (*ClientAgent) Descriptor() ([]byte, []int) {
+	return file_models_model_client_agent_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ClientAgent) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *ClientAgent) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *ClientAgent) GetCode() string {
+	if x != nil {
+		return x.Code
+	}
+	return ""
+}
+
+func (x *ClientAgent) GetDescription() string {
+	if x != nil {
+		return x.Description
+	}
+	return ""
+}
+
+func (x *ClientAgent) GetCountIPs() int64 {
+	if x != nil {
+		return x.CountIPs
+	}
+	return 0
+}
+
+var File_models_model_client_agent_proto protoreflect.FileDescriptor
+
+var file_models_model_client_agent_proto_rawDesc = []byte{
+	0x0a, 0x1f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x63,
+	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x83, 0x01, 0x0a, 0x0b, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74,
+	0x41, 0x67, 0x65, 0x6e, 0x74, 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, 0x63, 0x6f, 0x64,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x20, 0x0a,
+	0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x50, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x08, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x50, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_client_agent_proto_rawDescOnce sync.Once
+	file_models_model_client_agent_proto_rawDescData = file_models_model_client_agent_proto_rawDesc
+)
+
+func file_models_model_client_agent_proto_rawDescGZIP() []byte {
+	file_models_model_client_agent_proto_rawDescOnce.Do(func() {
+		file_models_model_client_agent_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_client_agent_proto_rawDescData)
+	})
+	return file_models_model_client_agent_proto_rawDescData
+}
+
+var file_models_model_client_agent_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_client_agent_proto_goTypes = []interface{}{
+	(*ClientAgent)(nil), // 0: pb.ClientAgent
+}
+var file_models_model_client_agent_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_client_agent_proto_init() }
+func file_models_model_client_agent_proto_init() {
+	if File_models_model_client_agent_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_client_agent_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ClientAgent); 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_client_agent_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_client_agent_proto_goTypes,
+		DependencyIndexes: file_models_model_client_agent_proto_depIdxs,
+		MessageInfos:      file_models_model_client_agent_proto_msgTypes,
+	}.Build()
+	File_models_model_client_agent_proto = out.File
+	file_models_model_client_agent_proto_rawDesc = nil
+	file_models_model_client_agent_proto_goTypes = nil
+	file_models_model_client_agent_proto_depIdxs = nil
+}

pkg/rpc/pb/model_client_agent_ip.pb.go

@@ -0,0 +1,181 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_client_agent_ip.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 ClientAgentIP struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id          int64        `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	Ip          string       `protobuf:"bytes,2,opt,name=ip,proto3" json:"ip,omitempty"`
+	Ptr         string       `protobuf:"bytes,3,opt,name=ptr,proto3" json:"ptr,omitempty"`
+	ClientAgent *ClientAgent `protobuf:"bytes,30,opt,name=clientAgent,proto3" json:"clientAgent,omitempty"`
+}
+
+func (x *ClientAgentIP) Reset() {
+	*x = ClientAgentIP{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_client_agent_ip_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ClientAgentIP) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ClientAgentIP) ProtoMessage() {}
+
+func (x *ClientAgentIP) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_client_agent_ip_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 ClientAgentIP.ProtoReflect.Descriptor instead.
+func (*ClientAgentIP) Descriptor() ([]byte, []int) {
+	return file_models_model_client_agent_ip_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ClientAgentIP) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *ClientAgentIP) GetIp() string {
+	if x != nil {
+		return x.Ip
+	}
+	return ""
+}
+
+func (x *ClientAgentIP) GetPtr() string {
+	if x != nil {
+		return x.Ptr
+	}
+	return ""
+}
+
+func (x *ClientAgentIP) GetClientAgent() *ClientAgent {
+	if x != nil {
+		return x.ClientAgent
+	}
+	return nil
+}
+
+var File_models_model_client_agent_ip_proto protoreflect.FileDescriptor
+
+var file_models_model_client_agent_ip_proto_rawDesc = []byte{
+	0x0a, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x63,
+	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x70, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x1f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73,
+	0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x74, 0x0a, 0x0d, 0x43, 0x6c, 0x69,
+	0x65, 0x6e, 0x74, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x49, 0x50, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x74,
+	0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x74, 0x72, 0x12, 0x31, 0x0a, 0x0b,
+	0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x1e, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x41, 0x67, 0x65,
+	0x6e, 0x74, 0x52, 0x0b, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_client_agent_ip_proto_rawDescOnce sync.Once
+	file_models_model_client_agent_ip_proto_rawDescData = file_models_model_client_agent_ip_proto_rawDesc
+)
+
+func file_models_model_client_agent_ip_proto_rawDescGZIP() []byte {
+	file_models_model_client_agent_ip_proto_rawDescOnce.Do(func() {
+		file_models_model_client_agent_ip_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_client_agent_ip_proto_rawDescData)
+	})
+	return file_models_model_client_agent_ip_proto_rawDescData
+}
+
+var file_models_model_client_agent_ip_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_client_agent_ip_proto_goTypes = []interface{}{
+	(*ClientAgentIP)(nil), // 0: pb.ClientAgentIP
+	(*ClientAgent)(nil),   // 1: pb.ClientAgent
+}
+var file_models_model_client_agent_ip_proto_depIdxs = []int32{
+	1, // 0: pb.ClientAgentIP.clientAgent:type_name -> pb.ClientAgent
+	1, // [1:1] is the sub-list for method output_type
+	1, // [1:1] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
+}
+
+func init() { file_models_model_client_agent_ip_proto_init() }
+func file_models_model_client_agent_ip_proto_init() {
+	if File_models_model_client_agent_ip_proto != nil {
+		return
+	}
+	file_models_model_client_agent_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_client_agent_ip_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ClientAgentIP); 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_client_agent_ip_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_client_agent_ip_proto_goTypes,
+		DependencyIndexes: file_models_model_client_agent_ip_proto_depIdxs,
+		MessageInfos:      file_models_model_client_agent_ip_proto_msgTypes,
+	}.Build()
+	File_models_model_client_agent_ip_proto = out.File
+	file_models_model_client_agent_ip_proto_rawDesc = nil
+	file_models_model_client_agent_ip_proto_goTypes = nil
+	file_models_model_client_agent_ip_proto_depIdxs = nil
+}

pkg/rpc/pb/model_formal_client_browser.pb.go

@@ -0,0 +1,185 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_formal_client_browser.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 FormalClientBrowser struct {
+	state         protoimpl.MessageState
+	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"`
+	Codes  []string `protobuf:"bytes,3,rep,name=codes,proto3" json:"codes,omitempty"`
+	DataId string   `protobuf:"bytes,4,opt,name=dataId,proto3" json:"dataId,omitempty"`
+	State  int32    `protobuf:"varint,5,opt,name=state,proto3" json:"state,omitempty"`
+}
+
+func (x *FormalClientBrowser) Reset() {
+	*x = FormalClientBrowser{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_formal_client_browser_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FormalClientBrowser) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FormalClientBrowser) ProtoMessage() {}
+
+func (x *FormalClientBrowser) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_formal_client_browser_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 FormalClientBrowser.ProtoReflect.Descriptor instead.
+func (*FormalClientBrowser) Descriptor() ([]byte, []int) {
+	return file_models_model_formal_client_browser_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *FormalClientBrowser) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *FormalClientBrowser) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *FormalClientBrowser) GetCodes() []string {
+	if x != nil {
+		return x.Codes
+	}
+	return nil
+}
+
+func (x *FormalClientBrowser) GetDataId() string {
+	if x != nil {
+		return x.DataId
+	}
+	return ""
+}
+
+func (x *FormalClientBrowser) GetState() int32 {
+	if x != nil {
+		return x.State
+	}
+	return 0
+}
+
+var File_models_model_formal_client_browser_proto protoreflect.FileDescriptor
+
+var file_models_model_formal_client_browser_proto_rawDesc = []byte{
+	0x0a, 0x28, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x66,
+	0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x62, 0x72, 0x6f,
+	0x77, 0x73, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x7d,
+	0x0a, 0x13, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x42, 0x72,
+	0x6f, 0x77, 0x73, 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, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x64,
+	0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x12,
+	0x16, 0x0a, 0x06, 0x64, 0x61, 0x74, 0x61, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x64, 0x61, 0x74, 0x61, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_formal_client_browser_proto_rawDescOnce sync.Once
+	file_models_model_formal_client_browser_proto_rawDescData = file_models_model_formal_client_browser_proto_rawDesc
+)
+
+func file_models_model_formal_client_browser_proto_rawDescGZIP() []byte {
+	file_models_model_formal_client_browser_proto_rawDescOnce.Do(func() {
+		file_models_model_formal_client_browser_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_formal_client_browser_proto_rawDescData)
+	})
+	return file_models_model_formal_client_browser_proto_rawDescData
+}
+
+var file_models_model_formal_client_browser_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_formal_client_browser_proto_goTypes = []interface{}{
+	(*FormalClientBrowser)(nil), // 0: pb.FormalClientBrowser
+}
+var file_models_model_formal_client_browser_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_formal_client_browser_proto_init() }
+func file_models_model_formal_client_browser_proto_init() {
+	if File_models_model_formal_client_browser_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_formal_client_browser_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FormalClientBrowser); 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_formal_client_browser_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_formal_client_browser_proto_goTypes,
+		DependencyIndexes: file_models_model_formal_client_browser_proto_depIdxs,
+		MessageInfos:      file_models_model_formal_client_browser_proto_msgTypes,
+	}.Build()
+	File_models_model_formal_client_browser_proto = out.File
+	file_models_model_formal_client_browser_proto_rawDesc = nil
+	file_models_model_formal_client_browser_proto_goTypes = nil
+	file_models_model_formal_client_browser_proto_depIdxs = nil
+}

pkg/rpc/pb/model_formal_client_system.pb.go

@@ -0,0 +1,185 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_formal_client_system.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 FormalClientSystem struct {
+	state         protoimpl.MessageState
+	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"`
+	Codes  []string `protobuf:"bytes,3,rep,name=codes,proto3" json:"codes,omitempty"`
+	DataId string   `protobuf:"bytes,4,opt,name=dataId,proto3" json:"dataId,omitempty"`
+	State  int32    `protobuf:"varint,5,opt,name=state,proto3" json:"state,omitempty"`
+}
+
+func (x *FormalClientSystem) Reset() {
+	*x = FormalClientSystem{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_formal_client_system_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *FormalClientSystem) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*FormalClientSystem) ProtoMessage() {}
+
+func (x *FormalClientSystem) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_formal_client_system_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 FormalClientSystem.ProtoReflect.Descriptor instead.
+func (*FormalClientSystem) Descriptor() ([]byte, []int) {
+	return file_models_model_formal_client_system_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *FormalClientSystem) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *FormalClientSystem) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *FormalClientSystem) GetCodes() []string {
+	if x != nil {
+		return x.Codes
+	}
+	return nil
+}
+
+func (x *FormalClientSystem) GetDataId() string {
+	if x != nil {
+		return x.DataId
+	}
+	return ""
+}
+
+func (x *FormalClientSystem) GetState() int32 {
+	if x != nil {
+		return x.State
+	}
+	return 0
+}
+
+var File_models_model_formal_client_system_proto protoreflect.FileDescriptor
+
+var file_models_model_formal_client_system_proto_rawDesc = []byte{
+	0x0a, 0x27, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x66,
+	0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x79, 0x73,
+	0x74, 0x65, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x7c, 0x0a,
+	0x12, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x79, 0x73,
+	0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x64, 0x65, 0x73,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x16, 0x0a,
+	0x06, 0x64, 0x61, 0x74, 0x61, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64,
+	0x61, 0x74, 0x61, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_formal_client_system_proto_rawDescOnce sync.Once
+	file_models_model_formal_client_system_proto_rawDescData = file_models_model_formal_client_system_proto_rawDesc
+)
+
+func file_models_model_formal_client_system_proto_rawDescGZIP() []byte {
+	file_models_model_formal_client_system_proto_rawDescOnce.Do(func() {
+		file_models_model_formal_client_system_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_formal_client_system_proto_rawDescData)
+	})
+	return file_models_model_formal_client_system_proto_rawDescData
+}
+
+var file_models_model_formal_client_system_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_formal_client_system_proto_goTypes = []interface{}{
+	(*FormalClientSystem)(nil), // 0: pb.FormalClientSystem
+}
+var file_models_model_formal_client_system_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_formal_client_system_proto_init() }
+func file_models_model_formal_client_system_proto_init() {
+	if File_models_model_formal_client_system_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_formal_client_system_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*FormalClientSystem); 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_formal_client_system_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_formal_client_system_proto_goTypes,
+		DependencyIndexes: file_models_model_formal_client_system_proto_depIdxs,
+		MessageInfos:      file_models_model_formal_client_system_proto_msgTypes,
+	}.Build()
+	File_models_model_formal_client_system_proto = out.File
+	file_models_model_formal_client_system_proto_rawDesc = nil
+	file_models_model_formal_client_system_proto_goTypes = nil
+	file_models_model_formal_client_system_proto_depIdxs = nil
+}

pkg/rpc/pb/model_http_access_log.pb.go

@@ -72,8 +72,9 @@ type HTTPAccessLog struct {
 	ServerPort      int32               `protobuf:"varint,38,opt,name=serverPort,proto3" json:"serverPort,omitempty"`
 	ServerProtocol  string              `protobuf:"bytes,39,opt,name=serverProtocol,proto3" json:"serverProtocol,omitempty"`
 	Hostname        string              `protobuf:"bytes,40,opt,name=hostname,proto3" json:"hostname,omitempty"`
-	// 代理相关
+	// 源站相关
 	OriginAddress string `protobuf:"bytes,41,opt,name=originAddress,proto3" json:"originAddress,omitempty"`
+	OriginStatus  int32  `protobuf:"varint,52,opt,name=originStatus,proto3" json:"originStatus,omitempty"`
 	// 错误信息
 	Errors []string `protobuf:"bytes,42,rep,name=errors,proto3" json:"errors,omitempty"`
 	// 扩展
@@ -415,6 +416,13 @@ func (x *HTTPAccessLog) GetOriginAddress() string {
 	return ""
 }
 
+func (x *HTTPAccessLog) GetOriginStatus() int32 {
+	if x != nil {
+		return x.OriginStatus
+	}
+	return 0
+}
+
 func (x *HTTPAccessLog) GetErrors() []string {
 	if x != nil {
 		return x.Errors
@@ -532,7 +540,7 @@ var file_models_model_http_access_log_proto_rawDesc = []byte{
 	0x74, 0x74, 0x70, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6c, 0x6f, 0x67, 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, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x22, 0xdd, 0x0f, 0x0a, 0x0d, 0x48, 0x54, 0x54, 0x50, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73,
+	0x6f, 0x22, 0x81, 0x10, 0x0a, 0x0d, 0x48, 0x54, 0x54, 0x50, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73,
 	0x4c, 0x6f, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64,
 	0x18, 0x30, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49,
 	0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20,
@@ -619,49 +627,51 @@ var file_models_model_http_access_log_proto_rawDesc = []byte{
 	0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x28, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, 0x6f,
 	0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e,
 	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x29, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6f,
-	0x72, 0x69, 0x67, 0x69, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x0a, 0x06,
-	0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x18, 0x2a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72,
-	0x72, 0x6f, 0x72, 0x73, 0x12, 0x32, 0x0a, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x18, 0x2b, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x41, 0x63, 0x63,
-	0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x2e, 0x41, 0x74, 0x74, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x66, 0x69, 0x72, 0x65,
-	0x77, 0x61, 0x6c, 0x6c, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x64, 0x18, 0x2c, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x10, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x13, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c,
-	0x52, 0x75, 0x6c, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x2d, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x13, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61,
-	0x6c, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x53, 0x65, 0x74, 0x49, 0x64, 0x18, 0x2e, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x11, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x53,
-	0x65, 0x74, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c,
-	0x52, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x2f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x66, 0x69,
-	0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f,
-	0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x31, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x32,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1c, 0x0a, 0x04, 0x6e, 0x6f,
-	0x64, 0x65, 0x18, 0x64, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f,
-	0x64, 0x65, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x1a, 0x4a, 0x0a, 0x0f, 0x53, 0x65, 0x6e, 0x74,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70,
-	0x62, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
-	0x46, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
-	0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0b, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x74, 0x74, 0x72, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x22, 0x21, 0x0a, 0x07, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x16, 0x0a, 0x06,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x69, 0x67, 0x69, 0x6e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x22, 0x0a, 0x0c,
+	0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x34, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x0c, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x18, 0x2a, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x12, 0x32, 0x0a, 0x05, 0x61, 0x74, 0x74, 0x72,
+	0x73, 0x18, 0x2b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x54, 0x54,
+	0x50, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x2e, 0x41, 0x74, 0x74, 0x72, 0x73,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x12, 0x2a, 0x0a, 0x10,
+	0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x64,
+	0x18, 0x2c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x13, 0x66, 0x69, 0x72, 0x65,
+	0x77, 0x61, 0x6c, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18,
+	0x2d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x52,
+	0x75, 0x6c, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x66, 0x69,
+	0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x53, 0x65, 0x74, 0x49, 0x64, 0x18,
+	0x2e, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x52,
+	0x75, 0x6c, 0x65, 0x53, 0x65, 0x74, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x66, 0x69, 0x72, 0x65,
+	0x77, 0x61, 0x6c, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x2f, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x0e, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x49, 0x64,
+	0x12, 0x28, 0x0a, 0x0f, 0x66, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x41, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x18, 0x31, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x66, 0x69, 0x72, 0x65, 0x77,
+	0x61, 0x6c, 0x6c, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x61,
+	0x67, 0x73, 0x18, 0x32, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x1c,
+	0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x64, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x70,
+	0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x1a, 0x4a, 0x0a, 0x0f,
+	0x53, 0x65, 0x6e, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0b, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f, 0x6f, 0x6b,
+	0x69, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x1a, 0x46, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x73,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x41,
+	0x74, 0x74, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x21, 0x0a, 0x07, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x73,
+	0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pkg/rpc/pb/model_ip_library_artifact.pb.go

@@ -0,0 +1,219 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_ip_library_artifact.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 IPLibraryArtifact struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id        int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	FileId    int64  `protobuf:"varint,2,opt,name=fileId,proto3" json:"fileId,omitempty"`
+	CreatedAt int64  `protobuf:"varint,3,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
+	MetaJSON  []byte `protobuf:"bytes,4,opt,name=metaJSON,proto3" json:"metaJSON,omitempty"`
+	IsPublic  bool   `protobuf:"varint,5,opt,name=isPublic,proto3" json:"isPublic,omitempty"` // 是否公开
+	Name      string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`
+	Code      string `protobuf:"bytes,7,opt,name=code,proto3" json:"code,omitempty"`
+	File      *File  `protobuf:"bytes,30,opt,name=file,proto3" json:"file,omitempty"` // 文件信息
+}
+
+func (x *IPLibraryArtifact) Reset() {
+	*x = IPLibraryArtifact{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_ip_library_artifact_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IPLibraryArtifact) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IPLibraryArtifact) ProtoMessage() {}
+
+func (x *IPLibraryArtifact) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_ip_library_artifact_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 IPLibraryArtifact.ProtoReflect.Descriptor instead.
+func (*IPLibraryArtifact) Descriptor() ([]byte, []int) {
+	return file_models_model_ip_library_artifact_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *IPLibraryArtifact) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *IPLibraryArtifact) GetFileId() int64 {
+	if x != nil {
+		return x.FileId
+	}
+	return 0
+}
+
+func (x *IPLibraryArtifact) GetCreatedAt() int64 {
+	if x != nil {
+		return x.CreatedAt
+	}
+	return 0
+}
+
+func (x *IPLibraryArtifact) GetMetaJSON() []byte {
+	if x != nil {
+		return x.MetaJSON
+	}
+	return nil
+}
+
+func (x *IPLibraryArtifact) GetIsPublic() bool {
+	if x != nil {
+		return x.IsPublic
+	}
+	return false
+}
+
+func (x *IPLibraryArtifact) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *IPLibraryArtifact) GetCode() string {
+	if x != nil {
+		return x.Code
+	}
+	return ""
+}
+
+func (x *IPLibraryArtifact) GetFile() *File {
+	if x != nil {
+		return x.File
+	}
+	return nil
+}
+
+var File_models_model_ip_library_artifact_proto protoreflect.FileDescriptor
+
+var file_models_model_ip_library_artifact_proto_rawDesc = []byte{
+	0x0a, 0x26, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x69,
+	0x70, 0x5f, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x5f, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61,
+	0x63, 0x74, 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, 0x66, 0x69, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd7, 0x01, 0x0a, 0x11, 0x49, 0x50, 0x4c, 0x69, 0x62, 0x72,
+	0x61, 0x72, 0x79, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x66,
+	0x69, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x66, 0x69, 0x6c,
+	0x65, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41,
+	0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x0c, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x4a, 0x53, 0x4f, 0x4e, 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, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a,
+	0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64,
+	0x65, 0x12, 0x1c, 0x0a, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x08, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_ip_library_artifact_proto_rawDescOnce sync.Once
+	file_models_model_ip_library_artifact_proto_rawDescData = file_models_model_ip_library_artifact_proto_rawDesc
+)
+
+func file_models_model_ip_library_artifact_proto_rawDescGZIP() []byte {
+	file_models_model_ip_library_artifact_proto_rawDescOnce.Do(func() {
+		file_models_model_ip_library_artifact_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_ip_library_artifact_proto_rawDescData)
+	})
+	return file_models_model_ip_library_artifact_proto_rawDescData
+}
+
+var file_models_model_ip_library_artifact_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_ip_library_artifact_proto_goTypes = []interface{}{
+	(*IPLibraryArtifact)(nil), // 0: pb.IPLibraryArtifact
+	(*File)(nil),              // 1: pb.File
+}
+var file_models_model_ip_library_artifact_proto_depIdxs = []int32{
+	1, // 0: pb.IPLibraryArtifact.file:type_name -> pb.File
+	1, // [1:1] is the sub-list for method output_type
+	1, // [1:1] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
+}
+
+func init() { file_models_model_ip_library_artifact_proto_init() }
+func file_models_model_ip_library_artifact_proto_init() {
+	if File_models_model_ip_library_artifact_proto != nil {
+		return
+	}
+	file_models_model_file_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_ip_library_artifact_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IPLibraryArtifact); 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_ip_library_artifact_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_ip_library_artifact_proto_goTypes,
+		DependencyIndexes: file_models_model_ip_library_artifact_proto_depIdxs,
+		MessageInfos:      file_models_model_ip_library_artifact_proto_msgTypes,
+	}.Build()
+	File_models_model_ip_library_artifact_proto = out.File
+	file_models_model_ip_library_artifact_proto_rawDesc = nil
+	file_models_model_ip_library_artifact_proto_goTypes = nil
+	file_models_model_ip_library_artifact_proto_depIdxs = nil
+}

pkg/rpc/pb/model_ip_library_file.pb.go

@@ -30,15 +30,21 @@ type IPLibraryFile struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id            int64                     `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	FileId        int64                     `protobuf:"varint,2,opt,name=fileId,proto3" json:"fileId,omitempty"`
-	IsFinished    bool                      `protobuf:"varint,3,opt,name=isFinished,proto3" json:"isFinished,omitempty"`
-	CreatedAt     int64                     `protobuf:"varint,4,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
-	CountryNames  []string                  `protobuf:"bytes,5,rep,name=countryNames,proto3" json:"countryNames,omitempty"`
-	Provinces     []*IPLibraryFile_Province `protobuf:"bytes,6,rep,name=provinces,proto3" json:"provinces,omitempty"`
-	Cities        []*IPLibraryFile_City     `protobuf:"bytes,7,rep,name=cities,proto3" json:"cities,omitempty"`
-	Towns         []*IPLibraryFile_Town     `protobuf:"bytes,8,rep,name=towns,proto3" json:"towns,omitempty"`
-	ProviderNames []string                  `protobuf:"bytes,9,rep,name=providerNames,proto3" json:"providerNames,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"`
+	FileId          int64                     `protobuf:"varint,3,opt,name=fileId,proto3" json:"fileId,omitempty"`
+	Template        string                    `protobuf:"bytes,4,opt,name=template,proto3" json:"template,omitempty"`
+	EmptyValues     []string                  `protobuf:"bytes,5,rep,name=emptyValues,proto3" json:"emptyValues,omitempty"`
+	GeneratedFileId int64                     `protobuf:"varint,6,opt,name=generatedFileId,proto3" json:"generatedFileId,omitempty"`
+	GeneratedAt     int64                     `protobuf:"varint,7,opt,name=generatedAt,proto3" json:"generatedAt,omitempty"`
+	IsFinished      bool                      `protobuf:"varint,8,opt,name=isFinished,proto3" json:"isFinished,omitempty"`
+	CreatedAt       int64                     `protobuf:"varint,9,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
+	CountryNames    []string                  `protobuf:"bytes,10,rep,name=countryNames,proto3" json:"countryNames,omitempty"`
+	Provinces       []*IPLibraryFile_Province `protobuf:"bytes,11,rep,name=provinces,proto3" json:"provinces,omitempty"`
+	Cities          []*IPLibraryFile_City     `protobuf:"bytes,12,rep,name=cities,proto3" json:"cities,omitempty"`
+	Towns           []*IPLibraryFile_Town     `protobuf:"bytes,13,rep,name=towns,proto3" json:"towns,omitempty"`
+	ProviderNames   []string                  `protobuf:"bytes,14,rep,name=providerNames,proto3" json:"providerNames,omitempty"`
+	Password        string                    `protobuf:"bytes,15,opt,name=password,proto3" json:"password,omitempty"` // 密码
 }
 
 func (x *IPLibraryFile) Reset() {
@@ -80,6 +86,13 @@ func (x *IPLibraryFile) GetId() int64 {
 	return 0
 }
 
+func (x *IPLibraryFile) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
 func (x *IPLibraryFile) GetFileId() int64 {
 	if x != nil {
 		return x.FileId
@@ -87,6 +100,34 @@ func (x *IPLibraryFile) GetFileId() int64 {
 	return 0
 }
 
+func (x *IPLibraryFile) GetTemplate() string {
+	if x != nil {
+		return x.Template
+	}
+	return ""
+}
+
+func (x *IPLibraryFile) GetEmptyValues() []string {
+	if x != nil {
+		return x.EmptyValues
+	}
+	return nil
+}
+
+func (x *IPLibraryFile) GetGeneratedFileId() int64 {
+	if x != nil {
+		return x.GeneratedFileId
+	}
+	return 0
+}
+
+func (x *IPLibraryFile) GetGeneratedAt() int64 {
+	if x != nil {
+		return x.GeneratedAt
+	}
+	return 0
+}
+
 func (x *IPLibraryFile) GetIsFinished() bool {
 	if x != nil {
 		return x.IsFinished
@@ -136,6 +177,13 @@ func (x *IPLibraryFile) GetProviderNames() []string {
 	return nil
 }
 
+func (x *IPLibraryFile) GetPassword() string {
+	if x != nil {
+		return x.Password
+	}
+	return ""
+}
+
 type IPLibraryFile_Province struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -330,50 +378,61 @@ var File_models_model_ip_library_file_proto protoreflect.FileDescriptor
 var file_models_model_ip_library_file_proto_rawDesc = []byte{
 	0x0a, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x69,
 	0x70, 0x5f, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x9a, 0x05, 0x0a, 0x0d, 0x49, 0x50, 0x4c,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xd4, 0x06, 0x0a, 0x0d, 0x49, 0x50, 0x4c,
 	0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69,
-	0x6c, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x65,
-	0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
-	0x65, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74,
-	0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x73,
-	0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e,
-	0x61, 0x6d, 0x65, 0x73, 0x12, 0x38, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65,
-	0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x62, 0x2e, 0x49, 0x50, 0x4c,
-	0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x69, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69,
-	0x6e, 0x63, 0x65, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x2e,
-	0x0a, 0x06, 0x63, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16,
-	0x2e, 0x70, 0x62, 0x2e, 0x49, 0x50, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x69, 0x6c,
-	0x65, 0x2e, 0x43, 0x69, 0x74, 0x79, 0x52, 0x06, 0x63, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x2c,
-	0x0a, 0x05, 0x74, 0x6f, 0x77, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e,
-	0x70, 0x62, 0x2e, 0x49, 0x50, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x69, 0x6c, 0x65,
-	0x2e, 0x54, 0x6f, 0x77, 0x6e, 0x52, 0x05, 0x74, 0x6f, 0x77, 0x6e, 0x73, 0x12, 0x24, 0x0a, 0x0d,
-	0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x09, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d,
-	0x65, 0x73, 0x1a, 0x50, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x20,
-	0x0a, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65,
-	0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65,
-	0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x68, 0x0a, 0x04, 0x43, 0x69, 0x74, 0x79, 0x12, 0x20, 0x0a, 0x0b,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22,
-	0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x4e, 0x61,
-	0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x69, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x69, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x84,
-	0x01, 0x0a, 0x04, 0x54, 0x6f, 0x77, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f,
-	0x76, 0x69, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0c, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a,
-	0x08, 0x63, 0x69, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x08, 0x63, 0x69, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x6f, 0x77,
-	0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x6f, 0x77,
-	0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	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, 0x16,
+	0x0a, 0x06, 0x66, 0x69, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06,
+	0x66, 0x69, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61,
+	0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61,
+	0x74, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65,
+	0x64, 0x46, 0x69, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x67,
+	0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x46, 0x69, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x20,
+	0x0a, 0x0b, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x0b, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74,
+	0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x18, 0x08,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64,
+	0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x09, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x22,
+	0x0a, 0x0c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x0a,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d,
+	0x65, 0x73, 0x12, 0x38, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x18,
+	0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x62, 0x2e, 0x49, 0x50, 0x4c, 0x69, 0x62,
+	0x72, 0x61, 0x72, 0x79, 0x46, 0x69, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63,
+	0x65, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x2e, 0x0a, 0x06,
+	0x63, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70,
+	0x62, 0x2e, 0x49, 0x50, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x69, 0x6c, 0x65, 0x2e,
+	0x43, 0x69, 0x74, 0x79, 0x52, 0x06, 0x63, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x2c, 0x0a, 0x05,
+	0x74, 0x6f, 0x77, 0x6e, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, 0x62,
+	0x2e, 0x49, 0x50, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x69, 0x6c, 0x65, 0x2e, 0x54,
+	0x6f, 0x77, 0x6e, 0x52, 0x05, 0x74, 0x6f, 0x77, 0x6e, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x70, 0x72,
+	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x73,
+	0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0f, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x1a, 0x50, 0x0a, 0x08,
+	0x50, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72,
+	0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0c, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x68,
+	0x0a, 0x04, 0x43, 0x69, 0x74, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72,
+	0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x76,
+	0x69, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
+	0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08,
+	0x63, 0x69, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x63, 0x69, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x84, 0x01, 0x0a, 0x04, 0x54, 0x6f, 0x77,
+	0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e,
+	0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x4e,
+	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x72, 0x6f, 0x76, 0x69,
+	0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x69, 0x74, 0x79, 0x4e,
+	0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x69, 0x74, 0x79, 0x4e,
+	0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x6f, 0x77, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x6f, 0x77, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pkg/rpc/pb/model_login_session.pb.go

@@ -0,0 +1,215 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_login_session.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
+
+// 登录SESSION
+type LoginSession struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id         int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	AdminId    int64  `protobuf:"varint,2,opt,name=adminId,proto3" json:"adminId,omitempty"`
+	UserId     int64  `protobuf:"varint,3,opt,name=userId,proto3" json:"userId,omitempty"`
+	Sid        string `protobuf:"bytes,4,opt,name=sid,proto3" json:"sid,omitempty"`
+	ValuesJSON []byte `protobuf:"bytes,5,opt,name=valuesJSON,proto3" json:"valuesJSON,omitempty"`
+	Ip         string `protobuf:"bytes,6,opt,name=ip,proto3" json:"ip,omitempty"`
+	CreatedAt  int64  `protobuf:"varint,7,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
+	ExpiresAt  int64  `protobuf:"varint,8,opt,name=expiresAt,proto3" json:"expiresAt,omitempty"`
+}
+
+func (x *LoginSession) Reset() {
+	*x = LoginSession{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_login_session_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *LoginSession) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*LoginSession) ProtoMessage() {}
+
+func (x *LoginSession) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_login_session_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 LoginSession.ProtoReflect.Descriptor instead.
+func (*LoginSession) Descriptor() ([]byte, []int) {
+	return file_models_model_login_session_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *LoginSession) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *LoginSession) GetAdminId() int64 {
+	if x != nil {
+		return x.AdminId
+	}
+	return 0
+}
+
+func (x *LoginSession) GetUserId() int64 {
+	if x != nil {
+		return x.UserId
+	}
+	return 0
+}
+
+func (x *LoginSession) GetSid() string {
+	if x != nil {
+		return x.Sid
+	}
+	return ""
+}
+
+func (x *LoginSession) GetValuesJSON() []byte {
+	if x != nil {
+		return x.ValuesJSON
+	}
+	return nil
+}
+
+func (x *LoginSession) GetIp() string {
+	if x != nil {
+		return x.Ip
+	}
+	return ""
+}
+
+func (x *LoginSession) GetCreatedAt() int64 {
+	if x != nil {
+		return x.CreatedAt
+	}
+	return 0
+}
+
+func (x *LoginSession) GetExpiresAt() int64 {
+	if x != nil {
+		return x.ExpiresAt
+	}
+	return 0
+}
+
+var File_models_model_login_session_proto protoreflect.FileDescriptor
+
+var file_models_model_login_session_proto_rawDesc = []byte{
+	0x0a, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6c,
+	0x6f, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xce, 0x01, 0x0a, 0x0c, 0x4c, 0x6f, 0x67, 0x69, 0x6e,
+	0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x6d, 0x69, 0x6e,
+	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x49,
+	0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x63,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
+	0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x78, 0x70,
+	0x69, 0x72, 0x65, 0x73, 0x41, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65, 0x78,
+	0x70, 0x69, 0x72, 0x65, 0x73, 0x41, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_login_session_proto_rawDescOnce sync.Once
+	file_models_model_login_session_proto_rawDescData = file_models_model_login_session_proto_rawDesc
+)
+
+func file_models_model_login_session_proto_rawDescGZIP() []byte {
+	file_models_model_login_session_proto_rawDescOnce.Do(func() {
+		file_models_model_login_session_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_login_session_proto_rawDescData)
+	})
+	return file_models_model_login_session_proto_rawDescData
+}
+
+var file_models_model_login_session_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_login_session_proto_goTypes = []interface{}{
+	(*LoginSession)(nil), // 0: pb.LoginSession
+}
+var file_models_model_login_session_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_login_session_proto_init() }
+func file_models_model_login_session_proto_init() {
+	if File_models_model_login_session_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_login_session_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*LoginSession); 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_login_session_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_login_session_proto_goTypes,
+		DependencyIndexes: file_models_model_login_session_proto_depIdxs,
+		MessageInfos:      file_models_model_login_session_proto_msgTypes,
+	}.Build()
+	File_models_model_login_session_proto = out.File
+	file_models_model_login_session_proto_rawDesc = nil
+	file_models_model_login_session_proto_goTypes = nil
+	file_models_model_login_session_proto_depIdxs = nil
+}

pkg/rpc/pb/model_node.pb.go

@@ -49,8 +49,15 @@ type Node struct {
 	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"`
+	CacheDiskSubDirsJSON   []byte             `protobuf:"bytes,23,opt,name=cacheDiskSubDirsJSON,proto3" json:"cacheDiskSubDirsJSON,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"` // 主集群
+	LnAddrs                []string           `protobuf:"bytes,21,rep,name=lnAddrs,proto3" json:"lnAddrs,omitempty"` // Ln访问地址
+	EnableIPLists          bool               `protobuf:"varint,22,opt,name=enableIPLists,proto3" json:"enableIPLists,omitempty"`
+	ApiNodeAddrsJSON       []byte             `protobuf:"bytes,24,opt,name=apiNodeAddrsJSON,proto3" json:"apiNodeAddrsJSON,omitempty"`
+	OfflineDay             string             `protobuf:"bytes,25,opt,name=offlineDay,proto3" json:"offlineDay,omitempty"`                  // 下线日期
+	IsBackupForCluster     bool               `protobuf:"varint,26,opt,name=isBackupForCluster,proto3" json:"isBackupForCluster,omitempty"` // 是否为集群备用节点
+	IsBackupForGroup       bool               `protobuf:"varint,27,opt,name=isBackupForGroup,proto3" json:"isBackupForGroup,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"`
 	IpAddresses            []*NodeIPAddress   `protobuf:"bytes,35,rep,name=ipAddresses,proto3" json:"ipAddresses,omitempty"`
@@ -224,6 +231,13 @@ func (x *Node) GetCacheDiskDir() string {
 	return ""
 }
 
+func (x *Node) GetCacheDiskSubDirsJSON() []byte {
+	if x != nil {
+		return x.CacheDiskSubDirsJSON
+	}
+	return nil
+}
+
 func (x *Node) GetLevel() int32 {
 	if x != nil {
 		return x.Level
@@ -231,6 +245,48 @@ func (x *Node) GetLevel() int32 {
 	return 0
 }
 
+func (x *Node) GetLnAddrs() []string {
+	if x != nil {
+		return x.LnAddrs
+	}
+	return nil
+}
+
+func (x *Node) GetEnableIPLists() bool {
+	if x != nil {
+		return x.EnableIPLists
+	}
+	return false
+}
+
+func (x *Node) GetApiNodeAddrsJSON() []byte {
+	if x != nil {
+		return x.ApiNodeAddrsJSON
+	}
+	return nil
+}
+
+func (x *Node) GetOfflineDay() string {
+	if x != nil {
+		return x.OfflineDay
+	}
+	return ""
+}
+
+func (x *Node) GetIsBackupForCluster() bool {
+	if x != nil {
+		return x.IsBackupForCluster
+	}
+	return false
+}
+
+func (x *Node) GetIsBackupForGroup() bool {
+	if x != nil {
+		return x.IsBackupForGroup
+	}
+	return false
+}
+
 func (x *Node) GetNodeCluster() *NodeCluster {
 	if x != nil {
 		return x.NodeCluster
@@ -388,7 +444,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, 0x8e, 0x08, 0x0a, 0x04, 0x4e, 0x6f, 0x64,
+	0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xaa, 0x0a, 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,
@@ -428,43 +484,61 @@ var file_models_model_node_proto_rawDesc = []byte{
 	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, 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,
-	0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x0c, 0x63, 0x61, 0x63, 0x68, 0x65, 0x44, 0x69, 0x73, 0x6b, 0x44, 0x69, 0x72, 0x12, 0x32, 0x0a,
+	0x14, 0x63, 0x61, 0x63, 0x68, 0x65, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x44, 0x69, 0x72,
+	0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x14, 0x63, 0x61, 0x63,
+	0x68, 0x65, 0x44, 0x69, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x44, 0x69, 0x72, 0x73, 0x4a, 0x53, 0x4f,
+	0x4e, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6e, 0x41, 0x64, 0x64,
+	0x72, 0x73, 0x18, 0x15, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x6c, 0x6e, 0x41, 0x64, 0x64, 0x72,
+	0x73, 0x12, 0x24, 0x0a, 0x0d, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x50, 0x4c, 0x69, 0x73,
+	0x74, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
+	0x49, 0x50, 0x4c, 0x69, 0x73, 0x74, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x61, 0x70, 0x69, 0x4e, 0x6f,
+	0x64, 0x65, 0x41, 0x64, 0x64, 0x72, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x18, 0x20, 0x01, 0x28,
+	0x0c, 0x52, 0x10, 0x61, 0x70, 0x69, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x64, 0x64, 0x72, 0x73, 0x4a,
+	0x53, 0x4f, 0x4e, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x61,
+	0x79, 0x18, 0x19, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65,
+	0x44, 0x61, 0x79, 0x12, 0x2e, 0x0a, 0x12, 0x69, 0x73, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x46,
+	0x6f, 0x72, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x12, 0x69, 0x73, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x46, 0x6f, 0x72, 0x43, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x10, 0x69, 0x73, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x46,
+	0x6f, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x69,
+	0x73, 0x42, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x46, 0x6f, 0x72, 0x47, 0x72, 0x6f, 0x75, 0x70, 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, 0x2e, 0x2f, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pkg/rpc/pb/model_node_action.pb.go

@@ -0,0 +1,206 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_node_action.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 NodeAction struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id           int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	NodeId       int64  `protobuf:"varint,2,opt,name=nodeId,proto3" json:"nodeId,omitempty"`
+	Role         string `protobuf:"bytes,3,opt,name=role,proto3" json:"role,omitempty"`
+	IsOn         bool   `protobuf:"varint,4,opt,name=isOn,proto3" json:"isOn,omitempty"`                // 是否启用
+	CondsJSON    []byte `protobuf:"bytes,5,opt,name=condsJSON,proto3" json:"condsJSON,omitempty"`       // 条件定义
+	ActionJSON   []byte `protobuf:"bytes,6,opt,name=actionJSON,proto3" json:"actionJSON,omitempty"`     // 动作定义
+	DurationJSON []byte `protobuf:"bytes,7,opt,name=durationJSON,proto3" json:"durationJSON,omitempty"` // 持续时间
+}
+
+func (x *NodeAction) Reset() {
+	*x = NodeAction{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_node_action_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *NodeAction) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*NodeAction) ProtoMessage() {}
+
+func (x *NodeAction) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_node_action_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 NodeAction.ProtoReflect.Descriptor instead.
+func (*NodeAction) Descriptor() ([]byte, []int) {
+	return file_models_model_node_action_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *NodeAction) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *NodeAction) GetNodeId() int64 {
+	if x != nil {
+		return x.NodeId
+	}
+	return 0
+}
+
+func (x *NodeAction) GetRole() string {
+	if x != nil {
+		return x.Role
+	}
+	return ""
+}
+
+func (x *NodeAction) GetIsOn() bool {
+	if x != nil {
+		return x.IsOn
+	}
+	return false
+}
+
+func (x *NodeAction) GetCondsJSON() []byte {
+	if x != nil {
+		return x.CondsJSON
+	}
+	return nil
+}
+
+func (x *NodeAction) GetActionJSON() []byte {
+	if x != nil {
+		return x.ActionJSON
+	}
+	return nil
+}
+
+func (x *NodeAction) GetDurationJSON() []byte {
+	if x != nil {
+		return x.DurationJSON
+	}
+	return nil
+}
+
+var File_models_model_node_action_proto protoreflect.FileDescriptor
+
+var file_models_model_node_action_proto_rawDesc = []byte{
+	0x0a, 0x1e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e,
+	0x6f, 0x64, 0x65, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x12, 0x02, 0x70, 0x62, 0x22, 0xbe, 0x01, 0x0a, 0x0a, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x72,
+	0x6f, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12,
+	0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69,
+	0x73, 0x4f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x4a, 0x53, 0x4f, 0x4e,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x4a, 0x53, 0x4f,
+	0x4e, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4a, 0x53, 0x4f, 0x4e, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4a, 0x53, 0x4f,
+	0x4e, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4a, 0x53, 0x4f,
+	0x4e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x4a, 0x53, 0x4f, 0x4e, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_node_action_proto_rawDescOnce sync.Once
+	file_models_model_node_action_proto_rawDescData = file_models_model_node_action_proto_rawDesc
+)
+
+func file_models_model_node_action_proto_rawDescGZIP() []byte {
+	file_models_model_node_action_proto_rawDescOnce.Do(func() {
+		file_models_model_node_action_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_node_action_proto_rawDescData)
+	})
+	return file_models_model_node_action_proto_rawDescData
+}
+
+var file_models_model_node_action_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_node_action_proto_goTypes = []interface{}{
+	(*NodeAction)(nil), // 0: pb.NodeAction
+}
+var file_models_model_node_action_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_node_action_proto_init() }
+func file_models_model_node_action_proto_init() {
+	if File_models_model_node_action_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_node_action_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*NodeAction); 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_node_action_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_node_action_proto_goTypes,
+		DependencyIndexes: file_models_model_node_action_proto_depIdxs,
+		MessageInfos:      file_models_model_node_action_proto_msgTypes,
+	}.Build()
+	File_models_model_node_action_proto = out.File
+	file_models_model_node_action_proto_rawDesc = nil
+	file_models_model_node_action_proto_goTypes = nil
+	file_models_model_node_action_proto_depIdxs = nil
+}

pkg/rpc/pb/model_node_cluster.pb.go

@@ -39,6 +39,7 @@ type NodeCluster struct {
 	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"`
+	DnsDefaultRoute      string `protobuf:"bytes,22,opt,name=dnsDefaultRoute,proto3" json:"dnsDefaultRoute,omitempty"` // DNS默认线路
 	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"`
@@ -46,6 +47,10 @@ type NodeCluster struct {
 	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"`
+	ClockJSON            []byte `protobuf:"bytes,18,opt,name=clockJSON,proto3" json:"clockJSON,omitempty"`
+	AutoRemoteStart      bool   `protobuf:"varint,19,opt,name=autoRemoteStart,proto3" json:"autoRemoteStart,omitempty"`
+	AutoInstallNftables  bool   `protobuf:"varint,20,opt,name=autoInstallNftables,proto3" json:"autoInstallNftables,omitempty"`
+	SshParamsJSON        []byte `protobuf:"bytes,21,opt,name=sshParamsJSON,proto3" json:"sshParamsJSON,omitempty"`
 }
 
 func (x *NodeCluster) Reset() {
@@ -143,6 +148,13 @@ func (x *NodeCluster) GetDnsDomainId() int64 {
 	return 0
 }
 
+func (x *NodeCluster) GetDnsDefaultRoute() string {
+	if x != nil {
+		return x.DnsDefaultRoute
+	}
+	return ""
+}
+
 func (x *NodeCluster) GetHttpCachePolicyId() int64 {
 	if x != nil {
 		return x.HttpCachePolicyId
@@ -192,12 +204,40 @@ func (x *NodeCluster) GetIsPinned() bool {
 	return false
 }
 
+func (x *NodeCluster) GetClockJSON() []byte {
+	if x != nil {
+		return x.ClockJSON
+	}
+	return nil
+}
+
+func (x *NodeCluster) GetAutoRemoteStart() bool {
+	if x != nil {
+		return x.AutoRemoteStart
+	}
+	return false
+}
+
+func (x *NodeCluster) GetAutoInstallNftables() bool {
+	if x != nil {
+		return x.AutoInstallNftables
+	}
+	return false
+}
+
+func (x *NodeCluster) GetSshParamsJSON() []byte {
+	if x != nil {
+		return x.SshParamsJSON
+	}
+	return nil
+}
+
 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, 0xfd, 0x03, 0x0a, 0x0b, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c,
+	0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xc7, 0x05, 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,
@@ -213,24 +253,36 @@ var file_models_model_node_cluster_proto_rawDesc = []byte{
 	0x07, 0x64, 0x6e, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
 	0x64, 0x6e, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x6e, 0x73, 0x44, 0x6f,
 	0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x64, 0x6e,
-	0x73, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x68, 0x74, 0x74,
-	0x70, 0x43, 0x61, 0x63, 0x68, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x64, 0x18, 0x0a,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x68, 0x74, 0x74, 0x70, 0x43, 0x61, 0x63, 0x68, 0x65, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x64, 0x12, 0x32, 0x0a, 0x14, 0x68, 0x74, 0x74, 0x70, 0x46,
-	0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x64, 0x18,
-	0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x14, 0x68, 0x74, 0x74, 0x70, 0x46, 0x69, 0x72, 0x65, 0x77,
-	0x61, 0x6c, 0x6c, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69,
-	0x73, 0x4f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12,
-	0x1a, 0x0a, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x5a, 0x6f, 0x6e, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28,
-	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, 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,
+	0x73, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x64, 0x6e, 0x73,
+	0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x18, 0x16, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0f, 0x64, 0x6e, 0x73, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x6f,
+	0x75, 0x74, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x68, 0x74, 0x74, 0x70, 0x43, 0x61, 0x63, 0x68, 0x65,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11,
+	0x68, 0x74, 0x74, 0x70, 0x43, 0x61, 0x63, 0x68, 0x65, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49,
+	0x64, 0x12, 0x32, 0x0a, 0x14, 0x68, 0x74, 0x74, 0x70, 0x46, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c,
+	0x6c, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x49, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x14, 0x68, 0x74, 0x74, 0x70, 0x46, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x50, 0x6f, 0x6c,
+	0x69, 0x63, 0x79, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x0c, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x69, 0x6d,
+	0x65, 0x5a, 0x6f, 0x6e, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 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, 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, 0x12,
+	0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x12, 0x20, 0x01,
+	0x28, 0x0c, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x28, 0x0a,
+	0x0f, 0x61, 0x75, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74,
+	0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x61, 0x75, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f,
+	0x74, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x12, 0x30, 0x0a, 0x13, 0x61, 0x75, 0x74, 0x6f, 0x49,
+	0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x4e, 0x66, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x14,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x61, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c,
+	0x6c, 0x4e, 0x66, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x73, 0x68,
+	0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0c,
+	0x52, 0x0d, 0x73, 0x73, 0x68, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pkg/rpc/pb/model_node_ip_address.pb.go

@@ -31,19 +31,20 @@ type NodeIPAddress struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id          int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	NodeId      int64  `protobuf:"varint,2,opt,name=nodeId,proto3" json:"nodeId,omitempty"`
-	Name        string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-	Ip          string `protobuf:"bytes,4,opt,name=ip,proto3" json:"ip,omitempty"`
-	Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"`
-	State       int64  `protobuf:"varint,6,opt,name=state,proto3" json:"state,omitempty"`
-	Order       int64  `protobuf:"varint,7,opt,name=order,proto3" json:"order,omitempty"`
-	CanAccess   bool   `protobuf:"varint,8,opt,name=canAccess,proto3" json:"canAccess,omitempty"`
-	IsOn        bool   `protobuf:"varint,9,opt,name=isOn,proto3" json:"isOn,omitempty"`
-	IsUp        bool   `protobuf:"varint,10,opt,name=isUp,proto3" json:"isUp,omitempty"`
-	Role        string `protobuf:"bytes,12,opt,name=role,proto3" json:"role,omitempty"`
-	BackupIP    string `protobuf:"bytes,13,opt,name=backupIP,proto3" json:"backupIP,omitempty"`
-	IsHealthy   bool   `protobuf:"varint,14,opt,name=isHealthy,proto3" json:"isHealthy,omitempty"`
+	Id           int64          `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	NodeId       int64          `protobuf:"varint,2,opt,name=nodeId,proto3" json:"nodeId,omitempty"`
+	Name         string         `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	Ip           string         `protobuf:"bytes,4,opt,name=ip,proto3" json:"ip,omitempty"`
+	Description  string         `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"`
+	State        int64          `protobuf:"varint,6,opt,name=state,proto3" json:"state,omitempty"`
+	Order        int64          `protobuf:"varint,7,opt,name=order,proto3" json:"order,omitempty"`
+	CanAccess    bool           `protobuf:"varint,8,opt,name=canAccess,proto3" json:"canAccess,omitempty"`
+	IsOn         bool           `protobuf:"varint,9,opt,name=isOn,proto3" json:"isOn,omitempty"`
+	IsUp         bool           `protobuf:"varint,10,opt,name=isUp,proto3" json:"isUp,omitempty"`
+	Role         string         `protobuf:"bytes,12,opt,name=role,proto3" json:"role,omitempty"`
+	BackupIP     string         `protobuf:"bytes,13,opt,name=backupIP,proto3" json:"backupIP,omitempty"`
+	IsHealthy    bool           `protobuf:"varint,14,opt,name=isHealthy,proto3" json:"isHealthy,omitempty"`
+	NodeClusters []*NodeCluster `protobuf:"bytes,30,rep,name=nodeClusters,proto3" json:"nodeClusters,omitempty"`
 }
 
 func (x *NodeIPAddress) Reset() {
@@ -169,33 +170,45 @@ func (x *NodeIPAddress) GetIsHealthy() bool {
 	return false
 }
 
+func (x *NodeIPAddress) GetNodeClusters() []*NodeCluster {
+	if x != nil {
+		return x.NodeClusters
+	}
+	return nil
+}
+
 var File_models_model_node_ip_address_proto protoreflect.FileDescriptor
 
 var file_models_model_node_ip_address_proto_rawDesc = []byte{
 	0x0a, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e,
 	0x6f, 0x64, 0x65, 0x5f, 0x69, 0x70, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xbd, 0x02, 0x0a, 0x0d, 0x4e, 0x6f, 0x64,
-	0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f,
-	0x64, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65,
-	0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74,
-	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x14,
-	0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6f,
-	0x72, 0x64, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65,
-	0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x55, 0x70, 0x18, 0x0a,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x55, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f,
-	0x6c, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x1a,
-	0x0a, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x49, 0x50, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x49, 0x50, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73,
-	0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69,
-	0x73, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 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, 0x22, 0xf2, 0x02, 0x0a, 0x0d, 0x4e, 0x6f,
+	0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e,
+	0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x6f, 0x64,
+	0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61,
+	0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12,
+	0x14, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+	0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65,
+	0x73, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63,
+	0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x55, 0x70, 0x18,
+	0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x55, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x72,
+	0x6f, 0x6c, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12,
+	0x1a, 0x0a, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x49, 0x50, 0x18, 0x0d, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x49, 0x50, 0x12, 0x1c, 0x0a, 0x09, 0x69,
+	0x73, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09,
+	0x69, 0x73, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x12, 0x33, 0x0a, 0x0c, 0x6e, 0x6f, 0x64,
+	0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x1e, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x52, 0x0c, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x42, 0x06,
+	0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -213,13 +226,15 @@ func file_models_model_node_ip_address_proto_rawDescGZIP() []byte {
 var file_models_model_node_ip_address_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_models_model_node_ip_address_proto_goTypes = []interface{}{
 	(*NodeIPAddress)(nil), // 0: pb.NodeIPAddress
+	(*NodeCluster)(nil),   // 1: pb.NodeCluster
 }
 var file_models_model_node_ip_address_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
+	1, // 0: pb.NodeIPAddress.nodeClusters:type_name -> pb.NodeCluster
+	1, // [1:1] is the sub-list for method output_type
+	1, // [1:1] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
 }
 
 func init() { file_models_model_node_ip_address_proto_init() }
@@ -227,6 +242,7 @@ func file_models_model_node_ip_address_proto_init() {
 	if File_models_model_node_ip_address_proto != nil {
 		return
 	}
+	file_models_model_node_cluster_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_models_model_node_ip_address_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*NodeIPAddress); i {

pkg/rpc/pb/model_node_task.pb.go

@@ -40,6 +40,7 @@ type NodeTask struct {
 	Version     int64        `protobuf:"varint,7,opt,name=version,proto3" json:"version,omitempty"`
 	IsPrimary   bool         `protobuf:"varint,8,opt,name=isPrimary,proto3" json:"isPrimary,omitempty"` // 是否为主节点，非主节点稍等再同步有利于提升同步速度
 	ServerId    int64        `protobuf:"varint,9,opt,name=serverId,proto3" json:"serverId,omitempty"`
+	UserId      int64        `protobuf:"varint,10,opt,name=userId,proto3" json:"userId,omitempty"`
 	Node        *Node        `protobuf:"bytes,30,opt,name=node,proto3" json:"node,omitempty"`
 	NodeCluster *NodeCluster `protobuf:"bytes,31,opt,name=nodeCluster,proto3" json:"nodeCluster,omitempty"`
 	Server      *NodeCluster `protobuf:"bytes,32,opt,name=server,proto3" json:"server,omitempty"`
@@ -140,6 +141,13 @@ func (x *NodeTask) GetServerId() int64 {
 	return 0
 }
 
+func (x *NodeTask) GetUserId() int64 {
+	if x != nil {
+		return x.UserId
+	}
+	return 0
+}
+
 func (x *NodeTask) GetNode() *Node {
 	if x != nil {
 		return x.Node
@@ -169,7 +177,7 @@ var file_models_model_node_task_proto_rawDesc = []byte{
 	0x70, 0x62, 0x1a, 0x17, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c,
 	0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 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, 0x22, 0xdc, 0x02, 0x0a,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf4, 0x02, 0x0a,
 	0x08, 0x4e, 0x6f, 0x64, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70,
 	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a,
@@ -184,15 +192,17 @@ var file_models_model_node_task_proto_rawDesc = []byte{
 	0x6d, 0x61, 0x72, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x50, 0x72,
 	0x69, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49,
 	0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49,
-	0x64, 0x12, 0x1c, 0x0a, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x08, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x12,
-	0x31, 0x0a, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x1f,
-	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, 0x27, 0x0a, 0x06, 0x73, 0x65, 0x72, 0x76, 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, 0x06, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x42, 0x06, 0x5a, 0x04, 0x2e,
-	0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x04, 0x6e, 0x6f, 0x64,
+	0x65, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64,
+	0x65, 0x52, 0x04, 0x6e, 0x6f, 0x64, 0x65, 0x12, 0x31, 0x0a, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x1f, 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, 0x27, 0x0a, 0x06, 0x73, 0x65,
+	0x72, 0x76, 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, 0x06, 0x73, 0x65, 0x72,
+	0x76, 0x65, 0x72, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (

pkg/rpc/pb/model_ns_cluster.pb.go

@@ -31,13 +31,22 @@ type NSCluster 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"`
-	Name       string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-	InstallDir string `protobuf:"bytes,4,opt,name=installDir,proto3" json:"installDir,omitempty"`
-	TcpJSON    []byte `protobuf:"bytes,5,opt,name=tcpJSON,proto3" json:"tcpJSON,omitempty"`
-	TlsJSON    []byte `protobuf:"bytes,6,opt,name=tlsJSON,proto3" json:"tlsJSON,omitempty"`
-	UdpJSON    []byte `protobuf:"bytes,7,opt,name=udpJSON,proto3" json:"udpJSON,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"`
+	Name            string   `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	InstallDir      string   `protobuf:"bytes,4,opt,name=installDir,proto3" json:"installDir,omitempty"`
+	TcpJSON         []byte   `protobuf:"bytes,5,opt,name=tcpJSON,proto3" json:"tcpJSON,omitempty"`  // TCP设置
+	TlsJSON         []byte   `protobuf:"bytes,6,opt,name=tlsJSON,proto3" json:"tlsJSON,omitempty"`  // TLS设置
+	UdpJSON         []byte   `protobuf:"bytes,7,opt,name=udpJSON,proto3" json:"udpJSON,omitempty"`  // UDP设置
+	DohJSON         []byte   `protobuf:"bytes,16,opt,name=dohJSON,proto3" json:"dohJSON,omitempty"` // DoH设置
+	Hosts           []string `protobuf:"bytes,8,rep,name=hosts,proto3" json:"hosts,omitempty"`
+	SoaJSON         []byte   `protobuf:"bytes,12,opt,name=soaJSON,proto3" json:"soaJSON,omitempty"`
+	Email           string   `protobuf:"bytes,13,opt,name=email,proto3" json:"email,omitempty"`
+	AutoRemoteStart bool     `protobuf:"varint,9,opt,name=autoRemoteStart,proto3" json:"autoRemoteStart,omitempty"`
+	TimeZone        string   `protobuf:"bytes,10,opt,name=timeZone,proto3" json:"timeZone,omitempty"`
+	AnswerJSON      []byte   `protobuf:"bytes,11,opt,name=answerJSON,proto3" json:"answerJSON,omitempty"`
+	DetectAgents    bool     `protobuf:"varint,14,opt,name=detectAgents,proto3" json:"detectAgents,omitempty"`
+	CheckingPorts   bool     `protobuf:"varint,15,opt,name=checkingPorts,proto3" json:"checkingPorts,omitempty"` // 检查端口连通性
 }
 
 func (x *NSCluster) Reset() {
@@ -121,12 +130,75 @@ func (x *NSCluster) GetUdpJSON() []byte {
 	return nil
 }
 
+func (x *NSCluster) GetDohJSON() []byte {
+	if x != nil {
+		return x.DohJSON
+	}
+	return nil
+}
+
+func (x *NSCluster) GetHosts() []string {
+	if x != nil {
+		return x.Hosts
+	}
+	return nil
+}
+
+func (x *NSCluster) GetSoaJSON() []byte {
+	if x != nil {
+		return x.SoaJSON
+	}
+	return nil
+}
+
+func (x *NSCluster) GetEmail() string {
+	if x != nil {
+		return x.Email
+	}
+	return ""
+}
+
+func (x *NSCluster) GetAutoRemoteStart() bool {
+	if x != nil {
+		return x.AutoRemoteStart
+	}
+	return false
+}
+
+func (x *NSCluster) GetTimeZone() string {
+	if x != nil {
+		return x.TimeZone
+	}
+	return ""
+}
+
+func (x *NSCluster) GetAnswerJSON() []byte {
+	if x != nil {
+		return x.AnswerJSON
+	}
+	return nil
+}
+
+func (x *NSCluster) GetDetectAgents() bool {
+	if x != nil {
+		return x.DetectAgents
+	}
+	return false
+}
+
+func (x *NSCluster) GetCheckingPorts() bool {
+	if x != nil {
+		return x.CheckingPorts
+	}
+	return false
+}
+
 var File_models_model_ns_cluster_proto protoreflect.FileDescriptor
 
 var file_models_model_ns_cluster_proto_rawDesc = []byte{
 	0x0a, 0x1d, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e,
 	0x73, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x02, 0x70, 0x62, 0x22, 0xb1, 0x01, 0x0a, 0x09, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
+	0x02, 0x70, 0x62, 0x22, 0xc1, 0x03, 0x0a, 0x09, 0x4e, 0x53, 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, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
 	0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20,
@@ -137,7 +209,24 @@ var file_models_model_ns_cluster_proto_rawDesc = []byte{
 	0x53, 0x4f, 0x4e, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x6c, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x06,
 	0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x74, 0x6c, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x18, 0x0a,
 	0x07, 0x75, 0x64, 0x70, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07,
-	0x75, 0x64, 0x70, 0x4a, 0x53, 0x4f, 0x4e, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62,
+	0x75, 0x64, 0x70, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x6f, 0x68, 0x4a, 0x53,
+	0x4f, 0x4e, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x64, 0x6f, 0x68, 0x4a, 0x53, 0x4f,
+	0x4e, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x05, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6f, 0x61, 0x4a, 0x53,
+	0x4f, 0x4e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x73, 0x6f, 0x61, 0x4a, 0x53, 0x4f,
+	0x4e, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x61, 0x75, 0x74, 0x6f, 0x52,
+	0x65, 0x6d, 0x6f, 0x74, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0f, 0x61, 0x75, 0x74, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x53, 0x74, 0x61, 0x72,
+	0x74, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x5a, 0x6f, 0x6e, 0x65, 0x18, 0x0a, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x69, 0x6d, 0x65, 0x5a, 0x6f, 0x6e, 0x65, 0x12, 0x1e, 0x0a,
+	0x0a, 0x61, 0x6e, 0x73, 0x77, 0x65, 0x72, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x0b, 0x20, 0x01, 0x28,
+	0x0c, 0x52, 0x0a, 0x61, 0x6e, 0x73, 0x77, 0x65, 0x72, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x22, 0x0a,
+	0x0c, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x0e, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0c, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x41, 0x67, 0x65, 0x6e, 0x74,
+	0x73, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x72,
+	0x74, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x69,
+	0x6e, 0x67, 0x50, 0x6f, 0x72, 0x74, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62,
 	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 

pkg/rpc/pb/model_ns_domain.pb.go

@@ -31,17 +31,20 @@ type NSDomain 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"`
-	CreatedAt        int64            `protobuf:"varint,4,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
-	IsDeleted        bool             `protobuf:"varint,5,opt,name=isDeleted,proto3" json:"isDeleted,omitempty"`
-	Version          int64            `protobuf:"varint,6,opt,name=version,proto3" json:"version,omitempty"`
-	TsigJSON         []byte           `protobuf:"bytes,7,opt,name=tsigJSON,proto3" json:"tsigJSON,omitempty"`
-	NsDomainGroupIds []int64          `protobuf:"varint,8,rep,packed,name=nsDomainGroupIds,proto3" json:"nsDomainGroupIds,omitempty"`
-	NsCluster        *NSCluster       `protobuf:"bytes,30,opt,name=nsCluster,proto3" json:"nsCluster,omitempty"`
-	User             *User            `protobuf:"bytes,31,opt,name=user,proto3" json:"user,omitempty"`
-	NsDomainGroups   []*NSDomainGroup `protobuf:"bytes,32,rep,name=nsDomainGroups,proto3" json:"nsDomainGroups,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"`
+	CreatedAt              int64            `protobuf:"varint,4,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
+	IsDeleted              bool             `protobuf:"varint,5,opt,name=isDeleted,proto3" json:"isDeleted,omitempty"`
+	Version                int64            `protobuf:"varint,6,opt,name=version,proto3" json:"version,omitempty"`
+	TsigJSON               []byte           `protobuf:"bytes,7,opt,name=tsigJSON,proto3" json:"tsigJSON,omitempty"`
+	NsDomainGroupIds       []int64          `protobuf:"varint,8,rep,packed,name=nsDomainGroupIds,proto3" json:"nsDomainGroupIds,omitempty"`
+	Status                 string           `protobuf:"bytes,9,opt,name=status,proto3" json:"status,omitempty"`
+	UserId                 int64            `protobuf:"varint,10,opt,name=userId,proto3" json:"userId,omitempty"`                                // 用户ID
+	RecordsHealthCheckJSON []byte           `protobuf:"bytes,11,opt,name=recordsHealthCheckJSON,proto3" json:"recordsHealthCheckJSON,omitempty"` // 健康检查设置
+	NsCluster              *NSCluster       `protobuf:"bytes,30,opt,name=nsCluster,proto3" json:"nsCluster,omitempty"`
+	User                   *User            `protobuf:"bytes,31,opt,name=user,proto3" json:"user,omitempty"`
+	NsDomainGroups         []*NSDomainGroup `protobuf:"bytes,32,rep,name=nsDomainGroups,proto3" json:"nsDomainGroups,omitempty"`
 }
 
 func (x *NSDomain) Reset() {
@@ -132,6 +135,27 @@ func (x *NSDomain) GetNsDomainGroupIds() []int64 {
 	return nil
 }
 
+func (x *NSDomain) GetStatus() string {
+	if x != nil {
+		return x.Status
+	}
+	return ""
+}
+
+func (x *NSDomain) GetUserId() int64 {
+	if x != nil {
+		return x.UserId
+	}
+	return 0
+}
+
+func (x *NSDomain) GetRecordsHealthCheckJSON() []byte {
+	if x != nil {
+		return x.RecordsHealthCheckJSON
+	}
+	return nil
+}
+
 func (x *NSDomain) GetNsCluster() *NSCluster {
 	if x != nil {
 		return x.NsCluster
@@ -163,8 +187,8 @@ var file_models_model_ns_domain_proto_rawDesc = []byte{
 	0x6f, 0x1a, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f,
 	0x6e, 0x73, 0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 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, 0x22, 0xe6,
-	0x02, 0x0a, 0x08, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x64, 0x65, 0x6c, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xce,
+	0x03, 0x0a, 0x08, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 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,
@@ -178,16 +202,22 @@ var file_models_model_ns_domain_proto_rawDesc = []byte{
 	0x67, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x2a, 0x0a, 0x10, 0x6e, 0x73, 0x44, 0x6f, 0x6d, 0x61, 0x69,
 	0x6e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x03, 0x52,
 	0x10, 0x6e, 0x73, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64,
-	0x73, 0x12, 0x2b, 0x0a, 0x09, 0x6e, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x1e,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x52, 0x09, 0x6e, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c,
-	0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x70,
-	0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x39, 0x0a, 0x0e,
-	0x6e, 0x73, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x20,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61,
-	0x69, 0x6e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x6e, 0x73, 0x44, 0x6f, 0x6d, 0x61, 0x69,
-	0x6e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65,
+	0x72, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49,
+	0x64, 0x12, 0x36, 0x0a, 0x16, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x48, 0x65, 0x61, 0x6c,
+	0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x0b, 0x20, 0x01, 0x28,
+	0x0c, 0x52, 0x16, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68,
+	0x43, 0x68, 0x65, 0x63, 0x6b, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x2b, 0x0a, 0x09, 0x6e, 0x73, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70,
+	0x62, 0x2e, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x09, 0x6e, 0x73, 0x43,
+	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x1f,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04,
+	0x75, 0x73, 0x65, 0x72, 0x12, 0x39, 0x0a, 0x0e, 0x6e, 0x73, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e,
+	0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x18, 0x20, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70,
+	0x62, 0x2e, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52,
+	0x0e, 0x6e, 0x73, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x42,
+	0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pkg/rpc/pb/model_ns_node.pb.go

@@ -31,19 +31,21 @@ type NSNode 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"`
-	UniqueId      string             `protobuf:"bytes,4,opt,name=uniqueId,proto3" json:"uniqueId,omitempty"`
-	Secret        string             `protobuf:"bytes,5,opt,name=secret,proto3" json:"secret,omitempty"`
-	StatusJSON    []byte             `protobuf:"bytes,6,opt,name=statusJSON,proto3" json:"statusJSON,omitempty"`
-	IsInstalled   bool               `protobuf:"varint,7,opt,name=isInstalled,proto3" json:"isInstalled,omitempty"`
-	InstallDir    string             `protobuf:"bytes,9,opt,name=installDir,proto3" json:"installDir,omitempty"`
-	IsUp          bool               `protobuf:"varint,8,opt,name=isUp,proto3" json:"isUp,omitempty"`
-	IsActive      bool               `protobuf:"varint,10,opt,name=isActive,proto3" json:"isActive,omitempty"`
-	NsCluster     *NSCluster         `protobuf:"bytes,32,opt,name=nsCluster,proto3" json:"nsCluster,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"`
+	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"`
+	UniqueId            string             `protobuf:"bytes,4,opt,name=uniqueId,proto3" json:"uniqueId,omitempty"`
+	Secret              string             `protobuf:"bytes,5,opt,name=secret,proto3" json:"secret,omitempty"`
+	StatusJSON          []byte             `protobuf:"bytes,6,opt,name=statusJSON,proto3" json:"statusJSON,omitempty"`
+	IsInstalled         bool               `protobuf:"varint,7,opt,name=isInstalled,proto3" json:"isInstalled,omitempty"`
+	InstallDir          string             `protobuf:"bytes,9,opt,name=installDir,proto3" json:"installDir,omitempty"`
+	IsUp                bool               `protobuf:"varint,8,opt,name=isUp,proto3" json:"isUp,omitempty"`
+	IsActive            bool               `protobuf:"varint,10,opt,name=isActive,proto3" json:"isActive,omitempty"`
+	ConnectedAPINodeIds []int64            `protobuf:"varint,11,rep,packed,name=connectedAPINodeIds,proto3" json:"connectedAPINodeIds,omitempty"`
+	ApiNodeAddrsJSON    []byte             `protobuf:"bytes,12,opt,name=apiNodeAddrsJSON,proto3" json:"apiNodeAddrsJSON,omitempty"`
+	NsCluster           *NSCluster         `protobuf:"bytes,32,opt,name=nsCluster,proto3" json:"nsCluster,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"`
 }
 
 func (x *NSNode) Reset() {
@@ -148,6 +150,20 @@ func (x *NSNode) GetIsActive() bool {
 	return false
 }
 
+func (x *NSNode) GetConnectedAPINodeIds() []int64 {
+	if x != nil {
+		return x.ConnectedAPINodeIds
+	}
+	return nil
+}
+
+func (x *NSNode) GetApiNodeAddrsJSON() []byte {
+	if x != nil {
+		return x.ApiNodeAddrsJSON
+	}
+	return nil
+}
+
 func (x *NSNode) GetNsCluster() *NSCluster {
 	if x != nil {
 		return x.NsCluster
@@ -180,7 +196,7 @@ var file_models_model_ns_node_proto_rawDesc = []byte{
 	0x64, 0x65, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75,
 	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f,
 	0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x6c, 0x6f, 0x67, 0x69, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9d, 0x03, 0x0a, 0x06, 0x4e, 0x53, 0x4e, 0x6f, 0x64,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfb, 0x03, 0x0a, 0x06, 0x4e, 0x53, 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,
@@ -197,17 +213,23 @@ var file_models_model_ns_node_proto_rawDesc = []byte{
 	0x12, 0x0a, 0x04, 0x69, 0x73, 0x55, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69,
 	0x73, 0x55, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x18,
 	0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x12,
-	0x2b, 0x0a, 0x09, 0x6e, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x20, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x52, 0x09, 0x6e, 0x73, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x30, 0x0a, 0x13, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x41, 0x50, 0x49, 0x4e,
+	0x6f, 0x64, 0x65, 0x49, 0x64, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x03, 0x52, 0x13, 0x63, 0x6f,
+	0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x41, 0x50, 0x49, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64,
+	0x73, 0x12, 0x2a, 0x0a, 0x10, 0x61, 0x70, 0x69, 0x4e, 0x6f, 0x64, 0x65, 0x41, 0x64, 0x64, 0x72,
+	0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x10, 0x61, 0x70, 0x69,
+	0x4e, 0x6f, 0x64, 0x65, 0x41, 0x64, 0x64, 0x72, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x2b, 0x0a,
+	0x09, 0x6e, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x20, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0d, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x53, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52,
+	0x09, 0x6e, 0x73, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pkg/rpc/pb/model_ns_plan.pb.go

@@ -0,0 +1,195 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_ns_plan.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 NSPlan struct {
+	state         protoimpl.MessageState
+	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"`
+	MonthlyPrice float32 `protobuf:"fixed32,4,opt,name=monthlyPrice,proto3" json:"monthlyPrice,omitempty"`
+	YearlyPrice  float32 `protobuf:"fixed32,5,opt,name=yearlyPrice,proto3" json:"yearlyPrice,omitempty"`
+	ConfigJSON   []byte  `protobuf:"bytes,6,opt,name=configJSON,proto3" json:"configJSON,omitempty"`
+}
+
+func (x *NSPlan) Reset() {
+	*x = NSPlan{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_ns_plan_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *NSPlan) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*NSPlan) ProtoMessage() {}
+
+func (x *NSPlan) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_ns_plan_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 NSPlan.ProtoReflect.Descriptor instead.
+func (*NSPlan) Descriptor() ([]byte, []int) {
+	return file_models_model_ns_plan_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *NSPlan) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *NSPlan) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *NSPlan) GetIsOn() bool {
+	if x != nil {
+		return x.IsOn
+	}
+	return false
+}
+
+func (x *NSPlan) GetMonthlyPrice() float32 {
+	if x != nil {
+		return x.MonthlyPrice
+	}
+	return 0
+}
+
+func (x *NSPlan) GetYearlyPrice() float32 {
+	if x != nil {
+		return x.YearlyPrice
+	}
+	return 0
+}
+
+func (x *NSPlan) GetConfigJSON() []byte {
+	if x != nil {
+		return x.ConfigJSON
+	}
+	return nil
+}
+
+var File_models_model_ns_plan_proto protoreflect.FileDescriptor
+
+var file_models_model_ns_plan_proto_rawDesc = []byte{
+	0x0a, 0x1a, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e,
+	0x73, 0x5f, 0x70, 0x6c, 0x61, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62,
+	0x22, 0xa6, 0x01, 0x0a, 0x06, 0x4e, 0x53, 0x50, 0x6c, 0x61, 0x6e, 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, 0x22, 0x0a, 0x0c, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, 0x79, 0x50, 0x72,
+	0x69, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c, 0x6d, 0x6f, 0x6e, 0x74, 0x68,
+	0x6c, 0x79, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x79, 0x65, 0x61, 0x72, 0x6c,
+	0x79, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0b, 0x79, 0x65,
+	0x61, 0x72, 0x6c, 0x79, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4a, 0x53, 0x4f, 0x4e, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70,
+	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_ns_plan_proto_rawDescOnce sync.Once
+	file_models_model_ns_plan_proto_rawDescData = file_models_model_ns_plan_proto_rawDesc
+)
+
+func file_models_model_ns_plan_proto_rawDescGZIP() []byte {
+	file_models_model_ns_plan_proto_rawDescOnce.Do(func() {
+		file_models_model_ns_plan_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_ns_plan_proto_rawDescData)
+	})
+	return file_models_model_ns_plan_proto_rawDescData
+}
+
+var file_models_model_ns_plan_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_ns_plan_proto_goTypes = []interface{}{
+	(*NSPlan)(nil), // 0: pb.NSPlan
+}
+var file_models_model_ns_plan_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_ns_plan_proto_init() }
+func file_models_model_ns_plan_proto_init() {
+	if File_models_model_ns_plan_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_ns_plan_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*NSPlan); 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_ns_plan_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_ns_plan_proto_goTypes,
+		DependencyIndexes: file_models_model_ns_plan_proto_depIdxs,
+		MessageInfos:      file_models_model_ns_plan_proto_msgTypes,
+	}.Build()
+	File_models_model_ns_plan_proto = out.File
+	file_models_model_ns_plan_proto_rawDesc = nil
+	file_models_model_ns_plan_proto_goTypes = nil
+	file_models_model_ns_plan_proto_depIdxs = nil
+}

pkg/rpc/pb/model_ns_record.pb.go

@@ -31,19 +31,27 @@ type NSRecord struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id          int64      `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
-	Description string     `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
-	Name        string     `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-	Type        string     `protobuf:"bytes,4,opt,name=type,proto3" json:"type,omitempty"`
-	Value       string     `protobuf:"bytes,5,opt,name=value,proto3" json:"value,omitempty"`
-	Ttl         int32      `protobuf:"varint,6,opt,name=ttl,proto3" json:"ttl,omitempty"`
-	Weight      int32      `protobuf:"varint,7,opt,name=weight,proto3" json:"weight,omitempty"`
-	CreatedAt   int64      `protobuf:"varint,8,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
-	IsDeleted   bool       `protobuf:"varint,9,opt,name=isDeleted,proto3" json:"isDeleted,omitempty"`
-	Version     int64      `protobuf:"varint,10,opt,name=version,proto3" json:"version,omitempty"`
-	IsOn        bool       `protobuf:"varint,11,opt,name=isOn,proto3" json:"isOn,omitempty"`
-	NsDomain    *NSDomain  `protobuf:"bytes,30,opt,name=nsDomain,proto3" json:"nsDomain,omitempty"`
-	NsRoutes    []*NSRoute `protobuf:"bytes,31,rep,name=nsRoutes,proto3" json:"nsRoutes,omitempty"`
+	Id              int64      `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`                    // 记录ID
+	Description     string     `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`   // 备注
+	Name            string     `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`                 // 记录名
+	Type            string     `protobuf:"bytes,4,opt,name=type,proto3" json:"type,omitempty"`                 // 记录类型
+	Value           string     `protobuf:"bytes,5,opt,name=value,proto3" json:"value,omitempty"`               // 记录值
+	MxPriority      int32      `protobuf:"varint,12,opt,name=mxPriority,proto3" json:"mxPriority,omitempty"`   // mx优先级
+	SrvPriority     int32      `protobuf:"varint,13,opt,name=srvPriority,proto3" json:"srvPriority,omitempty"` // SRV优先级
+	SrvWeight       int32      `protobuf:"varint,14,opt,name=srvWeight,proto3" json:"srvWeight,omitempty"`     // SRV权重
+	SrvPort         int32      `protobuf:"varint,15,opt,name=srvPort,proto3" json:"srvPort,omitempty"`         // SRV端口
+	CaaFlag         int32      `protobuf:"varint,16,opt,name=caaFlag,proto3" json:"caaFlag,omitempty"`         // CAA Flag
+	CaaTag          string     `protobuf:"bytes,17,opt,name=caaTag,proto3" json:"caaTag,omitempty"`            // CAA TAG
+	Ttl             int32      `protobuf:"varint,6,opt,name=ttl,proto3" json:"ttl,omitempty"`                  // TTL
+	Weight          int32      `protobuf:"varint,7,opt,name=weight,proto3" json:"weight,omitempty"`            // 权重
+	CreatedAt       int64      `protobuf:"varint,8,opt,name=createdAt,proto3" json:"createdAt,omitempty"`
+	IsDeleted       bool       `protobuf:"varint,9,opt,name=isDeleted,proto3" json:"isDeleted,omitempty"`
+	Version         int64      `protobuf:"varint,10,opt,name=version,proto3" json:"version,omitempty"`
+	IsOn            bool       `protobuf:"varint,11,opt,name=isOn,proto3" json:"isOn,omitempty"`                      // 是否启用
+	HealthCheckJSON []byte     `protobuf:"bytes,18,opt,name=healthCheckJSON,proto3" json:"healthCheckJSON,omitempty"` // 健康检查配置
+	IsUp            bool       `protobuf:"varint,19,opt,name=isUp,proto3" json:"isUp,omitempty"`                      // 是否在线（根据健康检查结果）
+	NsDomain        *NSDomain  `protobuf:"bytes,30,opt,name=nsDomain,proto3" json:"nsDomain,omitempty"`               // 所属域名
+	NsRoutes        []*NSRoute `protobuf:"bytes,31,rep,name=nsRoutes,proto3" json:"nsRoutes,omitempty"`               // 线路
 }
 
 func (x *NSRecord) Reset() {
@@ -113,6 +121,48 @@ func (x *NSRecord) GetValue() string {
 	return ""
 }
 
+func (x *NSRecord) GetMxPriority() int32 {
+	if x != nil {
+		return x.MxPriority
+	}
+	return 0
+}
+
+func (x *NSRecord) GetSrvPriority() int32 {
+	if x != nil {
+		return x.SrvPriority
+	}
+	return 0
+}
+
+func (x *NSRecord) GetSrvWeight() int32 {
+	if x != nil {
+		return x.SrvWeight
+	}
+	return 0
+}
+
+func (x *NSRecord) GetSrvPort() int32 {
+	if x != nil {
+		return x.SrvPort
+	}
+	return 0
+}
+
+func (x *NSRecord) GetCaaFlag() int32 {
+	if x != nil {
+		return x.CaaFlag
+	}
+	return 0
+}
+
+func (x *NSRecord) GetCaaTag() string {
+	if x != nil {
+		return x.CaaTag
+	}
+	return ""
+}
+
 func (x *NSRecord) GetTtl() int32 {
 	if x != nil {
 		return x.Ttl
@@ -155,6 +205,20 @@ func (x *NSRecord) GetIsOn() bool {
 	return false
 }
 
+func (x *NSRecord) GetHealthCheckJSON() []byte {
+	if x != nil {
+		return x.HealthCheckJSON
+	}
+	return nil
+}
+
+func (x *NSRecord) GetIsUp() bool {
+	if x != nil {
+		return x.IsUp
+	}
+	return false
+}
+
 func (x *NSRecord) GetNsDomain() *NSDomain {
 	if x != nil {
 		return x.NsDomain
@@ -177,7 +241,7 @@ var file_models_model_ns_record_proto_rawDesc = []byte{
 	0x70, 0x62, 0x1a, 0x1c, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c,
 	0x5f, 0x6e, 0x73, 0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x1a, 0x1b, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e,
-	0x73, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe1, 0x02,
+	0x73, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcb, 0x04,
 	0x0a, 0x08, 0x4e, 0x53, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65,
 	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
@@ -185,23 +249,37 @@ var file_models_model_ns_record_proto_rawDesc = []byte{
 	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
 	0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
 	0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74,
-	0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x16, 0x0a, 0x06,
-	0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x77, 0x65,
-	0x69, 0x67, 0x68, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41,
-	0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x41, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18,
-	0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64,
-	0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73,
-	0x4f, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x28,
-	0x0a, 0x08, 0x6e, 0x73, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x0c, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x08,
-	0x6e, 0x73, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x27, 0x0a, 0x08, 0x6e, 0x73, 0x52, 0x6f,
-	0x75, 0x74, 0x65, 0x73, 0x18, 0x1f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x2e,
-	0x4e, 0x53, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x52, 0x08, 0x6e, 0x73, 0x52, 0x6f, 0x75, 0x74, 0x65,
-	0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x78,
+	0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
+	0x6d, 0x78, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x72,
+	0x76, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0b, 0x73, 0x72, 0x76, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1c, 0x0a, 0x09,
+	0x73, 0x72, 0x76, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x09, 0x73, 0x72, 0x76, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x72,
+	0x76, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x72, 0x76,
+	0x50, 0x6f, 0x72, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x61, 0x61, 0x46, 0x6c, 0x61, 0x67, 0x18,
+	0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x61, 0x61, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x16,
+	0x0a, 0x06, 0x63, 0x61, 0x61, 0x54, 0x61, 0x67, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x63, 0x61, 0x61, 0x54, 0x61, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74, 0x6c, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67,
+	0x68, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74,
+	0x12, 0x1c, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x1c,
+	0x0a, 0x09, 0x69, 0x73, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x09, 0x69, 0x73, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x12, 0x18, 0x0a, 0x07,
+	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x76,
+	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x0b,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x28, 0x0a, 0x0f, 0x68, 0x65,
+	0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x12, 0x20,
+	0x01, 0x28, 0x0c, 0x52, 0x0f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b,
+	0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x55, 0x70, 0x18, 0x13, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x55, 0x70, 0x12, 0x28, 0x0a, 0x08, 0x6e, 0x73, 0x44, 0x6f,
+	0x6d, 0x61, 0x69, 0x6e, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62, 0x2e,
+	0x4e, 0x53, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x08, 0x6e, 0x73, 0x44, 0x6f, 0x6d, 0x61,
+	0x69, 0x6e, 0x12, 0x27, 0x0a, 0x08, 0x6e, 0x73, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x18, 0x1f,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x53, 0x52, 0x6f, 0x75, 0x74,
+	0x65, 0x52, 0x08, 0x6e, 0x73, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (