修复服务无法创建的Bug

.gitignore

@@ -0,0 +1,5 @@
+*_plus.go
+*-plus.sh
+*_plus.html
+*_plus.js
+*@plus.js

README.md

@@ -1,15 +1,20 @@
 # GoEdge目标
 做一款人人用得起的CDN & WAF系统。
 
-![架构](doc/screenshot.png)
+![截图](doc/screenshot.png)
 
 ## 特性
 * `免费` - 开源、免费、自由、开放
 * `简单` - 架构简单清晰，安装简单，使用简单，运维简单
 * `高扩展性` - 可以自由扩展新的节点，支持亿级数据
 
+## 在线演示
+* [http://demo.goedge.cn](http://demo.goedge.cn)
+
 ## 文档
-[点这里查看文档](http://edge.teaos.cn/docs)
+* [新手指南](https://edge.teaos.cn/docs/QuickStart/Index.md)
+* [完整文档](https://edge.teaos.cn/docs)
+* [开发者指南](https://edge.teaos.cn/docs/Developer/Build.md)
 
 ## 架构
 ![架构](doc/architect-zh.jpg)
@@ -23,4 +28,5 @@
 有什么问题和建议都可以加入QQ群 `659832182`。
 
 ## 感谢
-* 感谢[JetBrains公司](https://www.jetbrains.com/)提供免费的IDE开发Licence。
+* 感谢[JetBrains公司](https://www.jetbrains.com/)提供免费的IDE开发Licence。
+* 感谢[Gitee](https://gitee.com/)提供国内源代码托管平台

build/build-all.sh

@@ -1,5 +1,17 @@
 #!/usr/bin/env bash
 
+ROOT=$(dirname $0)
+
+# build all nodes
+if [ -f $ROOT"/../../EdgeNode/build/build-all-plus.sh" ]; then
+	echo "=============================="
+	echo "build all edge-node"
+	echo "=============================="
+	cd $ROOT"/../../EdgeNode/build"
+		./build-all-plus.sh
+	cd -
+fi
+
 ./build.sh linux amd64
 ./build.sh linux 386
 ./build.sh linux arm64

build/build-demo.sh

@@ -1,91 +0,0 @@
-#!/usr/bin/env bash
-
-function build() {
-	ROOT=$(dirname $0)
-	NAME="edge-admin"
-	DIST=$ROOT/"../dist/${NAME}"
-	OS=${1}
-	ARCH=${2}
-
-	if [ -z $OS ]; then
-		echo "usage: build.sh OS ARCH"
-		exit
-	fi
-	if [ -z $ARCH ]; then
-		echo "usage: build.sh OS ARCH"
-		exit
-	fi
-
-	VERSION=$(lookup-version $ROOT/../internal/const/const.go)
-	ZIP="${NAME}-${OS}-${ARCH}-v${VERSION}.zip"
-
-	# check edge-api
-	APINodeVersion=$(lookup-version $ROOT"/../../EdgeAPI/internal/const/const.go")
-	echo "building edge-api v${APINodeVersion} ..."
-	EDGE_API_BUILD_SCRIPT=$ROOT"/../../EdgeAPI/build/build.sh"
-	if [ ! -f $EDGE_API_BUILD_SCRIPT ]; then
-		echo "unable to find edge-api build script 'EdgeAPI/build/build.sh'"
-		exit
-	fi
-
-	cd $ROOT"/../../EdgeAPI/build"
-	echo "=============================="
-	./build.sh $OS $ARCH
-	echo "=============================="
-	cd -
-
-	# create dir & copy files
-	echo "copying ..."
-	if [ ! -d $DIST ]; then
-		mkdir $DIST
-		mkdir $DIST/bin
-		mkdir $DIST/configs
-		mkdir $DIST/logs
-	fi
-
-	cp -R $ROOT/../web $DIST/
-	rm -f $DIST/web/tmp/*
-	cp $ROOT/configs/server.template.yaml $DIST/configs/
-
-	EDGE_API_ZIP_FILE=$ROOT"/../../EdgeAPI/dist/edge-api-${OS}-${ARCH}-v${APINodeVersion}.zip"
-	cp $EDGE_API_ZIP_FILE $DIST/
-	cd $DIST/
-	unzip -q $(basename $EDGE_API_ZIP_FILE)
-	rm -f $(basename $EDGE_API_ZIP_FILE)
-	cd -
-
-	# build
-	echo "building "${NAME}" ..."
-	env GOOS=$OS GOARCH=$GOARCH go build -ldflags="-s -w" -tags demo -o $DIST/bin/${NAME} $ROOT/../cmd/edge-admin/main.go
-
-	# delete hidden files
-	find $DIST -name ".DS_Store" -delete
-	find $DIST -name ".gitignore" -delete
-
-	# zip
-	echo "zip files ..."
-	cd "${DIST}/../" || exit
-	if [ -f "${ZIP}" ]; then
-		rm -f "${ZIP}"
-	fi
-	zip -r -X -q "${ZIP}" ${NAME}/
-	rm -rf ${NAME}
-	cd - || exit
-
-	echo "[done]"
-}
-
-function lookup-version() {
-	FILE=$1
-	VERSION_DATA=$(cat $FILE)
-	re="Version[ ]+=[ ]+\"([0-9.]+)\""
-	if [[ $VERSION_DATA =~ $re ]]; then
-		VERSION=${BASH_REMATCH[1]}
-		echo $VERSION
-	else
-		echo "could not match version"
-		exit
-	fi
-}
-
-build $1 $2

build/build.sh

@@ -6,6 +6,7 @@ function build() {
 	DIST=$ROOT/"../dist/${NAME}"
 	OS=${1}
 	ARCH=${2}
+	TAG=${3}
 
 	if [ -z $OS ]; then
 		echo "usage: build.sh OS ARCH"
@@ -15,11 +16,14 @@ function build() {
 		echo "usage: build.sh OS ARCH"
 		exit
 	fi
+	if [ -z $TAG ]; then
+		TAG="community"
+	fi
 
 	VERSION=$(lookup-version $ROOT/../internal/const/const.go)
-	ZIP="${NAME}-${OS}-${ARCH}-v${VERSION}.zip"
+	ZIP="${NAME}-${OS}-${ARCH}-${TAG}-v${VERSION}.zip"
 
-	# check edge-api
+	# build edge-api
 	APINodeVersion=$(lookup-version $ROOT"/../../EdgeAPI/internal/const/const.go")
 	echo "building edge-api v${APINodeVersion} ..."
 	EDGE_API_BUILD_SCRIPT=$ROOT"/../../EdgeAPI/build/build.sh"
@@ -30,7 +34,7 @@ function build() {
 
 	cd $ROOT"/../../EdgeAPI/build"
 	echo "=============================="
-	./build.sh $OS $ARCH
+	./build.sh $OS $ARCH $TAG
 	echo "=============================="
 	cd -
 
@@ -47,20 +51,27 @@ function build() {
 	rm -f $DIST/web/tmp/*
 	cp $ROOT/configs/server.template.yaml $DIST/configs/
 
-	EDGE_API_ZIP_FILE=$ROOT"/../../EdgeAPI/dist/edge-api-${OS}-${ARCH}-v${APINodeVersion}.zip"
+	EDGE_API_ZIP_FILE=$ROOT"/../../EdgeAPI/dist/edge-api-${OS}-${ARCH}-${TAG}-v${APINodeVersion}.zip"
 	cp $EDGE_API_ZIP_FILE $DIST/
 	cd $DIST/
 	unzip -q $(basename $EDGE_API_ZIP_FILE)
 	rm -f $(basename $EDGE_API_ZIP_FILE)
 	cd -
 
+    # generate files
+    echo "generating files ..."
+	go run  -tags $TAG $ROOT/../cmd/edge-admin/main.go generate
+
 	# build
 	echo "building "${NAME}" ..."
-	env GOOS=$OS GOARCH=$GOARCH go build -ldflags="-s -w" -o $DIST/bin/${NAME} $ROOT/../cmd/edge-admin/main.go
+	env GOOS=$OS GOARCH=$ARCH go build -tags $TAG -ldflags="-s -w" -o $DIST/bin/${NAME} $ROOT/../cmd/edge-admin/main.go
 
 	# delete hidden files
 	find $DIST -name ".DS_Store" -delete
 	find $DIST -name ".gitignore" -delete
+	find $DIST -name "*.less" -delete
+	find $DIST -name "*.css.map" -delete
+	find $DIST -name "*.js.map" -delete
 
 	# zip
 	echo "zip files ..."
@@ -88,4 +99,4 @@ function lookup-version() {
 	fi
 }
 
-build $1 $2
+build $1 $2 $3

build/configs/.gitignore

@@ -1,4 +1,5 @@
 api.yaml
 server.yaml
 api_db.yaml
-*.pem
+*.pem
+*.cache.json

build/licenses/README.md

@@ -0,0 +1 @@
+这个目录下我们列举了所有需要公开声明的第三方License，如果有遗漏，烦请告知 iwind.liu@gmail.com。再次感谢这些开源软件项目和贡献人员！ 

build/licenses/miekg-dns.md

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

cmd/edge-admin/main.go

@@ -5,23 +5,26 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/apps"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/gen"
 	"github.com/TeaOSLab/EdgeAdmin/internal/nodes"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web"
 	_ "github.com/iwind/TeaGo/bootstrap"
+	"github.com/iwind/gosock/pkg/gosock"
 )
 
 func main() {
 	app := apps.NewAppCmd().
 		Version(teaconst.Version).
 		Product(teaconst.ProductName).
-		Usage(teaconst.ProcessName+" [-v|start|stop|restart|service|daemon|reset]").
+		Usage(teaconst.ProcessName+" [-v|start|stop|restart|service|daemon|reset|recover|demo]").
 		Option("-h", "show this help").
 		Option("-v", "show version").
 		Option("start", "start the service").
 		Option("stop", "stop the service").
 		Option("service", "register service into systemd").
 		Option("daemon", "start the service with daemon").
-		Option("reset", "reset configs")
+		Option("reset", "reset configs").
+		Option("recover", "enter recovery mode")
 
 	app.On("daemon", func() {
 		nodes.NewAdminNode().Daemon()
@@ -42,6 +45,39 @@ func main() {
 		}
 		fmt.Println("done")
 	})
+	app.On("recover", func() {
+		sock := gosock.NewTmpSock(teaconst.ProcessName)
+		if !sock.IsListening() {
+			fmt.Println("[ERROR]the service not started yet, you should start the service first")
+			return
+		}
+		_, err := sock.Send(&gosock.Command{Code: "recover"})
+		if err != nil {
+			fmt.Println("[ERROR]enter recovery mode failed: " + err.Error())
+			return
+		}
+		fmt.Println("enter recovery mode successfully")
+	})
+	app.On("demo", func() {
+		sock := gosock.NewTmpSock(teaconst.ProcessName)
+		if !sock.IsListening() {
+			fmt.Println("[ERROR]the service not started yet, you should start the service first")
+			return
+		}
+		_, err := sock.Send(&gosock.Command{Code: "demo"})
+		if err != nil {
+			fmt.Println("[ERROR]change demo mode failed: " + err.Error())
+			return
+		}
+		fmt.Println("change demo mode successfully")
+	})
+	app.On("generate", func() {
+		err := gen.Generate()
+		if err != nil {
+			fmt.Println("generate failed: " + err.Error())
+			return
+		}
+	})
 	app.Run(func() {
 		adminNode := nodes.NewAdminNode()
 		adminNode.Run()

go.mod

@@ -1,6 +1,6 @@
 module github.com/TeaOSLab/EdgeAdmin
 
-go 1.15
+go 1.16
 
 replace github.com/TeaOSLab/EdgeCommon => ../EdgeCommon
 
@@ -9,13 +9,18 @@ require (
 	github.com/cespare/xxhash v1.1.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/go-yaml/yaml v2.1.0+incompatible
-	github.com/iwind/TeaGo v0.0.0-20201206115018-cdd967bfb13d
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24
+	github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/miekg/dns v1.1.35
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/tealeg/xlsx/v3 v3.2.3
 	github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119
-	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c // indirect
-	google.golang.org/grpc v1.32.0
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
+	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
+	google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced // indirect
+	google.golang.org/grpc v1.38.0
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 )

go.sum

@@ -9,9 +9,11 @@ github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiU
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -19,6 +21,7 @@ github.com/dgryski/go-rendezvous v0.0.0-20200624174652-8d2f3be8b2d9/go.mod h1:cu
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/frankban/quicktest v1.5.0 h1:Tb4jWdSpdjKzTUicPnY61PZxKbDoGa7ABbrReT3gQVY=
 github.com/frankban/quicktest v1.5.0/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
@@ -41,23 +44,36 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iwind/TeaGo v0.0.0-20200923021120-f5d76441fe9e/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
-github.com/iwind/TeaGo v0.0.0-20201206115018-cdd967bfb13d h1:J4ohNUwOqCQkY62LFwaygfGtHJj+87pnzr+RJxEYSBo=
-github.com/iwind/TeaGo v0.0.0-20201206115018-cdd967bfb13d/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/iwind/TeaGo v0.0.0-20210831140440-a2a442471b13 h1:HuEJ5xJfujW1Q6rNDhOu5LQXEBB2qLPah3jYslT8Gz4=
+github.com/iwind/TeaGo v0.0.0-20210831140440-a2a442471b13/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24 h1:1cGulkD2SNJJRok5OKwyhP/Ddm+PgSWKOupn0cR36/A=
+github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3 h1:aBSonas7vFcgTj9u96/bWGILGv1ZbUSTLiOzcI1ZT6c=
+github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA=
+github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4 h1:VWGsCqTzObdlbf7UUE3oceIpcEKi4C/YBUszQXk118A=
+github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA=
 github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -65,12 +81,14 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs=
 github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -99,12 +117,14 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tealeg/xlsx/v3 v3.2.3 h1:MXnVh+9Y8cUglowItTy2HL3Kv6z+q/0aNjeKuTsVqZQ=
 github.com/tealeg/xlsx/v3 v3.2.3/go.mod h1:0hGmAEoZ48SS1ZAE6eqZJkJVXgOMY+8a33vjXa8S8HA=
 github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119 h1:YyPWX3jLOtYKulBR6AScGIs74lLrJcgeKRwcbAuQOG4=
 github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119/go.mod h1:/nuTSlK+okRfR/vnIPqR89fFKonnWPiZymN5ydRJkX8=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.opentelemetry.io/otel v0.7.0/go.mod h1:aZMyHG5TqDOXEgH2tyLiXSUKly1jT3yqE9PmrzIeCdo=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
@@ -117,9 +137,11 @@ golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+o
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -128,13 +150,17 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 h1:AeiKBIuRw3UomYXSbLy0Mc2dDLfdtbT/IVn4keq83P0=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -148,35 +174,51 @@ golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/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-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/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 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 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.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 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=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced h1:c5geK1iMU3cDKtFrCVQIcjR3W+JOZMuhIyICMCTbtus=
+google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0=
 google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -185,8 +227,10 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
@@ -194,6 +238,7 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/apps/app_cmd.go

@@ -2,17 +2,19 @@ package apps
 
 import (
 	"fmt"
-	"github.com/iwind/TeaGo/Tea"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
+	"github.com/iwind/gosock/pkg/gosock"
 	"os"
 	"os/exec"
 	"runtime"
 	"strconv"
-	"syscall"
 	"time"
 )
 
-// App命令帮助
+// AppCmd App命令帮助
 type AppCmd struct {
 	product       string
 	version       string
@@ -21,10 +23,14 @@ type AppCmd struct {
 	appendStrings []string
 
 	directives []*Directive
+
+	sock *gosock.Sock
 }
 
 func NewAppCmd() *AppCmd {
-	return &AppCmd{}
+	return &AppCmd{
+		sock: gosock.NewTmpSock(teaconst.ProcessName),
+	}
 }
 
 type CommandHelpOption struct {
@@ -32,25 +38,25 @@ type CommandHelpOption struct {
 	Description string
 }
 
-// 产品
+// Product 产品
 func (this *AppCmd) Product(product string) *AppCmd {
 	this.product = product
 	return this
 }
 
-// 版本
+// Version 版本
 func (this *AppCmd) Version(version string) *AppCmd {
 	this.version = version
 	return this
 }
 
-// 使用方法
+// Usage 使用方法
 func (this *AppCmd) Usage(usage string) *AppCmd {
 	this.usage = usage
 	return this
 }
 
-// 选项
+// Option 选项
 func (this *AppCmd) Option(code string, description string) *AppCmd {
 	this.options = append(this.options, &CommandHelpOption{
 		Code:        code,
@@ -59,13 +65,13 @@ func (this *AppCmd) Option(code string, description string) *AppCmd {
 	return this
 }
 
-// 附加内容
+// Append 附加内容
 func (this *AppCmd) Append(appendString string) *AppCmd {
 	this.appendStrings = append(this.appendStrings, appendString)
 	return this
 }
 
-// 打印
+// Print 打印
 func (this *AppCmd) Print() {
 	fmt.Println(this.product + " v" + this.version)
 
@@ -104,7 +110,7 @@ func (this *AppCmd) Print() {
 	}
 }
 
-// 添加指令
+// On 添加指令
 func (this *AppCmd) On(arg string, callback func()) {
 	this.directives = append(this.directives, &Directive{
 		Arg:      arg,
@@ -112,7 +118,7 @@ func (this *AppCmd) On(arg string, callback func()) {
 	})
 }
 
-// 运行
+// Run 运行
 func (this *AppCmd) Run(main func()) {
 	// 获取参数
 	args := os.Args[1:]
@@ -151,9 +157,6 @@ func (this *AppCmd) Run(main func()) {
 		return
 	}
 
-	// 记录PID
-	_ = this.writePid()
-
 	// 日志
 	writer := new(LogWriter)
 	writer.Init()
@@ -165,7 +168,7 @@ func (this *AppCmd) Run(main func()) {
 
 // 版本号
 func (this *AppCmd) runVersion() {
-	fmt.Println(this.product+" v"+this.version, "(build: "+runtime.Version(), runtime.GOOS, runtime.GOARCH+")")
+	fmt.Println(this.product+" v"+this.version, "(build: "+runtime.Version(), runtime.GOOS, runtime.GOARCH, teaconst.Tag+")")
 }
 
 // 帮助
@@ -175,9 +178,9 @@ func (this *AppCmd) runHelp() {
 
 // 启动
 func (this *AppCmd) runStart() {
-	proc := this.checkPid()
-	if proc != nil {
-		fmt.Println(this.product+" already started, pid:", proc.Pid)
+	var pid = this.getPID()
+	if pid > 0 {
+		fmt.Println(this.product+" already started, pid:", pid)
 		return
 	}
 
@@ -193,18 +196,15 @@ func (this *AppCmd) runStart() {
 
 // 停止
 func (this *AppCmd) runStop() {
-	proc := this.checkPid()
-	if proc == nil {
+	var pid = this.getPID()
+	if pid == 0 {
 		fmt.Println(this.product + " not started yet")
 		return
 	}
 
-	// 停止进程
-	_ = proc.Signal(syscall.SIGQUIT)
+	_, _ = this.sock.Send(&gosock.Command{Code: "stop"})
 
-	// 在Windows上经常不能及时释放资源
-	_ = DeletePid(Tea.Root + "/bin/pid")
-	fmt.Println(this.product+" stopped ok, pid:", proc.Pid)
+	fmt.Println(this.product+" stopped ok, pid:", types.String(pid))
 }
 
 // 重启
@@ -216,20 +216,24 @@ func (this *AppCmd) runRestart() {
 
 // 状态
 func (this *AppCmd) runStatus() {
-	proc := this.checkPid()
-	if proc == nil {
+	var pid = this.getPID()
+	if pid == 0 {
 		fmt.Println(this.product + " not started yet")
-	} else {
-		fmt.Println(this.product + " is running, pid: " + fmt.Sprintf("%d", proc.Pid))
+		return
 	}
+
+	fmt.Println(this.product + " is running, pid: " + types.String(pid))
 }
 
-// 检查PID
-func (this *AppCmd) checkPid() *os.Process {
-	return CheckPid(Tea.Root + "/bin/pid")
-}
+// 获取当前的PID
+func (this *AppCmd) getPID() int {
+	if !this.sock.IsListening() {
+		return 0
+	}
 
-// 写入PID
-func (this *AppCmd) writePid() error {
-	return WritePid(Tea.Root + "/bin/pid")
+	reply, err := this.sock.Send(&gosock.Command{Code: "pid"})
+	if err != nil {
+		return 0
+	}
+	return maps.NewMap(reply.Params).GetInt("pid")
 }

internal/apps/file_others.go

@@ -1,17 +0,0 @@
-// +build !windows
-
-package apps
-
-import (
-	"os"
-	"syscall"
-)
-
-// lock file
-func LockFile(fp *os.File) error {
-	return syscall.Flock(int(fp.Fd()), syscall.LOCK_EX|syscall.LOCK_NB)
-}
-
-func UnlockFile(fp *os.File) error {
-	return syscall.Flock(int(fp.Fd()), syscall.LOCK_UN)
-}

internal/apps/file_windows.go

@@ -1,17 +0,0 @@
-// +build windows
-
-package apps
-
-import (
-	"errors"
-	"os"
-)
-
-// lock file
-func LockFile(fp *os.File) error {
-	return errors.New("not implemented on windows")
-}
-
-func UnlockFile(fp *os.File) error {
-	return errors.New("not implemented on windows")
-}

internal/apps/pid.go

@@ -1,113 +0,0 @@
-package apps
-
-import (
-	"fmt"
-	"github.com/iwind/TeaGo/types"
-	"io/ioutil"
-	"os"
-	"runtime"
-)
-
-var pidFileList = []*os.File{}
-
-// 检查Pid
-func CheckPid(path string) *os.Process {
-	// windows上打开的文件是不能删除的
-	if runtime.GOOS == "windows" {
-		if os.Remove(path) == nil {
-			return nil
-		}
-	}
-
-	file, err := os.Open(path)
-	if err != nil {
-		return nil
-	}
-
-	defer func() {
-		_ = file.Close()
-	}()
-
-	// 是否能取得Lock
-	err = LockFile(file)
-	if err == nil {
-		_ = UnlockFile(file)
-		return nil
-	}
-
-	pidBytes, err := ioutil.ReadAll(file)
-	if err != nil {
-		return nil
-	}
-	pid := types.Int(string(pidBytes))
-
-	if pid <= 0 {
-		return nil
-	}
-
-	proc, _ := os.FindProcess(pid)
-	return proc
-}
-
-// 写入Pid
-func WritePid(path string) error {
-	fp, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY|os.O_RDONLY, 0666)
-	if err != nil {
-		return err
-	}
-
-	if runtime.GOOS != "windows" {
-		err = LockFile(fp)
-		if err != nil {
-			return err
-		}
-	}
-	pidFileList = append(pidFileList, fp) // hold the file pointers
-
-	_, err = fp.WriteString(fmt.Sprintf("%d", os.Getpid()))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// 写入Ppid
-func WritePpid(path string) error {
-	fp, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY|os.O_RDONLY, 0666)
-	if err != nil {
-		return err
-	}
-
-	if runtime.GOOS != "windows" {
-		err = LockFile(fp)
-		if err != nil {
-			return err
-		}
-	}
-	pidFileList = append(pidFileList, fp) // hold the file pointers
-
-	_, err = fp.WriteString(fmt.Sprintf("%d", os.Getppid()))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// 删除Pid
-func DeletePid(path string) error {
-	_, err := os.Stat(path)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-
-	for _, fp := range pidFileList {
-		_ = UnlockFile(fp)
-		_ = fp.Close()
-	}
-	return os.Remove(path)
-}

internal/configloaders/admin_module.go

@@ -1,6 +1,7 @@
 package configloaders
 
 import (
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
@@ -14,9 +15,11 @@ const (
 	AdminModuleCodeServer    AdminModuleCode = "server"    // 网站
 	AdminModuleCodeNode      AdminModuleCode = "node"      // 节点
 	AdminModuleCodeDNS       AdminModuleCode = "dns"       // DNS
+	AdminModuleCodeNS        AdminModuleCode = "ns"        // 域名服务
 	AdminModuleCodeAdmin     AdminModuleCode = "admin"     // 系统用户
 	AdminModuleCodeUser      AdminModuleCode = "user"      // 平台用户
 	AdminModuleCodeFinance   AdminModuleCode = "finance"   // 财务
+	AdminModuleCodePlan      AdminModuleCode = "plan"      // 套餐
 	AdminModuleCodeLog       AdminModuleCode = "log"       // 日志
 	AdminModuleCodeSetting   AdminModuleCode = "setting"   // 设置
 	AdminModuleCodeCommon    AdminModuleCode = "common"    // 只要登录就可以访问的模块
@@ -42,6 +45,7 @@ func loadAdminModuleMapping() (map[int64]*AdminModuleList, error) {
 		list := &AdminModuleList{
 			IsSuper:  m.IsSuper,
 			Fullname: m.Fullname,
+			Theme:    m.Theme,
 		}
 
 		for _, pbModule := range m.Modules {
@@ -68,7 +72,7 @@ func NotifyAdminModuleMappingChange() error {
 	return err
 }
 
-// 检查用户是否存在
+// CheckAdmin 检查用户是否存在
 func CheckAdmin(adminId int64) bool {
 	locker.Lock()
 	defer locker.Unlock()
@@ -82,7 +86,7 @@ func CheckAdmin(adminId int64) bool {
 	return ok
 }
 
-// 检查模块是否允许访问
+// AllowModule 检查模块是否允许访问
 func AllowModule(adminId int64, module string) bool {
 	locker.Lock()
 	defer locker.Unlock()
@@ -103,7 +107,7 @@ func AllowModule(adminId int64, module string) bool {
 	return false
 }
 
-// 获取管理员第一个可访问模块
+// FindFirstAdminModule 获取管理员第一个可访问模块
 func FindFirstAdminModule(adminId int64) (module AdminModuleCode, ok bool) {
 	locker.Lock()
 	defer locker.Unlock()
@@ -118,7 +122,7 @@ func FindFirstAdminModule(adminId int64) (module AdminModuleCode, ok bool) {
 	return
 }
 
-// 查找某个管理员名称
+// FindAdminFullname 查找某个管理员名称
 func FindAdminFullname(adminId int64) string {
 	locker.Lock()
 	defer locker.Unlock()
@@ -130,9 +134,32 @@ func FindAdminFullname(adminId int64) string {
 	return ""
 }
 
-// 所有权限列表
+// FindAdminTheme 查找某个管理员选择的风格
+func FindAdminTheme(adminId int64) string {
+	locker.Lock()
+	defer locker.Unlock()
+
+	list, ok := sharedAdminModuleMapping[adminId]
+	if ok {
+		return list.Theme
+	}
+	return ""
+}
+
+// UpdateAdminTheme 设置某个管理员的风格
+func UpdateAdminTheme(adminId int64, theme string) {
+	locker.Lock()
+	defer locker.Unlock()
+
+	list, ok := sharedAdminModuleMapping[adminId]
+	if ok {
+		list.Theme = theme
+	}
+}
+
+// AllModuleMaps 所有权限列表
 func AllModuleMaps() []maps.Map {
-	return []maps.Map{
+	m := []maps.Map{
 		{
 			"name": "看板",
 			"code": AdminModuleCodeDashboard,
@@ -153,6 +180,15 @@ func AllModuleMaps() []maps.Map {
 			"code": AdminModuleCodeDNS,
 			"url":  "/dns",
 		},
+	}
+	if teaconst.IsPlus {
+		m = append(m, maps.Map{
+			"name": "智能DNS",
+			"code": AdminModuleCodeNS,
+			"url":  "/ns",
+		})
+	}
+	m = append(m, []maps.Map{
 		{
 			"name": "平台用户",
 			"code": AdminModuleCodeUser,
@@ -168,6 +204,11 @@ func AllModuleMaps() []maps.Map {
 			"code": AdminModuleCodeFinance,
 			"url":  "/finance",
 		},
+		{
+			"name": "套餐管理",
+			"code": AdminModuleCodePlan,
+			"url":  "/plans",
+		},
 		{
 			"name": "日志审计",
 			"code": AdminModuleCodeLog,
@@ -178,5 +219,6 @@ func AllModuleMaps() []maps.Map {
 			"code": AdminModuleCodeSetting,
 			"url":  "/settings",
 		},
-	}
+	}...)
+	return m
 }

internal/configloaders/admin_module_list.go

@@ -6,6 +6,7 @@ type AdminModuleList struct {
 	IsSuper  bool
 	Modules  []*systemconfigs.AdminModule
 	Fullname string
+	Theme    string
 }
 
 func (this *AdminModuleList) Allow(module string) bool {

internal/configs/api_config.go

@@ -108,7 +108,6 @@ func (this *APIConfig) WriteFile(path string) error {
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(path, data, 0666)
 
 	// 写入 ~/ 和 /etc/ 目录，因为是备份需要，所以不需要提示错误信息
 	// 写入 ~/.edge-admin/
@@ -141,5 +140,10 @@ func (this *APIConfig) WriteFile(path string) error {
 		}
 	}
 
-	return err
+	err = ioutil.WriteFile(path, data, 0666)
+	if err != nil {
+		return err
+	}
+
+	return nil
 }

internal/configs/plus_config.go

@@ -0,0 +1,40 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package configs
+
+import (
+	"encoding/json"
+	"github.com/iwind/TeaGo/Tea"
+	"io/ioutil"
+)
+
+var plusConfigFile = "plus.cache.json"
+
+type PlusConfig struct {
+	IsPlus bool `json:"isPlus"`
+}
+
+func ReadPlusConfig() *PlusConfig {
+	data, err := ioutil.ReadFile(Tea.ConfigFile(plusConfigFile))
+	if err != nil {
+		return &PlusConfig{IsPlus: false}
+	}
+	var config = &PlusConfig{IsPlus: false}
+	err = json.Unmarshal(data, config)
+	if err != nil {
+		return config
+	}
+	return config
+}
+
+func WritePlusConfig(config *PlusConfig) error {
+	configJSON, err := json.Marshal(config)
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(Tea.ConfigFile(plusConfigFile), configJSON, 0777)
+	if err != nil {
+		return err
+	}
+	return nil
+}

internal/const/build.go

@@ -0,0 +1,8 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+// +build community
+
+package teaconst
+
+const BuildCommunity = true
+const BuildPlus = false
+const Tag = "community"

internal/const/const.go

@@ -1,7 +1,9 @@
 package teaconst
 
 const (
-	Version = "0.1.0"
+	Version = "0.3.5.1"
+
+	APINodeVersion = "0.3.5"
 
 	ProductName   = "Edge Admin"
 	ProcessName   = "edge-admin"

internal/const/const_demo.go

@@ -1,7 +0,0 @@
-// +build demo
-
-package teaconst
-
-const (
-	IsDemo = true
-)

internal/const/const_normal.go

@@ -1,7 +0,0 @@
-// +build !demo
-
-package teaconst
-
-const (
-	IsDemo = false
-)

internal/const/vars.go

@@ -0,0 +1,12 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package teaconst
+
+var (
+	IsRecoverMode = false
+)
+
+var (
+	IsDemoMode         = false
+	ErrorDemoOperation = "DEMO模式下无法进行创建、修改、删除等操作"
+)

internal/gen/generate.go

@@ -0,0 +1,129 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package gen
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/conds/condutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/files"
+	"github.com/iwind/TeaGo/logs"
+	"io"
+	"os"
+	"path/filepath"
+)
+
+func Generate() error {
+	err := generateComponentsJSFile()
+	if err != nil {
+		return errors.New("generate 'components.js' failed: " + err.Error())
+	}
+
+	return nil
+}
+
+// 生成Javascript文件
+func generateComponentsJSFile() error {
+	var buffer = bytes.NewBuffer([]byte{})
+
+	var webRoot string
+	if Tea.IsTesting() {
+		webRoot = Tea.Root + "/../web/public/js/components/"
+	} else {
+		webRoot = Tea.Root + "/web/public/js/components/"
+	}
+	f := files.NewFile(webRoot)
+
+	f.Range(func(file *files.File) {
+		if !file.IsFile() {
+			return
+		}
+		if file.Ext() != ".js" {
+			return
+		}
+		data, err := file.ReadAll()
+		if err != nil {
+			logs.Error(err)
+			return
+		}
+		buffer.Write(data)
+		buffer.Write([]byte{'\n', '\n'})
+	})
+
+	// 条件组件
+	typesJSON, err := json.Marshal(condutils.ReadAllAvailableCondTypes())
+	if err != nil {
+		logs.Println("ComponentsAction marshal request cond types failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.REQUEST_COND_COMPONENTS = ")
+		buffer.Write(typesJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// 条件操作符
+	requestOperatorsJSON, err := json.Marshal(shared.AllRequestOperators())
+	if err != nil {
+		logs.Println("ComponentsAction marshal request operators failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.REQUEST_COND_OPERATORS = ")
+		buffer.Write(requestOperatorsJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// 请求变量
+	requestVariablesJSON, err := json.Marshal(shared.DefaultRequestVariables())
+	if err != nil {
+		logs.Println("ComponentsAction marshal request variables failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.REQUEST_VARIABLES = ")
+		buffer.Write(requestVariablesJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// 指标
+	metricHTTPKeysJSON, err := json.Marshal(serverconfigs.FindAllMetricKeyDefinitions(serverconfigs.MetricItemCategoryHTTP))
+	if err != nil {
+		logs.Println("ComponentsAction marshal metric http keys failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.METRIC_HTTP_KEYS = ")
+		buffer.Write(metricHTTPKeysJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// IP地址阈值项目
+	ipAddrThresholdItemsJSON, err := json.Marshal(nodeconfigs.FindAllIPAddressThresholdItems())
+	if err != nil {
+		logs.Println("ComponentsAction marshal ip addr threshold items failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.IP_ADDR_THRESHOLD_ITEMS = ")
+		buffer.Write(ipAddrThresholdItemsJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// IP地址阈值动作
+	ipAddrThresholdActionsJSON, err := json.Marshal(nodeconfigs.FindAllIPAddressThresholdActions())
+	if err != nil {
+		logs.Println("ComponentsAction marshal ip addr threshold actions failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.IP_ADDR_THRESHOLD_ACTIONS = ")
+		buffer.Write(ipAddrThresholdActionsJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	fp, err := os.OpenFile(filepath.Clean(Tea.PublicFile("/js/components.js")), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0777)
+	if err != nil {
+		return err
+	}
+
+	_, err = io.Copy(fp, buffer)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/gen/generate_test.go

@@ -0,0 +1,13 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package gen
+
+import "testing"
+
+func TestGenerate(t *testing.T) {
+	err := Generate()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}

internal/nodes/admin_node.go

@@ -10,11 +10,12 @@ import (
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/rands"
 	"github.com/iwind/TeaGo/sessions"
+	"github.com/iwind/gosock/pkg/gosock"
 	"io/ioutil"
 	"log"
-	"net"
 	"os"
 	"os/exec"
 	"os/signal"
@@ -25,6 +26,7 @@ import (
 var SharedAdminNode *AdminNode = nil
 
 type AdminNode struct {
+	sock    *gosock.Sock
 	subPIDs []int
 }
 
@@ -42,7 +44,7 @@ func (this *AdminNode) Run() {
 	// 本地Sock
 	err := this.listenSock()
 	if err != nil {
-		logs.Println("NODE" + err.Error())
+		logs.Println("[NODE]", err.Error())
 		return
 	}
 
@@ -89,11 +91,11 @@ func (this *AdminNode) Run() {
 
 // Daemon 实现守护进程
 func (this *AdminNode) Daemon() {
-	path := os.TempDir() + "/edge-admin.sock"
+	var sock = gosock.NewTmpSock(teaconst.ProcessName)
 	isDebug := lists.ContainsString(os.Args, "debug")
 	isDebug = true
 	for {
-		conn, err := net.DialTimeout("unix", path, 1*time.Second)
+		conn, err := sock.Dial()
 		if err != nil {
 			if isDebug {
 				log.Println("[DAEMON]starting ...")
@@ -281,37 +283,72 @@ func (this *AdminNode) genSecret() string {
 
 // 监听本地sock
 func (this *AdminNode) listenSock() error {
-	path := os.TempDir() + "/edge-admin.sock"
+	this.sock = gosock.NewTmpSock(teaconst.ProcessName)
 
-	// 检查是否已经存在
-	_, err := os.Stat(path)
-	if err == nil {
-		conn, err := net.Dial("unix", path)
-		if err != nil {
-			_ = os.Remove(path)
+	// 检查是否在运行
+	if this.sock.IsListening() {
+		reply, err := this.sock.Send(&gosock.Command{Code: "pid"})
+		if err == nil {
+			return errors.New("error: the process is already running, pid: " + maps.NewMap(reply.Params).GetString("pid"))
 		} else {
-			_ = conn.Close()
+			return errors.New("error: the process is already running")
 		}
 	}
 
-	// 新的监听任务
-	listener, err := net.Listen("unix", path)
-	if err != nil {
-		return err
-	}
-	events.On(events.EventQuit, func() {
-		logs.Println("NODE", "quit unix sock")
-		_ = listener.Close()
-	})
-
+	// 启动监听
 	go func() {
-		for {
-			_, err := listener.Accept()
-			if err != nil {
-				return
+		this.sock.OnCommand(func(cmd *gosock.Command) {
+			switch cmd.Code {
+			case "pid":
+				_ = cmd.Reply(&gosock.Command{
+					Code: "pid",
+					Params: map[string]interface{}{
+						"pid": os.Getpid(),
+					},
+				})
+			case "stop":
+				_ = cmd.ReplyOk()
+
+				// 关闭子进程
+				for _, pid := range this.subPIDs {
+					p, err := os.FindProcess(pid)
+					if err == nil && p != nil {
+						_ = p.Kill()
+					}
+				}
+
+				// 退出主进程
+				events.Notify(events.EventQuit)
+				os.Exit(0)
+			case "recover":
+				teaconst.IsRecoverMode = true
+				_ = cmd.ReplyOk()
+			case "demo":
+				teaconst.IsDemoMode = !teaconst.IsDemoMode
+				_ = cmd.ReplyOk()
+			case "info":
+				exePath, _ := os.Executable()
+				_ = cmd.Reply(&gosock.Command{
+					Code: "info",
+					Params: map[string]interface{}{
+						"pid":     os.Getpid(),
+						"version": teaconst.Version,
+						"path":    exePath,
+					},
+				})
 			}
+		})
+
+		err := this.sock.Listen()
+		if err != nil {
+			logs.Println("NODE", err.Error())
 		}
 	}()
 
+	events.On(events.EventQuit, func() {
+		logs.Println("NODE", "quit unix sock")
+		_ = this.sock.Close()
+	})
+
 	return nil
 }

internal/rpc/context_interface.go

@@ -1,7 +0,0 @@
-package rpc
-
-import "context"
-
-type ContextInterface interface {
-	AdminContext() context.Context
-}

internal/rpc/rpc_client.go

@@ -22,16 +22,16 @@ import (
 	"time"
 )
 
-// RPC客户端
+// RPCClient RPC客户端
 type RPCClient struct {
 	apiConfig *configs.APIConfig
 	conns     []*grpc.ClientConn
 
-	locker sync.Mutex
+	locker sync.RWMutex
 }
 
-// 构造新的RPC客户端
-func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) {
+// NewRPCClient 构造新的RPC客户端
+func NewRPCClient(apiConfig *configs.APIConfig, isPrimary bool) (*RPCClient, error) {
 	if apiConfig == nil {
 		return nil, errors.New("api config should not be nil")
 	}
@@ -46,11 +46,17 @@ func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) {
 	}
 
 	// 设置RPC
-	dao.SetRPC(client)
+	if isPrimary {
+		dao.SetRPC(client)
+	}
 
 	return client, nil
 }
 
+func (this *RPCClient) APITokenRPC() pb.APITokenServiceClient {
+	return pb.NewAPITokenServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) AdminRPC() pb.AdminServiceClient {
 	return pb.NewAdminServiceClient(this.pickConn())
 }
@@ -67,6 +73,10 @@ func (this *RPCClient) NodeGrantRPC() pb.NodeGrantServiceClient {
 	return pb.NewNodeGrantServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) NodeLoginRPC() pb.NodeLoginServiceClient {
+	return pb.NewNodeLoginServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) NodeClusterRPC() pb.NodeClusterServiceClient {
 	return pb.NewNodeClusterServiceClient(this.pickConn())
 }
@@ -91,6 +101,14 @@ func (this *RPCClient) NodeIPAddressRPC() pb.NodeIPAddressServiceClient {
 	return pb.NewNodeIPAddressServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) NodeIPAddressLogRPC() pb.NodeIPAddressLogServiceClient {
+	return pb.NewNodeIPAddressLogServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NodeIPAddressThresholdRPC() pb.NodeIPAddressThresholdServiceClient {
+	return pb.NewNodeIPAddressThresholdServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) NodeValueRPC() pb.NodeValueServiceClient {
 	return pb.NewNodeValueServiceClient(this.pickConn())
 }
@@ -131,6 +149,10 @@ func (this *RPCClient) ServerHTTPFirewallDailyStatRPC() pb.ServerHTTPFirewallDai
 	return pb.NewServerHTTPFirewallDailyStatServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) ServerDailyStatRPC() pb.ServerDailyStatServiceClient {
+	return pb.NewServerDailyStatServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) ServerGroupRPC() pb.ServerGroupServiceClient {
 	return pb.NewServerGroupServiceClient(this.pickConn())
 }
@@ -203,6 +225,10 @@ func (this *RPCClient) HTTPFirewallRuleSetRPC() pb.HTTPFirewallRuleSetServiceCli
 	return pb.NewHTTPFirewallRuleSetServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) FirewallRPC() pb.FirewallServiceClient {
+	return pb.NewFirewallServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) HTTPLocationRPC() pb.HTTPLocationServiceClient {
 	return pb.NewHTTPLocationServiceClient(this.pickConn())
 }
@@ -224,6 +250,10 @@ func (this *RPCClient) HTTPFastcgiRPC() pb.HTTPFastcgiServiceClient {
 	return pb.NewHTTPFastcgiServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) HTTPAuthPolicyRPC() pb.HTTPAuthPolicyServiceClient {
+	return pb.NewHTTPAuthPolicyServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) SSLCertRPC() pb.SSLCertServiceClient {
 	return pb.NewSSLCertServiceClient(this.pickConn())
 }
@@ -276,6 +306,18 @@ func (this *RPCClient) IPListRPC() pb.IPListServiceClient {
 	return pb.NewIPListServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) ReportNodeRPC() pb.ReportNodeServiceClient {
+	return pb.NewReportNodeServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ReportNodeGroupRPC() pb.ReportNodeGroupServiceClient {
+	return pb.NewReportNodeGroupServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ReportResultRPC() pb.ReportResultServiceClient {
+	return pb.NewReportResultServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) IPItemRPC() pb.IPItemServiceClient {
 	return pb.NewIPItemServiceClient(this.pickConn())
 }
@@ -324,6 +366,14 @@ func (this *RPCClient) ACMETaskRPC() pb.ACMETaskServiceClient {
 	return pb.NewACMETaskServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) ACMEProviderRPC() pb.ACMEProviderServiceClient {
+	return pb.NewACMEProviderServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ACMEProviderAccountRPC() pb.ACMEProviderAccountServiceClient {
+	return pb.NewACMEProviderAccountServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) UserRPC() pb.UserServiceClient {
 	return pb.NewUserServiceClient(this.pickConn())
 }
@@ -332,6 +382,22 @@ func (this *RPCClient) UserBillRPC() pb.UserBillServiceClient {
 	return pb.NewUserBillServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) UserAccountRPC() pb.UserAccountServiceClient {
+	return pb.NewUserAccountServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) UserAccountLogRPC() pb.UserAccountLogServiceClient {
+	return pb.NewUserAccountLogServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) UserAccountDailyStatRPC() pb.UserAccountDailyStatServiceClient {
+	return pb.NewUserAccountDailyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) UserAccessKeyRPC() pb.UserAccessKeyServiceClient {
+	return pb.NewUserAccessKeyServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) LoginRPC() pb.LoginServiceClient {
 	return pb.NewLoginServiceClient(this.pickConn())
 }
@@ -352,6 +418,74 @@ func (this *RPCClient) LatestItemRPC() pb.LatestItemServiceClient {
 	return pb.NewLatestItemServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) NSClusterRPC() pb.NSClusterServiceClient {
+	return pb.NewNSClusterServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSNodeRPC() pb.NSNodeServiceClient {
+	return pb.NewNSNodeServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSDomainRPC() pb.NSDomainServiceClient {
+	return pb.NewNSDomainServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSRecordRPC() pb.NSRecordServiceClient {
+	return pb.NewNSRecordServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSKeyRPC() pb.NSKeyServiceClient {
+	return pb.NewNSKeyServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSRouteRPC() pb.NSRouteServiceClient {
+	return pb.NewNSRouteServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSAccessLogRPC() pb.NSAccessLogServiceClient {
+	return pb.NewNSAccessLogServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSRPC() pb.NSServiceClient {
+	return pb.NewNSServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSQuestionOptionRPC() pb.NSQuestionOptionServiceClient {
+	return pb.NewNSQuestionOptionServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) MetricItemRPC() pb.MetricItemServiceClient {
+	return pb.NewMetricItemServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) MetricStatRPC() pb.MetricStatServiceClient {
+	return pb.NewMetricStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) MetricChartRPC() pb.MetricChartServiceClient {
+	return pb.NewMetricChartServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NodeClusterMetricItemRPC() pb.NodeClusterMetricItemServiceClient {
+	return pb.NewNodeClusterMetricItemServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerStatBoardRPC() pb.ServerStatBoardServiceClient {
+	return pb.NewServerStatBoardServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerStatBoardChartRPC() pb.ServerStatBoardChartServiceClient {
+	return pb.NewServerStatBoardChartServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) PlanRPC() pb.PlanServiceClient {
+	return pb.NewPlanServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) UserPlanRPC() pb.UserPlanServiceClient {
+	return pb.NewUserPlanServiceClient(this.pickConn())
+}
+
 // Context 构造Admin上下文
 func (this *RPCClient) Context(adminId int64) context.Context {
 	ctx := context.Background()
@@ -401,7 +535,11 @@ func (this *RPCClient) APIContext(apiNodeId int64) context.Context {
 // UpdateConfig 修改配置
 func (this *RPCClient) UpdateConfig(config *configs.APIConfig) error {
 	this.apiConfig = config
-	return this.init()
+
+	this.locker.Lock()
+	err := this.init()
+	this.locker.Unlock()
+	return err
 }
 
 // 初始化
@@ -479,3 +617,20 @@ func (this *RPCClient) pickConn() *grpc.ClientConn {
 
 	return this.conns[rands.Int(0, len(this.conns)-1)]
 }
+
+// Close 关闭
+func (this *RPCClient) Close() error {
+	this.locker.Lock()
+	defer this.locker.Unlock()
+
+	var lastErr error
+	for _, conn := range this.conns {
+		var err = conn.Close()
+		if err != nil {
+			lastErr = err
+			continue
+		}
+	}
+
+	return lastErr
+}

internal/rpc/rpc_client_test.go

@@ -37,7 +37,7 @@ func TestRPC_Dial_HTTP(t *testing.T) {
 		RPC: struct {
 			Endpoints []string `yaml:"endpoints"`
 		}{
-			Endpoints: []string{"127.0.0.1:8003"},
+			Endpoints: []string{"http://127.0.0.1:8004"},
 		},
 		NodeId: "a7e55782dab39bce0901058a1e14a0e6",
 		Secret: "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
@@ -58,7 +58,7 @@ func TestRPC_Dial_HTTP_2(t *testing.T) {
 		RPC: struct {
 			Endpoints []string `yaml:"endpoints"`
 		}{
-			Endpoints: []string{"http://127.0.0.1:8003"},
+			Endpoints: []string{"https://127.0.0.1:8003"},
 		},
 		NodeId: "a7e55782dab39bce0901058a1e14a0e6",
 		Secret: "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",

internal/rpc/rpc_utils.go

@@ -20,7 +20,7 @@ func SharedRPC() (*RPCClient, error) {
 	if err != nil {
 		return nil, err
 	}
-	client, err := NewRPCClient(config)
+	client, err := NewRPCClient(config, true)
 	if err != nil {
 		return nil, err
 	}

internal/setup/utils.go

@@ -2,6 +2,8 @@ package setup
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"os"
 )
 
 var isConfigured bool
@@ -16,3 +18,16 @@ func IsConfigured() bool {
 	isConfigured = err == nil
 	return isConfigured
 }
+
+// IsNewInstalled IsNew 检查是否新安装
+func IsNewInstalled() bool {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return false
+	}
+	_, err = os.Stat(homeDir + "/." + teaconst.ProcessName + "/api.yaml")
+	if err != nil {
+		return true
+	}
+	return false
+}

internal/tasks/task_authority.go

@@ -1,68 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package tasks
-
-import (
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
-	"github.com/TeaOSLab/EdgeAdmin/internal/events"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/Tea"
-	"github.com/iwind/TeaGo/logs"
-	"time"
-)
-
-func init() {
-	events.On(events.EventStart, func() {
-		task := NewAuthorityTask()
-		go task.Start()
-	})
-}
-
-type AuthorityTask struct {
-}
-
-func NewAuthorityTask() *AuthorityTask {
-	return &AuthorityTask{}
-}
-
-func (this *AuthorityTask) Start() {
-	ticker := time.NewTicker(10 * time.Minute)
-	if Tea.IsTesting() {
-		// 快速测试
-		ticker = time.NewTicker(1 * time.Minute)
-	}
-
-	// 初始化的时候先获取一次
-	timeout := time.NewTimer(5 * time.Second)
-	<-timeout.C
-	err := this.Loop()
-	if err != nil {
-		logs.Println("[TASK][AuthorityTask]" + err.Error())
-	}
-
-	// 定时获取
-	for range ticker.C {
-		err := this.Loop()
-		if err != nil {
-			logs.Println("[TASK][AuthorityTask]" + err.Error())
-		}
-	}
-}
-
-func (this *AuthorityTask) Loop() error {
-	rpcClient, err := rpc.SharedRPC()
-	if err != nil {
-		return err
-	}
-	resp, err := rpcClient.AuthorityKeyRPC().ReadAuthorityKey(rpcClient.Context(0), &pb.ReadAuthorityKeyRequest{})
-	if err != nil {
-		return err
-	}
-	if resp.AuthorityKey != nil {
-		teaconst.IsPlus = true
-	} else {
-		teaconst.IsPlus = false
-	}
-	return nil
-}

internal/tasks/task_sync_api_nodes.go

@@ -1,14 +1,22 @@
 package tasks
 
 import (
+	"context"
+	"crypto/tls"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/events"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeAdmin/internal/setup"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/logs"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
+	"net/url"
 	"sort"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -19,7 +27,7 @@ func init() {
 	})
 }
 
-// API节点同步任务
+// SyncAPINodesTask API节点同步任务
 type SyncAPINodesTask struct {
 }
 
@@ -42,6 +50,11 @@ func (this *SyncAPINodesTask) Start() {
 }
 
 func (this *SyncAPINodesTask) Loop() error {
+	// 如果还没有安装直接返回
+	if !setup.IsConfigured() || teaconst.IsRecoverMode {
+		return nil
+	}
+
 	// 获取所有可用的节点
 	rpcClient, err := rpc.SharedRPC()
 	if err != nil {
@@ -53,7 +66,7 @@ func (this *SyncAPINodesTask) Loop() error {
 	}
 
 	newEndpoints := []string{}
-	for _, node := range resp.Nodes {
+	for _, node := range resp.ApiNodes {
 		if !node.IsOn {
 			continue
 		}
@@ -69,6 +82,12 @@ func (this *SyncAPINodesTask) Loop() error {
 		return nil
 	}
 
+	// 测试是否有API节点可用
+	hasOk := this.testEndpoints(newEndpoints)
+	if !hasOk {
+		return nil
+	}
+
 	// 修改RPC对象配置
 	config.RPC.Endpoints = newEndpoints
 	err = rpcClient.UpdateConfig(config)
@@ -90,3 +109,47 @@ func (this *SyncAPINodesTask) isSame(endpoints1 []string, endpoints2 []string) b
 	sort.Strings(endpoints2)
 	return strings.Join(endpoints1, "&") == strings.Join(endpoints2, "&")
 }
+
+func (this *SyncAPINodesTask) testEndpoints(endpoints []string) bool {
+	if len(endpoints) == 0 {
+		return false
+	}
+
+	var wg = sync.WaitGroup{}
+	wg.Add(len(endpoints))
+
+	var ok = false
+
+	for _, endpoint := range endpoints {
+		go func(endpoint string) {
+			defer wg.Done()
+
+			u, err := url.Parse(endpoint)
+			if err != nil {
+				return
+			}
+
+			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+			defer func() {
+				cancel()
+			}()
+			var conn *grpc.ClientConn
+			if u.Scheme == "http" {
+				conn, err = grpc.DialContext(ctx, u.Host, grpc.WithInsecure(), grpc.WithBlock())
+			} else if u.Scheme == "https" {
+				conn, err = grpc.DialContext(ctx, u.Host, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{
+					InsecureSkipVerify: true,
+				})), grpc.WithBlock())
+			}
+			if err != nil {
+				return
+			}
+			_ = conn.Close()
+
+			ok = true
+		}(endpoint)
+	}
+	wg.Wait()
+
+	return ok
+}

internal/tasks/task_sync_cluster.go

@@ -1,6 +1,7 @@
 package tasks
 
 import (
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/events"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeAdmin/internal/setup"
@@ -20,7 +21,7 @@ func init() {
 	})
 }
 
-// 自动同步集群任务
+// SyncClusterTask 自动同步集群任务
 type SyncClusterTask struct {
 }
 
@@ -40,7 +41,7 @@ func (this *SyncClusterTask) Start() {
 
 func (this *SyncClusterTask) loop() error {
 	// 如果还没有安装直接返回
-	if !setup.IsConfigured() {
+	if !setup.IsConfigured() || teaconst.IsRecoverMode {
 		return nil
 	}
 

internal/utils/lookup.go

@@ -1,10 +1,11 @@
 package utils
 
 import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/miekg/dns"
 )
 
-// 获取CNAME
+// LookupCNAME 获取CNAME
 func LookupCNAME(host string) (string, error) {
 	config, err := dns.ClientConfigFromFile("/etc/resolv.conf")
 	if err != nil {
@@ -16,13 +17,19 @@ func LookupCNAME(host string) (string, error) {
 
 	m.SetQuestion(host+".", dns.TypeCNAME)
 	m.RecursionDesired = true
-	r, _, err := c.Exchange(m, config.Servers[0]+":"+config.Port)
-	if err != nil {
-		return "", err
-	}
-	if len(r.Answer) == 0 {
-		return "", nil
-	}
 
-	return r.Answer[0].(*dns.CNAME).Target, nil
+	var lastErr error
+	for _, serverAddr := range config.Servers {
+		r, _, err := c.Exchange(m, configutils.QuoteIP(serverAddr)+":"+config.Port)
+		if err != nil {
+			lastErr = err
+			continue
+		}
+		if len(r.Answer) == 0 {
+			continue
+		}
+
+		return r.Answer[0].(*dns.CNAME).Target, nil
+	}
+	return "", lastErr
 }

internal/web/actions/actionutils/action_interface.go

@@ -0,0 +1,15 @@
+package actionutils
+
+import (
+	"context"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type ActionInterface interface {
+	RPC() *rpc.RPCClient
+
+	AdminContext() context.Context
+
+	ViewData() maps.Map
+}

internal/web/actions/actionutils/parent_action.go

@@ -10,6 +10,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/maps"
 	"net/http"
 	"strconv"
 )
@@ -18,9 +19,11 @@ type ParentAction struct {
 	actions.ActionObject
 
 	rpcClient *rpc.RPCClient
+
+	ctx context.Context
 }
 
-// 可以调用自身的一个简便方法
+// Parent 可以调用自身的一个简便方法
 func (this *ParentAction) Parent() *ParentAction {
 	return this
 }
@@ -97,7 +100,7 @@ func (this *ParentAction) CreateLogInfo(description string, args ...interface{})
 	this.CreateLog(oplogs.LevelInfo, description, args...)
 }
 
-// 获取RPC
+// RPC 获取RPC
 func (this *ParentAction) RPC() *rpc.RPCClient {
 	if this.rpcClient != nil {
 		return this.rpcClient
@@ -114,8 +117,12 @@ func (this *ParentAction) RPC() *rpc.RPCClient {
 	return rpcClient
 }
 
-// 获取Context
+// AdminContext 获取Context
 func (this *ParentAction) AdminContext() context.Context {
+	if this.ctx != nil {
+		return this.ctx
+	}
+
 	if this.rpcClient == nil {
 		rpcClient, err := rpc.SharedRPC()
 		if err != nil {
@@ -124,5 +131,11 @@ func (this *ParentAction) AdminContext() context.Context {
 		}
 		this.rpcClient = rpcClient
 	}
-	return this.rpcClient.Context(this.AdminId())
+	this.ctx = this.rpcClient.Context(this.AdminId())
+	return this.ctx
+}
+
+// ViewData 视图里可以使用的数据
+func (this *ParentAction) ViewData() maps.Map {
+	return this.Data
 }

internal/web/actions/actionutils/utils.go

@@ -3,6 +3,7 @@ package actionutils
 import (
 	"fmt"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	rpcerrors "github.com/TeaOSLab/EdgeCommon/pkg/rpc/errors"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/logs"
 	"net/http"
@@ -13,19 +14,20 @@ import (
 	"strings"
 )
 
-// 提示服务器错误信息
+// Fail 提示服务器错误信息
 func Fail(action actions.ActionWrapper, err error) {
 	if err != nil {
 		logs.Println("[" + reflect.TypeOf(action).String() + "]" + findStack(err.Error()))
 	}
-	action.Object().Fail(teaconst.ErrServer)
+	action.Object().Fail(teaconst.ErrServer + "（" + err.Error() + "）")
 }
 
-// 提示页面错误信息
+// FailPage 提示页面错误信息
 func FailPage(action actions.ActionWrapper, err error) {
 	if err != nil {
 		logs.Println("[" + reflect.TypeOf(action).String() + "]" + findStack(err.Error()))
 	}
+	err = rpcerrors.HumanError(err)
 	action.Object().ResponseWriter.WriteHeader(http.StatusInternalServerError)
 	if len(action.Object().Request.Header.Get("X-Requested-With")) > 0 {
 		action.Object().WriteString(teaconst.ErrServer)
@@ -37,18 +39,20 @@ func FailPage(action actions.ActionWrapper, err error) {
 	<div style="background: #eee; border: 1px #ccc solid; padding: 10px; font-size: 12px; line-height: 1.8">
 	` + teaconst.ErrServer + `
 	<div>可以通过查看 <strong><em>$安装目录/logs/run.log</em></strong> 日志文件查看具体的错误提示。</div>
+	<hr style="border-top: 1px #ccc solid"/>
+	<div style="color: red">Error: ` + err.Error() + `</pre>
 	</div>
 	</body>
 </html>`)
 	}
 }
 
-// 判断动作的文件路径是否相当
+// MatchPath 判断动作的文件路径是否相当
 func MatchPath(action *actions.ActionObject, path string) bool {
 	return action.Request.URL.Path == path
 }
 
-// 查找父级Action
+// FindParentAction 查找父级Action
 func FindParentAction(actionPtr actions.ActionWrapper) *ParentAction {
 	parentActionValue := reflect.ValueOf(actionPtr).Elem().FieldByName("ParentAction")
 	if parentActionValue.IsValid() {

internal/web/actions/default/admins/accesskeys/createPopup.go

@@ -0,0 +1,49 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package accesskeys
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type CreatePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *CreatePopupAction) RunGet(params struct {
+	AdminId int64
+}) {
+	this.Data["adminId"] = params.AdminId
+	this.Show()
+}
+
+func (this *CreatePopupAction) RunPost(params struct {
+	AdminId     int64
+	Description string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	params.Must.
+		Field("description", params.Description).
+		Require("请输入备注")
+
+	accessKeyIdResp, err := this.RPC().UserAccessKeyRPC().CreateUserAccessKey(this.AdminContext(), &pb.CreateUserAccessKeyRequest{
+		AdminId:     params.AdminId,
+		Description: params.Description,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	defer this.CreateLogInfo("创建AccessKey %d", accessKeyIdResp.UserAccessKeyId)
+
+	this.Success()
+}

internal/web/actions/default/admins/accesskeys/delete.go

@@ -0,0 +1,24 @@
+package accesskeys
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type DeleteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteAction) RunPost(params struct {
+	AccessKeyId int64
+}) {
+	defer this.CreateLogInfo("删除AccessKey %d", params.AccessKeyId)
+
+	_, err := this.RPC().UserAccessKeyRPC().DeleteUserAccessKey(this.AdminContext(), &pb.DeleteUserAccessKeyRequest{UserAccessKeyId: params.AccessKeyId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/admins/accesskeys/index.go

@@ -0,0 +1,54 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package accesskeys
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/admins/adminutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "", "accessKey")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	AdminId int64
+}) {
+	err := adminutils.InitAdmin(this.Parent(), params.AdminId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	accessKeysResp, err := this.RPC().UserAccessKeyRPC().FindAllEnabledUserAccessKeys(this.AdminContext(), &pb.FindAllEnabledUserAccessKeysRequest{AdminId: params.AdminId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	accessKeyMaps := []maps.Map{}
+	for _, accessKey := range accessKeysResp.UserAccessKeys {
+		var accessedTime string
+		if accessKey.AccessedAt > 0 {
+			accessedTime = timeutil.FormatTime("Y-m-d H:i:s", accessKey.AccessedAt)
+		}
+		accessKeyMaps = append(accessKeyMaps, maps.Map{
+			"id":           accessKey.Id,
+			"isOn":         accessKey.IsOn,
+			"uniqueId":     accessKey.UniqueId,
+			"secret":       accessKey.Secret,
+			"description":  accessKey.Description,
+			"accessedTime": accessedTime,
+		})
+	}
+	this.Data["accessKeys"] = accessKeyMaps
+
+	this.Show()
+}

internal/web/actions/default/admins/accesskeys/updateIsOn.go

@@ -0,0 +1,28 @@
+package accesskeys
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type UpdateIsOnAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateIsOnAction) RunPost(params struct {
+	AccessKeyId int64
+	IsOn        bool
+}) {
+	defer this.CreateLogInfo("设置AccessKey %d 启用状态", params.AccessKeyId)
+
+	_, err := this.RPC().UserAccessKeyRPC().UpdateUserAccessKeyIsOn(this.AdminContext(), &pb.UpdateUserAccessKeyIsOnRequest{
+		UserAccessKeyId: params.AccessKeyId,
+		IsOn:            params.IsOn,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/admins/admin.go

@@ -30,13 +30,22 @@ func (this *AdminAction) RunGet(params struct {
 		return
 	}
 
+	// AccessKey数量
+	countAccessKeyResp, err := this.RPC().UserAccessKeyRPC().CountAllEnabledUserAccessKeys(this.AdminContext(), &pb.CountAllEnabledUserAccessKeysRequest{AdminId: params.AdminId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	countAccessKeys := countAccessKeyResp.Count
+
 	this.Data["admin"] = maps.Map{
-		"id":       admin.Id,
-		"fullname": admin.Fullname,
-		"username": admin.Username,
-		"isOn":     admin.IsOn,
-		"isSuper":  admin.IsSuper,
-		"canLogin": admin.CanLogin,
+		"id":              admin.Id,
+		"fullname":        admin.Fullname,
+		"username":        admin.Username,
+		"isOn":            admin.IsOn,
+		"isSuper":         admin.IsSuper,
+		"canLogin":        admin.CanLogin,
+		"countAccessKeys": countAccessKeys,
 	}
 
 	// 权限

internal/web/actions/default/admins/adminutils/utils.go

@@ -0,0 +1,38 @@
+package adminutils
+
+import (
+	"errors"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+// InitAdmin 查找管理员基本信息
+func InitAdmin(p *actionutils.ParentAction, adminId int64) error {
+	// 管理员信息
+	resp, err := p.RPC().AdminRPC().FindEnabledAdmin(p.AdminContext(), &pb.FindEnabledAdminRequest{AdminId: adminId})
+	if err != nil {
+		return err
+	}
+	if resp.Admin == nil {
+		return errors.New("not found admin")
+	}
+	var admin = resp.Admin
+
+	// AccessKey数量
+	countAccessKeysResp, err := p.RPC().UserAccessKeyRPC().CountAllEnabledUserAccessKeys(p.AdminContext(), &pb.CountAllEnabledUserAccessKeysRequest{
+		AdminId: adminId,
+		UserId:  0,
+	})
+	if err != nil {
+		return err
+	}
+
+	p.Data["admin"] = maps.Map{
+		"id":              admin.Id,
+		"username":        admin.Username,
+		"fullname":        admin.Fullname,
+		"countAccessKeys": countAccessKeysResp.Count,
+	}
+	return nil
+}

internal/web/actions/default/admins/init.go

@@ -2,6 +2,7 @@ package admins
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/admins/accesskeys"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
 )
@@ -19,6 +20,15 @@ func init() {
 			Get("/admin", new(AdminAction)).
 			Get("/otpQrcode", new(OtpQrcodeAction)).
 			Post("/options", new(OptionsAction)).
+
+			// AccessKeys
+			Prefix("/admins/accessKeys").
+			Get("", new(accesskeys.IndexAction)).
+			GetPost("/createPopup", new(accesskeys.CreatePopupAction)).
+			Post("/delete", new(accesskeys.DeleteAction)).
+			Post("/updateIsOn", new(accesskeys.UpdateIsOnAction)).
+
+
 			EndAll()
 	})
 }

internal/web/actions/default/admins/recipients/createPopup.go

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
+	"regexp"
 )
 
 type CreatePopupAction struct {
@@ -29,6 +30,14 @@ func (this *CreatePopupAction) RunPost(params struct {
 	GroupIds    string
 	Description string
 
+	TimeFromHour   string
+	TimeFromMinute string
+	TimeFromSecond string
+
+	TimeToHour   string
+	TimeToMinute string
+	TimeToSecond string
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
@@ -40,12 +49,26 @@ func (this *CreatePopupAction) RunPost(params struct {
 
 	groupIds := utils.SplitNumbers(params.GroupIds)
 
+	var digitReg = regexp.MustCompile(`^\d+$`)
+
+	var timeFrom = ""
+	if digitReg.MatchString(params.TimeFromHour) && digitReg.MatchString(params.TimeFromMinute) && digitReg.MatchString(params.TimeFromSecond) {
+		timeFrom = params.TimeFromHour + ":" + params.TimeFromMinute + ":" + params.TimeFromSecond
+	}
+
+	var timeTo = ""
+	if digitReg.MatchString(params.TimeToHour) && digitReg.MatchString(params.TimeToMinute) && digitReg.MatchString(params.TimeToSecond) {
+		timeTo = params.TimeToHour + ":" + params.TimeToMinute + ":" + params.TimeToSecond
+	}
+
 	resp, err := this.RPC().MessageRecipientRPC().CreateMessageRecipient(this.AdminContext(), &pb.CreateMessageRecipientRequest{
 		AdminId:                  params.AdminId,
 		MessageMediaInstanceId:   params.InstanceId,
 		User:                     params.User,
 		MessageRecipientGroupIds: groupIds,
 		Description:              params.Description,
+		TimeFrom:                 timeFrom,
+		TimeTo:                   timeTo,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/admins/recipients/index.go

@@ -39,6 +39,10 @@ func (this *IndexAction) RunGet(params struct {
 		Offset:                  page.Offset,
 		Size:                    page.Size,
 	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
 
 	recipientMaps := []maps.Map{}
 	for _, recipient := range recipientsResp.MessageRecipients {

internal/web/actions/default/admins/recipients/instances/createPopup.go

@@ -3,6 +3,7 @@ package instances
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/monitorconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
@@ -65,6 +66,11 @@ func (this *CreatePopupAction) RunPost(params struct {
 
 	TelegramToken string
 
+	RateMinutes int32
+	RateCount   int32
+
+	HashLife int32
+
 	Description string
 
 	Must *actions.Must
@@ -231,11 +237,23 @@ func (this *CreatePopupAction) RunPost(params struct {
 		return
 	}
 
+	var rateConfig = &monitorconfigs.RateConfig{
+		Minutes: params.RateMinutes,
+		Count:   params.RateCount,
+	}
+	rateJSON, err := json.Marshal(rateConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	resp, err := this.RPC().MessageMediaInstanceRPC().CreateMessageMediaInstance(this.AdminContext(), &pb.CreateMessageMediaInstanceRequest{
 		Name:        params.Name,
 		MediaType:   params.MediaType,
 		ParamsJSON:  optionsJSON,
 		Description: params.Description,
+		RateJSON:    rateJSON,
+		HashLife:    params.HashLife,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/admins/recipients/instances/index.go

@@ -35,6 +35,10 @@ func (this *IndexAction) RunGet(params struct {
 		Offset:    page.Offset,
 		Size:      page.Size,
 	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
 
 	instanceMaps := []maps.Map{}
 	for _, instance := range instancesResp.MessageMediaInstances {

internal/web/actions/default/admins/recipients/instances/instance.go

@@ -3,6 +3,7 @@ package instances
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/monitorconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 )
@@ -38,6 +39,16 @@ func (this *InstanceAction) RunGet(params struct {
 		}
 	}
 
+	// 频率
+	var rateConfig = &monitorconfigs.RateConfig{}
+	if len(instance.RateJSON) > 0 {
+		err = json.Unmarshal(instance.RateJSON, rateConfig)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
 	this.Data["instance"] = maps.Map{
 		"id":   instance.Id,
 		"name": instance.Name,
@@ -48,6 +59,8 @@ func (this *InstanceAction) RunGet(params struct {
 		},
 		"description": instance.Description,
 		"params":      mediaParams,
+		"rate":        rateConfig,
+		"hashLife":    instance.HashLife,
 	}
 
 	this.Show()

internal/web/actions/default/admins/recipients/instances/update.go

@@ -3,6 +3,7 @@ package instances
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/monitorconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
@@ -39,6 +40,15 @@ func (this *UpdateAction) RunGet(params struct {
 		}
 	}
 
+	var rateConfig = &monitorconfigs.RateConfig{}
+	if len(instance.RateJSON) > 0 {
+		err = json.Unmarshal(instance.RateJSON, rateConfig)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
 	this.Data["instance"] = maps.Map{
 		"id":   instance.Id,
 		"name": instance.Name,
@@ -49,6 +59,8 @@ func (this *UpdateAction) RunGet(params struct {
 		},
 		"description": instance.Description,
 		"params":      mediaParams,
+		"rate":        rateConfig,
+		"hashLife":    instance.HashLife,
 	}
 
 	this.Show()
@@ -104,6 +116,11 @@ func (this *UpdateAction) RunPost(params struct {
 	Description string
 	IsOn        bool
 
+	RateMinutes int32
+	RateCount   int32
+
+	HashLife int32
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
@@ -270,12 +287,24 @@ func (this *UpdateAction) RunPost(params struct {
 		return
 	}
 
+	var rateConfig = &monitorconfigs.RateConfig{
+		Minutes: params.RateMinutes,
+		Count:   params.RateCount,
+	}
+	rateJSON, err := json.Marshal(rateConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	_, err = this.RPC().MessageMediaInstanceRPC().UpdateMessageMediaInstance(this.AdminContext(), &pb.UpdateMessageMediaInstanceRequest{
 		MessageMediaInstanceId: params.InstanceId,
 		Name:                   params.Name,
 		MediaType:              params.MediaType,
 		ParamsJSON:             optionsJSON,
 		Description:            params.Description,
+		RateJSON:               rateJSON,
+		HashLife:               params.HashLife,
 		IsOn:                   params.IsOn,
 	})
 	if err != nil {

internal/web/actions/default/admins/recipients/recipient.go

@@ -44,6 +44,8 @@ func (this *RecipientAction) RunGet(params struct {
 		},
 		"user":        recipient.User,
 		"description": recipient.Description,
+		"timeFrom":    recipient.TimeFrom,
+		"timeTo":      recipient.TimeTo,
 	}
 
 	this.Show()

internal/web/actions/default/admins/recipients/tasks/delete.go

@@ -0,0 +1,26 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package tasks
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type DeleteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteAction) RunPost(params struct {
+	TaskId int64
+}) {
+	defer this.CreateLogInfo("删除消息发送任务 %d", params.TaskId)
+
+	_, err := this.RPC().MessageTaskRPC().DeleteMessageTask(this.AdminContext(), &pb.DeleteMessageTaskRequest{MessageTaskId: params.TaskId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/admins/recipients/tasks/index.go

@@ -0,0 +1,103 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package tasks
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "", "task")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	Status int32
+}) {
+	this.Data["status"] = params.Status
+	if params.Status > 3 {
+		params.Status = 0
+	}
+
+	countWaitingResp, err := this.RPC().MessageTaskRPC().CountMessageTasksWithStatus(this.AdminContext(), &pb.CountMessageTasksWithStatusRequest{Status: pb.CountMessageTasksWithStatusRequest_MessageTaskStatusNone})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var countWaiting = countWaitingResp.Count
+	this.Data["countWaiting"] = countWaiting
+
+	countFailedResp, err := this.RPC().MessageTaskRPC().CountMessageTasksWithStatus(this.AdminContext(), &pb.CountMessageTasksWithStatusRequest{Status: pb.CountMessageTasksWithStatusRequest_MessageTaskStatusFailed})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var countFailed = countFailedResp.Count
+	this.Data["countFailed"] = countFailed
+
+	// 列表
+	var total = int64(0)
+	switch params.Status {
+	case 0:
+		total = countWaiting
+	case 3:
+		total = countFailed
+	}
+	page := this.NewPage(total)
+	this.Data["page"] = page.AsHTML()
+
+	var taskMaps = []maps.Map{}
+	tasksResp, err := this.RPC().MessageTaskRPC().ListMessageTasksWithStatus(this.AdminContext(), &pb.ListMessageTasksWithStatusRequest{
+		Status: pb.ListMessageTasksWithStatusRequest_Status(params.Status),
+		Offset: page.Offset,
+		Size:   page.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	for _, task := range tasksResp.MessageTasks {
+		var resultMap = maps.Map{}
+		var result = task.Result
+		if result != nil {
+			resultMap = maps.Map{
+				"isOk":     result.IsOk,
+				"error":    result.Error,
+				"response": result.Response,
+			}
+		}
+
+		//var recipients = []string{}
+		var user = ""
+		var instanceMap maps.Map
+		if task.MessageRecipient != nil {
+			user = task.MessageRecipient.User
+			if task.MessageRecipient.MessageMediaInstance != nil {
+				instanceMap = maps.Map{
+					"id":   task.MessageRecipient.MessageMediaInstance.Id,
+					"name": task.MessageRecipient.MessageMediaInstance.Name,
+				}
+			}
+		}
+
+		taskMaps = append(taskMaps, maps.Map{
+			"id":          task.Id,
+			"subject":     task.Subject,
+			"body":        task.Body,
+			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", task.CreatedAt),
+			"result":      resultMap,
+			"status":      task.Status,
+			"user":        user,
+			"instance":    instanceMap,
+		})
+	}
+	this.Data["tasks"] = taskMaps
+
+	this.Show()
+}

internal/web/actions/default/admins/recipients/tasks/init.go

@@ -13,7 +13,9 @@ func init() {
 			Data("teaMenu", "admins").
 			Data("teaSubMenu", "recipients").
 			Prefix("/admins/recipients/tasks").
+			Get("", new(IndexAction)).
 			Post("/taskInfo", new(TaskInfoAction)).
+			Post("/delete", new(DeleteAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/admins/recipients/update.go

@@ -6,6 +6,8 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"regexp"
+	"strings"
 )
 
 type UpdateAction struct {
@@ -30,6 +32,27 @@ func (this *UpdateAction) RunGet(params struct {
 		return
 	}
 
+	var timeFromHour = ""
+	var timeFromMinute = ""
+	var timeFromSecond = ""
+
+	if len(recipient.TimeFrom) > 0 {
+		var pieces = strings.Split(recipient.TimeFrom, ":")
+		timeFromHour = pieces[0]
+		timeFromMinute = pieces[1]
+		timeFromSecond = pieces[2]
+	}
+
+	var timeToHour = ""
+	var timeToMinute = ""
+	var timeToSecond = ""
+	if len(recipient.TimeTo) > 0 {
+		var pieces = strings.Split(recipient.TimeTo, ":")
+		timeToHour = pieces[0]
+		timeToMinute = pieces[1]
+		timeToSecond = pieces[2]
+	}
+
 	this.Data["recipient"] = maps.Map{
 		"id": recipient.Id,
 		"admin": maps.Map{
@@ -43,8 +66,14 @@ func (this *UpdateAction) RunGet(params struct {
 			"id":   recipient.MessageMediaInstance.Id,
 			"name": recipient.MessageMediaInstance.Name,
 		},
-		"user":        recipient.User,
-		"description": recipient.Description,
+		"user":           recipient.User,
+		"description":    recipient.Description,
+		"timeFromHour":   timeFromHour,
+		"timeFromMinute": timeFromMinute,
+		"timeFromSecond": timeFromSecond,
+		"timeToHour":     timeToHour,
+		"timeToMinute":   timeToMinute,
+		"timeToSecond":   timeToSecond,
 	}
 
 	this.Show()
@@ -61,6 +90,14 @@ func (this *UpdateAction) RunPost(params struct {
 	Description string
 	IsOn        bool
 
+	TimeFromHour   string
+	TimeFromMinute string
+	TimeFromSecond string
+
+	TimeToHour   string
+	TimeToMinute string
+	TimeToSecond string
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
@@ -74,6 +111,18 @@ func (this *UpdateAction) RunPost(params struct {
 
 	groupIds := utils.SplitNumbers(params.GroupIds)
 
+	var digitReg = regexp.MustCompile(`^\d+$`)
+
+	var timeFrom = ""
+	if digitReg.MatchString(params.TimeFromHour) && digitReg.MatchString(params.TimeFromMinute) && digitReg.MatchString(params.TimeFromSecond) {
+		timeFrom = params.TimeFromHour + ":" + params.TimeFromMinute + ":" + params.TimeFromSecond
+	}
+
+	var timeTo = ""
+	if digitReg.MatchString(params.TimeToHour) && digitReg.MatchString(params.TimeToMinute) && digitReg.MatchString(params.TimeToSecond) {
+		timeTo = params.TimeToHour + ":" + params.TimeToMinute + ":" + params.TimeToSecond
+	}
+
 	_, err := this.RPC().MessageRecipientRPC().UpdateMessageRecipient(this.AdminContext(), &pb.UpdateMessageRecipientRequest{
 		MessageRecipientId:       params.RecipientId,
 		AdminId:                  params.AdminId,
@@ -82,6 +131,8 @@ func (this *UpdateAction) RunPost(params struct {
 		MessageRecipientGroupIds: groupIds,
 		Description:              params.Description,
 		IsOn:                     params.IsOn,
+		TimeFrom:                 timeFrom,
+		TimeTo:                   timeTo,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/admins/update.go

@@ -39,14 +39,23 @@ func (this *UpdateAction) RunGet(params struct {
 		otpLoginIsOn = admin.OtpLogin.IsOn
 	}
 
+	// AccessKey数量
+	countAccessKeyResp, err := this.RPC().UserAccessKeyRPC().CountAllEnabledUserAccessKeys(this.AdminContext(), &pb.CountAllEnabledUserAccessKeysRequest{AdminId: params.AdminId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	countAccessKeys := countAccessKeyResp.Count
+
 	this.Data["admin"] = maps.Map{
-		"id":           admin.Id,
-		"fullname":     admin.Fullname,
-		"username":     admin.Username,
-		"isOn":         admin.IsOn,
-		"isSuper":      admin.IsSuper,
-		"canLogin":     admin.CanLogin,
-		"otpLoginIsOn": otpLoginIsOn,
+		"id":              admin.Id,
+		"fullname":        admin.Fullname,
+		"username":        admin.Username,
+		"isOn":            admin.IsOn,
+		"isSuper":         admin.IsSuper,
+		"canLogin":        admin.CanLogin,
+		"otpLoginIsOn":    otpLoginIsOn,
+		"countAccessKeys": countAccessKeys,
 	}
 
 	// 权限

internal/web/actions/default/api/delete.go

@@ -13,16 +13,35 @@ type DeleteAction struct {
 func (this *DeleteAction) RunPost(params struct {
 	NodeId int64
 }) {
-	// TODO 检查权限
+	// 创建日志
+	defer this.CreateLog(oplogs.LevelInfo, "删除API节点 %d", params.NodeId)
 
-	_, err := this.RPC().APINodeRPC().DeleteAPINode(this.AdminContext(), &pb.DeleteAPINodeRequest{NodeId: params.NodeId})
+	// 检查是否是唯一的节点
+	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{ApiNodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var apiNode = nodeResp.ApiNode
+	if apiNode == nil {
+		this.Success()
+	}
+	if apiNode.IsOn {
+		countResp, err := this.RPC().APINodeRPC().CountAllEnabledAndOnAPINodes(this.AdminContext(), &pb.CountAllEnabledAndOnAPINodesRequest{})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if countResp.Count == 1 {
+			this.Fail("无法删除此节点：必须保留至少一个可用的API节点")
+		}
+	}
+
+	_, err = this.RPC().APINodeRPC().DeleteAPINode(this.AdminContext(), &pb.DeleteAPINodeRequest{ApiNodeId: params.NodeId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "删除API节点 %d", params.NodeId)
-
 	this.Success()
 }

internal/web/actions/default/api/index.go

@@ -41,7 +41,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 			return
 		}
 
-		for _, node := range nodesResp.Nodes {
+		for _, node := range nodesResp.ApiNodes {
 			// 状态
 			status := &nodeconfigs.NodeStatus{}
 			if len(node.StatusJSON) > 0 {

internal/web/actions/default/api/node/createPopup.go

@@ -180,7 +180,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	}
 
 	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "创建API节点 %d", createResp.NodeId)
+	defer this.CreateLog(oplogs.LevelInfo, "创建API节点 %d", createResp.ApiNodeId)
 
 	this.Success()
 }

internal/web/actions/default/api/node/index.go

@@ -20,18 +20,19 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct {
 	NodeId int64
 }) {
-	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{NodeId: params.NodeId})
+	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{ApiNodeId: params.NodeId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	node := nodeResp.Node
+	node := nodeResp.ApiNode
 	if node == nil {
 		this.NotFound("apiNode", params.NodeId)
 		return
 	}
 
 	// 监听地址
+	var hasHTTPS = false
 	httpConfig := &serverconfigs.HTTPProtocolConfig{}
 	if len(node.HttpJSON) > 0 {
 		err = json.Unmarshal(node.HttpJSON, httpConfig)
@@ -47,6 +48,7 @@ func (this *IndexAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
+		hasHTTPS = len(httpsConfig.Listen) > 0
 	}
 
 	// 监听地址
@@ -56,7 +58,6 @@ func (this *IndexAction) RunGet(params struct {
 
 	// 证书信息
 	certs := []*sslconfigs.SSLCertConfig{}
-	sslPolicyId := int64(0)
 	if httpsConfig.SSLPolicyRef != nil && httpsConfig.SSLPolicyRef.SSLPolicyId > 0 {
 		sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{SslPolicyId: httpsConfig.SSLPolicyRef.SSLPolicyId})
 		if err != nil {
@@ -65,8 +66,6 @@ func (this *IndexAction) RunGet(params struct {
 		}
 		sslPolicyConfigJSON := sslPolicyConfigResp.SslPolicyJSON
 		if len(sslPolicyConfigJSON) > 0 {
-			sslPolicyId = httpsConfig.SSLPolicyRef.SSLPolicyId
-
 			sslPolicy := &sslconfigs.SSLPolicy{}
 			err = json.Unmarshal(sslPolicyConfigJSON, sslPolicy)
 			if err != nil {
@@ -112,6 +111,10 @@ func (this *IndexAction) RunGet(params struct {
 			if httpsConfig.IsOn && len(httpsConfig.Listen) > 0 {
 				restAccessAddrs = append(restAccessAddrs, httpsConfig.Listen...)
 			}
+
+			if !hasHTTPS {
+				hasHTTPS = len(httpsConfig.Listen) > 0
+			}
 		}
 	}
 
@@ -124,7 +127,7 @@ func (this *IndexAction) RunGet(params struct {
 		"accessAddrs":     accessAddrs,
 		"restIsOn":        node.RestIsOn,
 		"restAccessAddrs": restAccessAddrs,
-		"hasHTTPS":        sslPolicyId > 0,
+		"hasHTTPS":        hasHTTPS,
 		"certs":           certs,
 	}
 

internal/web/actions/default/api/node/install.go

@@ -21,12 +21,12 @@ func (this *InstallAction) RunGet(params struct {
 	NodeId int64
 }) {
 	// API节点信息
-	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{NodeId: params.NodeId})
+	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{ApiNodeId: params.NodeId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	node := nodeResp.Node
+	node := nodeResp.ApiNode
 	if node == nil {
 		this.NotFound("apiNode", params.NodeId)
 		return

internal/web/actions/default/api/node/logs.go

@@ -2,6 +2,7 @@ package node
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
@@ -18,13 +19,24 @@ func (this *LogsAction) Init() {
 
 func (this *LogsAction) RunGet(params struct {
 	NodeId int64
+
+	DayFrom string
+	DayTo   string
+	Keyword string
+	Level   string
 }) {
-	apiNodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{NodeId: params.NodeId})
+	this.Data["nodeId"] = params.NodeId
+	this.Data["dayFrom"] = params.DayFrom
+	this.Data["dayTo"] = params.DayTo
+	this.Data["keyword"] = params.Keyword
+	this.Data["level"] = params.Level
+
+	apiNodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{ApiNodeId: params.NodeId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	apiNode := apiNodeResp.Node
+	apiNode := apiNodeResp.ApiNode
 	if apiNode == nil {
 		this.NotFound("apiNode", params.NodeId)
 		return
@@ -36,8 +48,12 @@ func (this *LogsAction) RunGet(params struct {
 	}
 
 	countResp, err := this.RPC().NodeLogRPC().CountNodeLogs(this.AdminContext(), &pb.CountNodeLogsRequest{
-		Role:   "api",
-		NodeId: params.NodeId,
+		Role:    nodeconfigs.NodeRoleAPI,
+		NodeId:  params.NodeId,
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -47,8 +63,13 @@ func (this *LogsAction) RunGet(params struct {
 	page := this.NewPage(count, 20)
 
 	logsResp, err := this.RPC().NodeLogRPC().ListNodeLogs(this.AdminContext(), &pb.ListNodeLogsRequest{
-		NodeId: params.NodeId,
-		Role:   "api",
+		NodeId:  params.NodeId,
+		Role:    nodeconfigs.NodeRoleAPI,
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+
 		Offset: page.Offset,
 		Size:   page.Size,
 	})

internal/web/actions/default/api/node/update.go

@@ -23,13 +23,13 @@ func (this *UpdateAction) RunGet(params struct {
 	NodeId int64
 }) {
 	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{
-		NodeId: params.NodeId,
+		ApiNodeId: params.NodeId,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	node := nodeResp.Node
+	node := nodeResp.ApiNode
 	if node == nil {
 		this.WriteString("要操作的节点不存在")
 		return
@@ -127,7 +127,7 @@ func (this *UpdateAction) RunGet(params struct {
 	this.Show()
 }
 
-// 保存基础设置
+// RunPost 保存基础设置
 func (this *UpdateAction) RunPost(params struct {
 	NodeId          int64
 	Name            string
@@ -281,7 +281,7 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().APINodeRPC().UpdateAPINode(this.AdminContext(), &pb.UpdateAPINodeRequest{
-		NodeId:          params.NodeId,
+		ApiNodeId:       params.NodeId,
 		Name:            params.Name,
 		Description:     params.Description,
 		HttpJSON:        httpJSON,

internal/web/actions/default/clusters/cluster/createBatch.go

@@ -3,6 +3,7 @@ package cluster
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/lists"
@@ -79,9 +80,9 @@ func (this *CreateBatchAction) RunPost(params struct {
 		resp, err := this.RPC().NodeRPC().CreateNode(this.AdminContext(), &pb.CreateNodeRequest{
 			Name:          ip,
 			NodeClusterId: params.ClusterId,
-			GroupId:       params.GroupId,
-			RegionId:      params.RegionId,
-			Login:         nil,
+			NodeGroupId:   params.GroupId,
+			NodeRegionId:  params.RegionId,
+			NodeLogin:     nil,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -90,9 +91,11 @@ func (this *CreateBatchAction) RunPost(params struct {
 		nodeId := resp.NodeId
 		_, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
 			NodeId:    nodeId,
+			Role:      nodeconfigs.NodeRoleNode,
 			Name:      "IP地址",
 			Ip:        ip,
 			CanAccess: true,
+			IsUp:      true,
 		})
 		if err != nil {
 			this.ErrorPage(err)

internal/web/actions/default/clusters/cluster/createNode.go

@@ -4,13 +4,16 @@ import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 	"strconv"
+	"strings"
 )
 
-// 创建节点
+// CreateNodeAction 创建节点
 type CreateNodeAction struct {
 	actionutils.ParentAction
 }
@@ -56,14 +59,32 @@ func (this *CreateNodeAction) RunGet(params struct {
 			}
 			for _, route := range routesResp.Routes {
 				dnsRouteMaps = append(dnsRouteMaps, maps.Map{
-					"name": route.Name,
-					"code": route.Code,
+					"domainId":   domainId,
+					"domainName": clusterDNSResp.Domain.Name,
+					"name":       route.Name,
+					"code":       route.Code,
 				})
 			}
 		}
 	}
 	this.Data["dnsRoutes"] = dnsRouteMaps
 
+	// API节点列表
+	apiNodesResp, err := this.RPC().APINodeRPC().FindAllEnabledAPINodes(this.AdminContext(), &pb.FindAllEnabledAPINodesRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	apiNodes := apiNodesResp.ApiNodes
+	apiEndpoints := []string{}
+	for _, apiNode := range apiNodes {
+		if !apiNode.IsOn {
+			continue
+		}
+		apiEndpoints = append(apiEndpoints, apiNode.AccessAddrs...)
+	}
+	this.Data["apiEndpoints"] = "\"" + strings.Join(apiEndpoints, "\", \"") + "\""
+
 	this.Show()
 }
 
@@ -133,9 +154,9 @@ func (this *CreateNodeAction) RunPost(params struct {
 	createResp, err := this.RPC().NodeRPC().CreateNode(this.AdminContext(), &pb.CreateNodeRequest{
 		Name:          params.Name,
 		NodeClusterId: params.ClusterId,
-		GroupId:       params.GroupId,
-		RegionId:      params.RegionId,
-		Login:         loginInfo,
+		NodeGroupId:   params.GroupId,
+		NodeRegionId:  params.RegionId,
+		NodeLogin:     loginInfo,
 		DnsDomainId:   params.DnsDomainId,
 		DnsRoutes:     dnsRouteCodes,
 	})
@@ -146,29 +167,106 @@ func (this *CreateNodeAction) RunPost(params struct {
 	nodeId := createResp.NodeId
 
 	// IP地址
-	for _, address := range ipAddresses {
-		addressId := address.GetInt64("id")
-		if addressId > 0 {
+	for _, addr := range ipAddresses {
+		addrId := addr.GetInt64("id")
+		if addrId > 0 {
 			_, err = this.RPC().NodeIPAddressRPC().UpdateNodeIPAddressNodeId(this.AdminContext(), &pb.UpdateNodeIPAddressNodeIdRequest{
-				AddressId: addressId,
-				NodeId:    nodeId,
+				NodeIPAddressId: addrId,
+				NodeId:          nodeId,
 			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
 		} else {
-			_, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
+			createResp, err := this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
 				NodeId:    nodeId,
-				Name:      address.GetString("name"),
-				Ip:        address.GetString("ip"),
-				CanAccess: address.GetBool("canAccess"),
+				Role:      nodeconfigs.NodeRoleNode,
+				Name:      addr.GetString("name"),
+				Ip:        addr.GetString("ip"),
+				CanAccess: addr.GetBool("canAccess"),
+				IsUp:      addr.GetBool("isUp"),
 			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			addrId = createResp.NodeIPAddressId
 		}
-		if err != nil {
-			this.ErrorPage(err)
-			return
+
+		// 阈值
+		var thresholds = addr.GetSlice("thresholds")
+		if len(thresholds) > 0 {
+			thresholdsJSON, err := json.Marshal(thresholds)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			_, err = this.RPC().NodeIPAddressThresholdRPC().UpdateAllNodeIPAddressThresholds(this.AdminContext(), &pb.UpdateAllNodeIPAddressThresholdsRequest{
+				NodeIPAddressId:             addrId,
+				NodeIPAddressThresholdsJSON: thresholdsJSON,
+			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
 		}
 	}
 
 	// 创建日志
 	defer this.CreateLog(oplogs.LevelInfo, "创建节点 %d", nodeId)
 
+	// 响应数据
+	this.Data["nodeId"] = nodeId
+	nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: nodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if nodeResp.Node != nil {
+		var addresses = []string{}
+		for _, addrMap := range ipAddresses {
+			addresses = append(addresses, addrMap.GetString("ip"))
+		}
+
+		var grantMap maps.Map = nil
+		grantId := params.GrantId
+		if grantId > 0 {
+			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			if grantResp.NodeGrant != nil && grantResp.NodeGrant.Id > 0 {
+				grantMap = maps.Map{
+					"id":         grantResp.NodeGrant.Id,
+					"name":       grantResp.NodeGrant.Name,
+					"method":     grantResp.NodeGrant.Method,
+					"methodName": grantutils.FindGrantMethodName(grantResp.NodeGrant.Method),
+					"username":   grantResp.NodeGrant.Username,
+				}
+			}
+		}
+
+		this.Data["node"] = maps.Map{
+			"id":        nodeResp.Node.Id,
+			"name":      nodeResp.Node.Name,
+			"uniqueId":  nodeResp.Node.UniqueId,
+			"secret":    nodeResp.Node.Secret,
+			"addresses": addresses,
+			"login": maps.Map{
+				"id":   0,
+				"name": "SSH",
+				"type": "ssh",
+				"params": maps.Map{
+					"grantId": params.GrantId,
+					"host":    params.SshHost,
+					"port":    params.SshPort,
+				},
+			},
+			"grant": grantMap,
+		}
+	}
+
 	this.Success()
 }

internal/web/actions/default/clusters/cluster/createNodeInstall.go

@@ -0,0 +1,76 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package cluster
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type CreateNodeInstallAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreateNodeInstallAction) RunPost(params struct {
+	NodeId  int64
+	SshHost string
+	SshPort int
+	GrantId int64
+
+	Must *actions.Must
+}) {
+	defer this.CreateLogInfo("安装节点 %d", params.NodeId)
+
+	params.Must.
+		Field("sshHost2", params.SshHost).
+		Require("请填写SSH主机地址").
+		Field("sshPort2", params.SshPort).
+		Gt(0, "请填写SSH主机端口").
+		Lt(65535, "SSH主机端口需要小于65535").
+		Field("grantId", params.GrantId).
+		Gt(0, "请选择SSH登录认证")
+
+	// 查询login
+	nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var node = nodeResp.Node
+	if node == nil {
+		this.Fail("找不到要修改的节点")
+	}
+	var loginId int64
+	if node.NodeLogin != nil {
+		loginId = node.NodeLogin.Id
+	}
+
+	// 修改节点信息
+	_, err = this.RPC().NodeRPC().UpdateNodeLogin(this.AdminContext(), &pb.UpdateNodeLoginRequest{
+		NodeId: params.NodeId,
+		NodeLogin: &pb.NodeLogin{
+			Id:   loginId,
+			Name: "SSH",
+			Type: "ssh",
+			Params: maps.Map{
+				"grantId": params.GrantId,
+				"host":    params.SshHost,
+				"port":    params.SshPort,
+			}.AsJSON(),
+		},
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 开始安装
+	_, err = this.RPC().NodeRPC().InstallNode(this.AdminContext(), &pb.InstallNodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.Fail("安装失败：" + err.Error())
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/groups/createPopup.go

@@ -43,12 +43,12 @@ func (this *CreatePopupAction) RunPost(params struct {
 	}
 
 	this.Data["group"] = maps.Map{
-		"id":   createResp.GroupId,
+		"id":   createResp.NodeGroupId,
 		"name": params.Name,
 	}
 
 	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "创建集群分组", createResp.GroupId)
+	defer this.CreateLog(oplogs.LevelInfo, "创建节点分组", createResp.NodeGroupId)
 
 	this.Success()
 }

internal/web/actions/default/clusters/cluster/groups/delete.go

@@ -24,7 +24,7 @@ func (this *DeleteAction) RunPost(params struct {
 		this.Fail("此分组正在被使用不能删除，请修改节点后再删除")
 	}
 
-	_, err = this.RPC().NodeGroupRPC().DeleteNodeGroup(this.AdminContext(), &pb.DeleteNodeGroupRequest{GroupId: params.GroupId})
+	_, err = this.RPC().NodeGroupRPC().DeleteNodeGroup(this.AdminContext(), &pb.DeleteNodeGroupRequest{NodeGroupId: params.GroupId})
 	if err != nil {
 		this.ErrorPage(err)
 		return

internal/web/actions/default/clusters/cluster/groups/index.go

@@ -18,7 +18,7 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct {
 	ClusterId int64
 }) {
-	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{
+	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithNodeClusterIdRequest{
 		NodeClusterId: params.ClusterId,
 	})
 	if err != nil {
@@ -27,7 +27,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 
 	groupMaps := []maps.Map{}
-	for _, group := range groupsResp.Groups {
+	for _, group := range groupsResp.NodeGroups {
 		countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGroupId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGroupIdRequest{NodeGroupId: group.Id})
 		if err != nil {
 			this.ErrorPage(err)

internal/web/actions/default/clusters/cluster/groups/selectPopup.go

@@ -18,13 +18,13 @@ func (this *SelectPopupAction) Init() {
 func (this *SelectPopupAction) RunGet(params struct {
 	ClusterId int64
 }) {
-	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{NodeClusterId: params.ClusterId})
+	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithNodeClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 	}
 
 	groupMaps := []maps.Map{}
-	for _, group := range groupsResp.Groups {
+	for _, group := range groupsResp.NodeGroups {
 		groupMaps = append(groupMaps, maps.Map{
 			"id":   group.Id,
 			"name": group.Name,
@@ -44,12 +44,12 @@ func (this *SelectPopupAction) RunPost(params struct {
 		this.Fail("请选择要使用的分组")
 	}
 
-	groupResp, err := this.RPC().NodeGroupRPC().FindEnabledNodeGroup(this.AdminContext(), &pb.FindEnabledNodeGroupRequest{GroupId: params.GroupId})
+	groupResp, err := this.RPC().NodeGroupRPC().FindEnabledNodeGroup(this.AdminContext(), &pb.FindEnabledNodeGroupRequest{NodeGroupId: params.GroupId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	group := groupResp.Group
+	group := groupResp.NodeGroup
 	if group == nil {
 		this.NotFound("nodeGroup", params.GroupId)
 		return

internal/web/actions/default/clusters/cluster/groups/sort.go

@@ -13,7 +13,7 @@ type SortAction struct {
 func (this *SortAction) RunPost(params struct {
 	GroupIds []int64
 }) {
-	_, err := this.RPC().NodeGroupRPC().UpdateNodeGroupOrders(this.AdminContext(), &pb.UpdateNodeGroupOrdersRequest{GroupIds: params.GroupIds})
+	_, err := this.RPC().NodeGroupRPC().UpdateNodeGroupOrders(this.AdminContext(), &pb.UpdateNodeGroupOrdersRequest{NodeGroupIds: params.GroupIds})
 	if err != nil {
 		this.ErrorPage(err)
 		return

internal/web/actions/default/clusters/cluster/groups/updatePopup.go

@@ -19,12 +19,12 @@ func (this *UpdatePopupAction) Init() {
 func (this *UpdatePopupAction) RunGet(params struct {
 	GroupId int64
 }) {
-	groupResp, err := this.RPC().NodeGroupRPC().FindEnabledNodeGroup(this.AdminContext(), &pb.FindEnabledNodeGroupRequest{GroupId: params.GroupId})
+	groupResp, err := this.RPC().NodeGroupRPC().FindEnabledNodeGroup(this.AdminContext(), &pb.FindEnabledNodeGroupRequest{NodeGroupId: params.GroupId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	group := groupResp.Group
+	group := groupResp.NodeGroup
 	if group == nil {
 		this.NotFound("nodeGroup", params.GroupId)
 		return
@@ -48,8 +48,8 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入分组名称")
 	_, err := this.RPC().NodeGroupRPC().UpdateNodeGroup(this.AdminContext(), &pb.UpdateNodeGroupRequest{
-		GroupId: params.GroupId,
-		Name:    params.Name,
+		NodeGroupId: params.GroupId,
+		Name:        params.Name,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/clusters/cluster/index.go

@@ -1,16 +1,11 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
 package cluster
 
 import (
-	"encoding/json"
-	"fmt"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/logs"
-	"github.com/iwind/TeaGo/maps"
-	"github.com/iwind/TeaGo/types"
 	"strconv"
-	"time"
 )
 
 type IndexAction struct {
@@ -18,200 +13,15 @@ type IndexAction struct {
 }
 
 func (this *IndexAction) Init() {
-	this.Nav("", "node", "index")
-	this.SecondMenu("nodes")
+	this.Nav("", "", "")
 }
 
 func (this *IndexAction) RunGet(params struct {
-	ClusterId      int64
-	GroupId        int64
-	RegionId       int64
-	InstalledState int
-	ActiveState    int
-	Keyword        string
+	ClusterId int64
 }) {
-	this.Data["groupId"] = params.GroupId
-	this.Data["regionId"] = params.RegionId
-	this.Data["installState"] = params.InstalledState
-	this.Data["activeState"] = params.ActiveState
-	this.Data["keyword"] = params.Keyword
-
-	countAllResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
-		NodeClusterId: params.ClusterId,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
+	if teaconst.IsPlus {
+		this.RedirectURL("/clusters/cluster/boards?clusterId=" + strconv.FormatInt(params.ClusterId, 10))
+	} else {
+		this.RedirectURL("/clusters/cluster/nodes?clusterId=" + strconv.FormatInt(params.ClusterId, 10))
 	}
-	this.Data["countAll"] = countAllResp.Count
-
-	countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
-		NodeClusterId: params.ClusterId,
-		GroupId:       params.GroupId,
-		RegionId:      params.RegionId,
-		InstallState:  types.Int32(params.InstalledState),
-		ActiveState:   types.Int32(params.ActiveState),
-		Keyword:       params.Keyword,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	page := this.NewPage(countResp.Count)
-	this.Data["page"] = page.AsHTML()
-
-	nodesResp, err := this.RPC().NodeRPC().ListEnabledNodesMatch(this.AdminContext(), &pb.ListEnabledNodesMatchRequest{
-		Offset:        page.Offset,
-		Size:          page.Size,
-		NodeClusterId: params.ClusterId,
-		GroupId:       params.GroupId,
-		RegionId:      params.RegionId,
-		InstallState:  types.Int32(params.InstalledState),
-		ActiveState:   types.Int32(params.ActiveState),
-		Keyword:       params.Keyword,
-	})
-	nodeMaps := []maps.Map{}
-	for _, node := range nodesResp.Nodes {
-		// 状态
-		isSynced := false
-		status := &nodeconfigs.NodeStatus{}
-		if len(node.StatusJSON) > 0 {
-			err = json.Unmarshal(node.StatusJSON, &status)
-			if err != nil {
-				logs.Error(err)
-				continue
-			}
-			status.IsActive = status.IsActive && time.Now().Unix()-status.UpdatedAt <= 60 // N秒之内认为活跃
-			isSynced = status.ConfigVersion == node.Version
-		}
-
-		// IP
-		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{NodeId: node.Id})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		ipAddresses := []maps.Map{}
-		for _, addr := range ipAddressesResp.Addresses {
-			ipAddresses = append(ipAddresses, maps.Map{
-				"id":        addr.Id,
-				"name":      addr.Name,
-				"ip":        addr.Ip,
-				"canAccess": addr.CanAccess,
-			})
-		}
-
-		// 分组
-		var groupMap maps.Map = nil
-		if node.Group != nil {
-			groupMap = maps.Map{
-				"id":   node.Group.Id,
-				"name": node.Group.Name,
-			}
-		}
-
-		// 区域
-		var regionMap maps.Map = nil
-		if node.Region != nil {
-			regionMap = maps.Map{
-				"id":   node.Region.Id,
-				"name": node.Region.Name,
-			}
-		}
-
-		// DNS
-		dnsRouteNames := []string{}
-		for _, route := range node.DnsRoutes {
-			dnsRouteNames = append(dnsRouteNames, route.Name)
-		}
-
-		nodeMaps = append(nodeMaps, maps.Map{
-			"id":          node.Id,
-			"name":        node.Name,
-			"isInstalled": node.IsInstalled,
-			"isOn":        node.IsOn,
-			"isUp":        node.IsUp,
-			"installStatus": maps.Map{
-				"isRunning":  node.InstallStatus.IsRunning,
-				"isFinished": node.InstallStatus.IsFinished,
-				"isOk":       node.InstallStatus.IsOk,
-				"error":      node.InstallStatus.Error,
-			},
-			"status": maps.Map{
-				"isActive":     status.IsActive,
-				"updatedAt":    status.UpdatedAt,
-				"hostname":     status.Hostname,
-				"cpuUsage":     status.CPUUsage,
-				"cpuUsageText": fmt.Sprintf("%.2f%%", status.CPUUsage*100),
-				"memUsage":     status.MemoryUsage,
-				"memUsageText": fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
-			},
-			"cluster": maps.Map{
-				"id":   node.NodeCluster.Id,
-				"name": node.NodeCluster.Name,
-			},
-			"isSynced":      isSynced,
-			"ipAddresses":   ipAddresses,
-			"group":         groupMap,
-			"region":        regionMap,
-			"dnsRouteNames": dnsRouteNames,
-		})
-	}
-	this.Data["nodes"] = nodeMaps
-
-	// 所有分组
-	groupMaps := []maps.Map{}
-	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{
-		NodeClusterId: params.ClusterId,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	for _, group := range groupsResp.Groups {
-		countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGroupId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGroupIdRequest{NodeGroupId: group.Id})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		countNodes := countResp.Count
-		groupName := group.Name
-		if countNodes > 0 {
-			groupName += "(" + strconv.FormatInt(countNodes, 10) + ")"
-		}
-		groupMaps = append(groupMaps, maps.Map{
-			"id":         group.Id,
-			"name":       groupName,
-			"countNodes": countNodes,
-		})
-	}
-	this.Data["groups"] = groupMaps
-
-	// 所有区域
-	regionsResp, err := this.RPC().NodeRegionRPC().FindAllEnabledAndOnNodeRegions(this.AdminContext(), &pb.FindAllEnabledAndOnNodeRegionsRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	regionMaps := []maps.Map{}
-	for _, region := range regionsResp.NodeRegions {
-		regionMaps = append(regionMaps, maps.Map{
-			"id":   region.Id,
-			"name": region.Name,
-		})
-	}
-	this.Data["regions"] = regionMaps
-
-	// 记录最近访问
-	_, err = this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{
-		ItemType: "cluster",
-		ItemId:   params.ClusterId,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Show()
 }

internal/web/actions/default/clusters/cluster/init.go

@@ -4,8 +4,11 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/groups"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/monitor"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/thresholds"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/settings/cache"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/settings/dns"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/settings/ssh"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/settings/system"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/settings/thresholds"
 	clusters "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
@@ -16,8 +19,10 @@ func init() {
 		server.
 			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNode)).
 			Helper(clusters.NewClusterHelper()).
+			Data("teaMenu", "clusters").
 			Prefix("/clusters/cluster").
 			Get("", new(IndexAction)).
+			Get("/nodes", new(NodesAction)).
 			GetPost("/installNodes", new(InstallNodesAction)).
 			GetPost("/installRemote", new(InstallRemoteAction)).
 			Post("/installStatus", new(InstallStatusAction)).
@@ -25,37 +30,40 @@ func init() {
 			Post("/upgradeStatus", new(UpgradeStatusAction)).
 			GetPost("/delete", new(DeleteAction)).
 			GetPost("/createNode", new(CreateNodeAction)).
+			Post("/createNodeInstall", new(CreateNodeInstallAction)).
 			GetPost("/createBatch", new(CreateBatchAction)).
 			GetPost("/updateNodeSSH", new(UpdateNodeSSHAction)).
 			GetPost("/installManual", new(InstallManualAction)).
+			Post("/suggestLoginPorts", new(SuggestLoginPortsAction)).
 
 			// 节点相关
-			Get("/node", new(node.NodeAction)).
-			GetPost("/node/update", new(node.UpdateAction)).
-			GetPost("/node/install", new(node.InstallAction)).
-			Post("/node/updateInstallStatus", new(node.UpdateInstallStatusAction)).
-			Post("/node/status", new(node.StatusAction)).
-			Get("/node/logs", new(node.LogsAction)).
-			Post("/node/start", new(node.StartAction)).
-			Post("/node/stop", new(node.StopAction)).
-			Post("/node/up", new(node.UpAction)).
-			Get("/node/monitor", new(monitor.IndexAction)).
-			Post("/node/monitor/cpu", new(monitor.CpuAction)).
-			Post("/node/monitor/memory", new(monitor.MemoryAction)).
-			Post("/node/monitor/load", new(monitor.LoadAction)).
-			Post("/node/monitor/trafficIn", new(monitor.TrafficInAction)).
-			Post("/node/monitor/trafficOut", new(monitor.TrafficOutAction)).
-			Post("/node/monitor/connections", new(monitor.ConnectionsAction)).
-			Get("/node/thresholds", new(thresholds.IndexAction)).
+			Prefix("/clusters/cluster/node").
+			Get("", new(node.IndexAction)).
+			GetPost("/update", new(node.UpdateAction)).
+			GetPost("/install", new(node.InstallAction)).
+			Post("/updateInstallStatus", new(node.UpdateInstallStatusAction)).
+			Post("/status", new(node.StatusAction)).
+			Get("/logs", new(node.LogsAction)).
+			Post("/start", new(node.StartAction)).
+			Post("/stop", new(node.StopAction)).
+			Post("/up", new(node.UpAction)).
+			Get("/detail", new(node.DetailAction)).
+			GetPost("/updateDNSPopup", new(node.UpdateDNSPopupAction)).
+			Post("/syncDomain", new(node.SyncDomainAction)).
+			GetPost("/settings/cache", new(cache.IndexAction)).
+			GetPost("/settings/dns", new(dns.IndexAction)).
+			GetPost("/settings/system", new(system.IndexAction)).
+			GetPost("/settings/ssh", new(ssh.IndexAction)).
+			GetPost("/settings/thresholds", new(thresholds.IndexAction)).
 
 			// 分组相关
-			Get("/groups", new(groups.IndexAction)).
-			GetPost("/groups/createPopup", new(groups.CreatePopupAction)).
-			GetPost("/groups/updatePopup", new(groups.UpdatePopupAction)).
-			Post("/groups/delete", new(groups.DeleteAction)).
-			Post("/groups/sort", new(groups.SortAction)).
-			GetPost("/groups/selectPopup", new(groups.SelectPopupAction)).
-
+			Prefix("/clusters/cluster/groups").
+			Get("", new(groups.IndexAction)).
+			GetPost("/createPopup", new(groups.CreatePopupAction)).
+			GetPost("/updatePopup", new(groups.UpdatePopupAction)).
+			Post("/delete", new(groups.DeleteAction)).
+			Post("/sort", new(groups.SortAction)).
+			GetPost("/selectPopup", new(groups.SelectPopupAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/clusters/cluster/installManual.go

@@ -21,7 +21,7 @@ func (this *InstallManualAction) RunGet(params struct {
 }) {
 	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "manual")
 
-	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: params.ClusterId})
+	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithNodeClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithNodeClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -30,8 +30,8 @@ func (this *InstallManualAction) RunGet(params struct {
 	nodeMaps := []maps.Map{}
 	for _, node := range nodesResp.Nodes {
 		loginParams := maps.Map{}
-		if node.Login != nil && len(node.Login.Params) > 0 {
-			err := json.Unmarshal(node.Login.Params, &loginParams)
+		if node.NodeLogin != nil && len(node.NodeLogin.Params) > 0 {
+			err := json.Unmarshal(node.NodeLogin.Params, &loginParams)
 			if err != nil {
 				this.ErrorPage(err)
 				return
@@ -56,7 +56,7 @@ func (this *InstallManualAction) RunGet(params struct {
 			"isOn":          node.IsOn,
 			"name":          node.Name,
 			"addresses":     node.IpAddresses,
-			"login":         node.Login,
+			"login":         node.NodeLogin,
 			"loginParams":   loginParams,
 			"installStatus": installStatus,
 		})

internal/web/actions/default/clusters/cluster/installNodes.go

@@ -49,7 +49,7 @@ func (this *InstallNodesAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		for _, apiNode := range apiNodesResp.Nodes {
+		for _, apiNode := range apiNodesResp.ApiNodes {
 			if !apiNode.IsOn {
 				continue
 			}

internal/web/actions/default/clusters/cluster/installRemote.go

@@ -23,7 +23,7 @@ func (this *InstallRemoteAction) RunGet(params struct {
 }) {
 	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "install")
 
-	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: params.ClusterId})
+	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithNodeClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithNodeClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -32,8 +32,8 @@ func (this *InstallRemoteAction) RunGet(params struct {
 	nodeMaps := []maps.Map{}
 	for _, node := range nodesResp.Nodes {
 		loginParams := maps.Map{}
-		if node.Login != nil && len(node.Login.Params) > 0 {
-			err := json.Unmarshal(node.Login.Params, &loginParams)
+		if node.NodeLogin != nil && len(node.NodeLogin.Params) > 0 {
+			err := json.Unmarshal(node.NodeLogin.Params, &loginParams)
 			if err != nil {
 				this.ErrorPage(err)
 				return
@@ -58,7 +58,7 @@ func (this *InstallRemoteAction) RunGet(params struct {
 			"isOn":          node.IsOn,
 			"name":          node.Name,
 			"addresses":     node.IpAddresses,
-			"login":         node.Login,
+			"login":         node.NodeLogin,
 			"loginParams":   loginParams,
 			"installStatus": installStatus,
 		})

internal/web/actions/default/clusters/cluster/node/detail.go

@@ -3,25 +3,27 @@ package node
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses/ipaddressutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 	"time"
 )
 
-type NodeAction struct {
+type DetailAction struct {
 	actionutils.ParentAction
 }
 
-func (this *NodeAction) Init() {
+func (this *DetailAction) Init() {
 	this.Nav("", "node", "node")
 	this.SecondMenu("nodes")
 }
 
-func (this *NodeAction) RunGet(params struct {
+func (this *DetailAction) RunGet(params struct {
 	NodeId int64
 }) {
 	this.Data["nodeId"] = params.NodeId
@@ -37,6 +39,7 @@ func (this *NodeAction) RunGet(params struct {
 		return
 	}
 
+	// 主集群
 	var clusterMap maps.Map = nil
 	if node.NodeCluster != nil {
 		clusterId := node.NodeCluster.Id
@@ -55,57 +58,103 @@ func (this *NodeAction) RunGet(params struct {
 		}
 	}
 
+	// 从集群
+	var secondaryClustersMaps = []maps.Map{}
+	for _, cluster := range node.SecondaryNodeClusters {
+		secondaryClustersMaps = append(secondaryClustersMaps, maps.Map{
+			"id":   cluster.Id,
+			"name": cluster.Name,
+			"isOn": cluster.IsOn,
+		})
+	}
+
 	// IP地址
-	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{NodeId: params.NodeId})
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
+		NodeId: params.NodeId,
+		Role:   nodeconfigs.NodeRoleNode,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
+	var ipAddresses = ipAddressesResp.NodeIPAddresses
 	ipAddressMaps := []maps.Map{}
-	for _, addr := range ipAddressesResp.Addresses {
+	for _, addr := range ipAddressesResp.NodeIPAddresses {
+		thresholds, err := ipaddressutils.InitNodeIPAddressThresholds(this.Parent(), addr.Id)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
 		ipAddressMaps = append(ipAddressMaps, maps.Map{
-			"id":        addr.Id,
-			"name":      addr.Name,
-			"ip":        addr.Ip,
-			"canAccess": addr.CanAccess,
+			"id":         addr.Id,
+			"name":       addr.Name,
+			"ip":         addr.Ip,
+			"canAccess":  addr.CanAccess,
+			"isOn":       addr.IsOn,
+			"isUp":       addr.IsUp,
+			"thresholds": thresholds,
 		})
 	}
 
 	// DNS相关
-	dnsInfoResp, err := this.RPC().NodeRPC().FindEnabledNodeDNS(this.AdminContext(), &pb.FindEnabledNodeDNSRequest{NodeId: params.NodeId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	dnsRouteMaps := []maps.Map{}
-	recordName := ""
-	recordValue := ""
-	if dnsInfoResp.Node != nil {
-		recordName = dnsInfoResp.Node.NodeClusterDNSName + "." + dnsInfoResp.Node.DnsDomainName
-		recordValue = dnsInfoResp.Node.IpAddr
-		for _, dnsInfo := range dnsInfoResp.Node.Routes {
-			dnsRouteMaps = append(dnsRouteMaps, maps.Map{
-				"name": dnsInfo.Name,
-				"code": dnsInfo.Code,
-			})
+	var clusters = []*pb.NodeCluster{node.NodeCluster}
+	clusters = append(clusters, node.SecondaryNodeClusters...)
+	var recordMaps = []maps.Map{}
+	var routeMaps = []maps.Map{}
+	for _, cluster := range clusters {
+		dnsInfoResp, err := this.RPC().NodeRPC().FindEnabledNodeDNS(this.AdminContext(), &pb.FindEnabledNodeDNSRequest{
+			NodeId:        params.NodeId,
+			NodeClusterId: cluster.Id,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		var dnsInfo = dnsInfoResp.Node
+		if len(dnsInfo.DnsDomainName) == 0 || len(dnsInfo.NodeClusterDNSName) == 0 {
+			continue
+		}
+		var domainName = dnsInfo.DnsDomainName
+
+		// 默认线路
+		if len(dnsInfo.Routes) == 0 {
+			dnsInfo.Routes = append(dnsInfo.Routes, &pb.DNSRoute{})
+		} else {
+			for _, route := range dnsInfo.Routes {
+				routeMaps = append(routeMaps, maps.Map{
+					"domainName": domainName,
+					"code":       route.Code,
+					"name":       route.Name,
+				})
+			}
+		}
+
+		for _, addr := range ipAddresses {
+			if !addr.CanAccess || !addr.IsUp || !addr.IsOn {
+				continue
+			}
+			for _, route := range dnsInfo.Routes {
+				var recordType = "A"
+				if utils.IsIPv6(addr.Ip) {
+					recordType = "AAAA"
+				}
+				recordMaps = append(recordMaps, maps.Map{
+					"name":  dnsInfo.NodeClusterDNSName + "." + domainName,
+					"type":  recordType,
+					"route": route.Name,
+					"value": addr.Ip,
+				})
+			}
 		}
 	}
-	if len(dnsRouteMaps) == 0 {
-		dnsRouteMaps = append(dnsRouteMaps, maps.Map{
-			"name": "",
-			"code": "",
-		})
-	}
-	this.Data["dnsRoutes"] = dnsRouteMaps
-	this.Data["dnsRecordName"] = recordName
-	this.Data["dnsRecordValue"] = recordValue
 
 	// 登录信息
 	var loginMap maps.Map = nil
-	if node.Login != nil {
+	if node.NodeLogin != nil {
 		loginParams := maps.Map{}
-		if len(node.Login.Params) > 0 {
-			err = json.Unmarshal(node.Login.Params, &loginParams)
+		if len(node.NodeLogin.Params) > 0 {
+			err = json.Unmarshal(node.NodeLogin.Params, &loginParams)
 			if err != nil {
 				this.ErrorPage(err)
 				return
@@ -126,14 +175,15 @@ func (this *NodeAction) RunGet(params struct {
 					"name":       grantResp.NodeGrant.Name,
 					"method":     grantResp.NodeGrant.Method,
 					"methodName": grantutils.FindGrantMethodName(grantResp.NodeGrant.Method),
+					"username":   grantResp.NodeGrant.Username,
 				}
 			}
 		}
 
 		loginMap = maps.Map{
-			"id":     node.Login.Id,
-			"name":   node.Login.Name,
-			"type":   node.Login.Type,
+			"id":     node.NodeLogin.Id,
+			"name":   node.NodeLogin.Name,
+			"type":   node.NodeLogin.Type,
 			"params": loginParams,
 			"grant":  grantMap,
 		}
@@ -170,19 +220,19 @@ func (this *NodeAction) RunGet(params struct {
 
 	// 分组
 	var groupMap maps.Map = nil
-	if node.Group != nil {
+	if node.NodeGroup != nil {
 		groupMap = maps.Map{
-			"id":   node.Group.Id,
-			"name": node.Group.Name,
+			"id":   node.NodeGroup.Id,
+			"name": node.NodeGroup.Name,
 		}
 	}
 
 	// 区域
 	var regionMap maps.Map = nil
-	if node.Region != nil {
+	if node.NodeRegion != nil {
 		regionMap = maps.Map{
-			"id":   node.Region.Id,
-			"name": node.Region.Name,
+			"id":   node.NodeRegion.Id,
+			"name": node.NodeRegion.Name,
 		}
 	}
 
@@ -214,17 +264,20 @@ func (this *NodeAction) RunGet(params struct {
 	}
 
 	this.Data["node"] = maps.Map{
-		"id":          node.Id,
-		"name":        node.Name,
-		"ipAddresses": ipAddressMaps,
-		"cluster":     clusterMap,
-		"login":       loginMap,
-		"installDir":  node.InstallDir,
-		"isInstalled": node.IsInstalled,
-		"uniqueId":    node.UniqueId,
-		"secret":      node.Secret,
-		"maxCPU":      node.MaxCPU,
-		"isOn":        node.IsOn,
+		"id":                node.Id,
+		"name":              node.Name,
+		"ipAddresses":       ipAddressMaps,
+		"cluster":           clusterMap,
+		"secondaryClusters": secondaryClustersMaps,
+		"login":             loginMap,
+		"installDir":        node.InstallDir,
+		"isInstalled":       node.IsInstalled,
+		"uniqueId":          node.UniqueId,
+		"secret":            node.Secret,
+		"maxCPU":            node.MaxCPU,
+		"isOn":              node.IsOn,
+		"records":           recordMaps,
+		"routes":            routeMaps,
 
 		"status": maps.Map{
 			"isActive":             status.IsActive,

internal/web/actions/default/clusters/cluster/node/index.go

@@ -0,0 +1,34 @@
+package node
+
+import (
+	"fmt"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
+	"strconv"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "node", "node")
+	this.SecondMenu("nodes")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	NodeId int64
+}) {
+	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	if teaconst.IsPlus {
+		this.RedirectURL("/clusters/cluster/node/boards?clusterId=" + fmt.Sprintf("%d", this.Data["clusterId"]) + "&nodeId=" + strconv.FormatInt(params.NodeId, 10))
+	} else {
+		this.RedirectURL("/clusters/cluster/node/detail?clusterId=" + fmt.Sprintf("%d", this.Data["clusterId"]) + "&nodeId=" + strconv.FormatInt(params.NodeId, 10))
+	}
+}

internal/web/actions/default/clusters/cluster/node/install.go

@@ -3,13 +3,14 @@ package node
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 	"strings"
 )
 
-// 安装节点
+// InstallAction 安装节点
 type InstallAction struct {
 	actionutils.ParentAction
 }
@@ -25,16 +26,11 @@ func (this *InstallAction) RunGet(params struct {
 	this.Data["nodeId"] = params.NodeId
 
 	// 节点
-	nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: params.NodeId})
+	node, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	node := nodeResp.Node
-	if node == nil {
-		this.WriteString("找不到要操作的节点")
-		return
-	}
 
 	// 安装信息
 	if node.InstallStatus != nil {
@@ -74,7 +70,7 @@ func (this *InstallAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	apiNodes := apiNodesResp.Nodes
+	apiNodes := apiNodesResp.ApiNodes
 	apiEndpoints := []string{}
 	for _, apiNode := range apiNodes {
 		if !apiNode.IsOn {
@@ -84,20 +80,17 @@ func (this *InstallAction) RunGet(params struct {
 	}
 	this.Data["apiEndpoints"] = "\"" + strings.Join(apiEndpoints, "\", \"") + "\""
 
-	this.Data["node"] = maps.Map{
-		"id":          node.Id,
-		"name":        node.Name,
-		"installDir":  node.InstallDir,
-		"isInstalled": node.IsInstalled,
-		"uniqueId":    node.UniqueId,
-		"secret":      node.Secret,
-		"cluster":     clusterMap,
-	}
+	var nodeMap = this.Data["node"].(maps.Map)
+	nodeMap["installDir"] = node.InstallDir
+	nodeMap["isInstalled"] = node.IsInstalled
+	nodeMap["uniqueId"] = node.UniqueId
+	nodeMap["secret"] = node.Secret
+	nodeMap["cluster"] = clusterMap
 
 	this.Show()
 }
 
-// 开始安装
+// RunPost 开始安装
 func (this *InstallAction) RunPost(params struct {
 	NodeId int64
 

internal/web/actions/default/clusters/cluster/node/logs.go

@@ -2,6 +2,7 @@ package node
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
@@ -17,13 +18,32 @@ func (this *LogsAction) Init() {
 }
 
 func (this *LogsAction) RunGet(params struct {
-	NodeId int64
+	NodeId  int64
+	DayFrom string
+	DayTo   string
+	Keyword string
+	Level   string
 }) {
+	// 初始化节点信息（用于菜单）
+	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Data["nodeId"] = params.NodeId
+	this.Data["dayFrom"] = params.DayFrom
+	this.Data["dayTo"] = params.DayTo
+	this.Data["keyword"] = params.Keyword
+	this.Data["level"] = params.Level
 
 	countResp, err := this.RPC().NodeLogRPC().CountNodeLogs(this.AdminContext(), &pb.CountNodeLogsRequest{
-		Role:   "node",
-		NodeId: params.NodeId,
+		Role:    "node",
+		NodeId:  params.NodeId,
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -33,20 +53,44 @@ func (this *LogsAction) RunGet(params struct {
 	page := this.NewPage(count, 20)
 
 	logsResp, err := this.RPC().NodeLogRPC().ListNodeLogs(this.AdminContext(), &pb.ListNodeLogsRequest{
-		NodeId: params.NodeId,
-		Role:   "node",
-		Offset: page.Offset,
-		Size:   page.Size,
+		NodeId:  params.NodeId,
+		Role:    "node",
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+		Offset:  page.Offset,
+		Size:    page.Size,
 	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
 
 	logs := []maps.Map{}
 	for _, log := range logsResp.NodeLogs {
+		// 服务信息
+		var serverMap = maps.Map{"id": 0}
+		if log.ServerId > 0 {
+			serverResp, err := this.RPC().ServerRPC().FindEnabledUserServerBasic(this.AdminContext(), &pb.FindEnabledUserServerBasicRequest{ServerId: log.ServerId})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			var server = serverResp.Server
+			if server != nil {
+				serverMap = maps.Map{"id": server.Id, "name": server.Name}
+			}
+		}
+
 		logs = append(logs, maps.Map{
 			"tag":         log.Tag,
 			"description": log.Description,
 			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", log.CreatedAt),
 			"level":       log.Level,
 			"isToday":     timeutil.FormatTime("Y-m-d", log.CreatedAt) == timeutil.Format("Y-m-d"),
+			"count":       log.Count,
+			"server":      serverMap,
 		})
 	}
 	this.Data["logs"] = logs

internal/web/actions/default/clusters/cluster/node/monitor/connections.go

@@ -1,73 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package monitor
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-	"time"
-)
-
-type ConnectionsAction struct {
-	actionutils.ParentAction
-}
-
-func (this *ConnectionsAction) RunPost(params struct {
-	NodeId int64
-}) {
-	resp, err := this.RPC().NodeValueRPC().ListNodeValues(this.AdminContext(), &pb.ListNodeValuesRequest{
-		Role:   "node",
-		NodeId: params.NodeId,
-		Item:   nodeconfigs.NodeValueItemConnections,
-		Range:  nodeconfigs.NodeValueRangeMinute,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	valuesMap := map[string]int64{} // YmdHi => count
-	for _, v := range resp.NodeValues {
-		if len(v.ValueJSON) == 0 {
-			continue
-		}
-
-		valueMap := maps.Map{}
-		err = json.Unmarshal(v.ValueJSON, &valueMap)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-
-		valuesMap[timeutil.FormatTime("YmdHi", v.CreatedAt)] = valueMap.GetInt64("total")
-	}
-
-	// 过去一个小时
-	result := []maps.Map{}
-	for i := 60; i >= 1; i-- {
-		timestamp := time.Now().Unix() - int64(i)*60
-		minute := timeutil.FormatTime("YmdHi", timestamp)
-		total, ok := valuesMap[minute]
-		if ok {
-			result = append(result, maps.Map{
-				"label": timeutil.FormatTime("H:i", timestamp),
-				"value": total,
-				"text":  numberutils.FormatInt64(total),
-			})
-		} else {
-			result = append(result, maps.Map{
-				"label": timeutil.FormatTime("H:i", timestamp),
-				"value": 0,
-				"text":  "0",
-			})
-		}
-	}
-
-	this.Data["values"] = result
-
-	this.Success()
-}

internal/web/actions/default/clusters/cluster/node/monitor/cpu.go

@@ -1,73 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package monitor
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-	"time"
-)
-
-type CpuAction struct {
-	actionutils.ParentAction
-}
-
-func (this *CpuAction) RunPost(params struct {
-	NodeId int64
-}) {
-	resp, err := this.RPC().NodeValueRPC().ListNodeValues(this.AdminContext(), &pb.ListNodeValuesRequest{
-		Role:   "node",
-		NodeId: params.NodeId,
-		Item:   nodeconfigs.NodeValueItemCPU,
-		Range:  nodeconfigs.NodeValueRangeMinute,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	valuesMap := map[string]float32{} // YmdHi => usage
-	for _, v := range resp.NodeValues {
-		if len(v.ValueJSON) == 0 {
-			continue
-		}
-
-		valueMap := maps.Map{}
-		err = json.Unmarshal(v.ValueJSON, &valueMap)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-
-		valuesMap[timeutil.FormatTime("YmdHi", v.CreatedAt)] = valueMap.GetFloat32("usage") * 100
-	}
-
-	// 过去一个小时
-	result := []maps.Map{}
-	for i := 60; i >= 1; i-- {
-		timestamp := time.Now().Unix() - int64(i)*60
-		minute := timeutil.FormatTime("YmdHi", timestamp)
-		total, ok := valuesMap[minute]
-		if ok {
-			result = append(result, maps.Map{
-				"label": timeutil.FormatTime("H:i", timestamp),
-				"value": total,
-				"text":  fmt.Sprintf("%.2f%%", total),
-			})
-		} else {
-			result = append(result, maps.Map{
-				"label": timeutil.FormatTime("H:i", timestamp),
-				"value": 0,
-				"text":  "0.0%",
-			})
-		}
-	}
-
-	this.Data["values"] = result
-
-	this.Success()
-}

internal/web/actions/default/clusters/cluster/node/monitor/load.go

@@ -1,73 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package monitor
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-	"time"
-)
-
-type LoadAction struct {
-	actionutils.ParentAction
-}
-
-func (this *LoadAction) RunPost(params struct {
-	NodeId int64
-}) {
-	resp, err := this.RPC().NodeValueRPC().ListNodeValues(this.AdminContext(), &pb.ListNodeValuesRequest{
-		Role:   "node",
-		NodeId: params.NodeId,
-		Item:   nodeconfigs.NodeValueItemLoad,
-		Range:  nodeconfigs.NodeValueRangeMinute,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	valuesMap := map[string]float32{} // YmdHi => load5m
-	for _, v := range resp.NodeValues {
-		if len(v.ValueJSON) == 0 {
-			continue
-		}
-
-		valueMap := maps.Map{}
-		err = json.Unmarshal(v.ValueJSON, &valueMap)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-
-		valuesMap[timeutil.FormatTime("YmdHi", v.CreatedAt)] = valueMap.GetFloat32("load5m")
-	}
-
-	// 过去一个小时
-	result := []maps.Map{}
-	for i := 60; i >= 1; i-- {
-		timestamp := time.Now().Unix() - int64(i)*60
-		minute := timeutil.FormatTime("YmdHi", timestamp)
-		total, ok := valuesMap[minute]
-		if ok {
-			result = append(result, maps.Map{
-				"label": timeutil.FormatTime("H:i", timestamp),
-				"value": total,
-				"text":  fmt.Sprintf("5分钟: %.2f", total),
-			})
-		} else {
-			result = append(result, maps.Map{
-				"label": timeutil.FormatTime("H:i", timestamp),
-				"value": 0,
-				"text":  "5分钟: 0.0",
-			})
-		}
-	}
-
-	this.Data["values"] = result
-
-	this.Success()
-}

internal/web/actions/default/clusters/cluster/node/monitor/memory.go

@@ -1,73 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package monitor
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-	"time"
-)
-
-type MemoryAction struct {
-	actionutils.ParentAction
-}
-
-func (this *MemoryAction) RunPost(params struct {
-	NodeId int64
-}) {
-	resp, err := this.RPC().NodeValueRPC().ListNodeValues(this.AdminContext(), &pb.ListNodeValuesRequest{
-		Role:   "node",
-		NodeId: params.NodeId,
-		Item:   nodeconfigs.NodeValueItemMemory,
-		Range:  nodeconfigs.NodeValueRangeMinute,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	valuesMap := map[string]float32{} // YmdHi => usage
-	for _, v := range resp.NodeValues {
-		if len(v.ValueJSON) == 0 {
-			continue
-		}
-
-		valueMap := maps.Map{}
-		err = json.Unmarshal(v.ValueJSON, &valueMap)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-
-		valuesMap[timeutil.FormatTime("YmdHi", v.CreatedAt)] = valueMap.GetFloat32("usage") * 100
-	}
-
-	// 过去一个小时
-	result := []maps.Map{}
-	for i := 60; i >= 1; i-- {
-		timestamp := time.Now().Unix() - int64(i)*60
-		minute := timeutil.FormatTime("YmdHi", timestamp)
-		total, ok := valuesMap[minute]
-		if ok {
-			result = append(result, maps.Map{
-				"label": timeutil.FormatTime("H:i", timestamp),
-				"value": total,
-				"text":  fmt.Sprintf("%.2f%%", total),
-			})
-		} else {
-			result = append(result, maps.Map{
-				"label": timeutil.FormatTime("H:i", timestamp),
-				"value": 0,
-				"text":  "0.0%",
-			})
-		}
-	}
-
-	this.Data["values"] = result
-
-	this.Success()
-}

internal/web/actions/default/clusters/cluster/node/monitor/trafficIn.go

@@ -1,73 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package monitor
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-	"time"
-)
-
-type TrafficInAction struct {
-	actionutils.ParentAction
-}
-
-func (this *TrafficInAction) RunPost(params struct {
-	NodeId int64
-}) {
-	resp, err := this.RPC().NodeValueRPC().ListNodeValues(this.AdminContext(), &pb.ListNodeValuesRequest{
-		Role:   "node",
-		NodeId: params.NodeId,
-		Item:   nodeconfigs.NodeValueItemTrafficIn,
-		Range:  nodeconfigs.NodeValueRangeMinute,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	valuesMap := map[string]int64{} // YmdHi => bytes
-	for _, v := range resp.NodeValues {
-		if len(v.ValueJSON) == 0 {
-			continue
-		}
-
-		valueMap := maps.Map{}
-		err = json.Unmarshal(v.ValueJSON, &valueMap)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-
-		valuesMap[timeutil.FormatTime("YmdHi", v.CreatedAt)] = valueMap.GetInt64("total")
-	}
-
-	// 过去一个小时
-	result := []maps.Map{}
-	for i := 60; i >= 1; i-- {
-		timestamp := time.Now().Unix() - int64(i)*60
-		minute := timeutil.FormatTime("YmdHi", timestamp)
-		total, ok := valuesMap[minute]
-		if ok {
-			result = append(result, maps.Map{
-				"label": timeutil.FormatTime("H:i", timestamp),
-				"value": total,
-				"text":  numberutils.FormatBytes(total),
-			})
-		} else {
-			result = append(result, maps.Map{
-				"label": timeutil.FormatTime("H:i", timestamp),
-				"value": 0,
-				"text":  numberutils.FormatBytes(0),
-			})
-		}
-	}
-
-	this.Data["values"] = result
-
-	this.Success()
-}

internal/web/actions/default/clusters/cluster/node/monitor/trafficOut.go

@@ -1,73 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package monitor
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-	"time"
-)
-
-type TrafficOutAction struct {
-	actionutils.ParentAction
-}
-
-func (this *TrafficOutAction) RunPost(params struct {
-	NodeId int64
-}) {
-	resp, err := this.RPC().NodeValueRPC().ListNodeValues(this.AdminContext(), &pb.ListNodeValuesRequest{
-		Role:   "node",
-		NodeId: params.NodeId,
-		Item:   nodeconfigs.NodeValueItemTrafficOut,
-		Range:  nodeconfigs.NodeValueRangeMinute,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	valuesMap := map[string]int64{} // YmdHi => bytes
-	for _, v := range resp.NodeValues {
-		if len(v.ValueJSON) == 0 {
-			continue
-		}
-
-		valueMap := maps.Map{}
-		err = json.Unmarshal(v.ValueJSON, &valueMap)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-
-		valuesMap[timeutil.FormatTime("YmdHi", v.CreatedAt)] = valueMap.GetInt64("total")
-	}
-
-	// 过去一个小时
-	result := []maps.Map{}
-	for i := 60; i >= 1; i-- {
-		timestamp := time.Now().Unix() - int64(i)*60
-		minute := timeutil.FormatTime("YmdHi", timestamp)
-		total, ok := valuesMap[minute]
-		if ok {
-			result = append(result, maps.Map{
-				"label": timeutil.FormatTime("H:i", timestamp),
-				"value": total,
-				"text":  numberutils.FormatBytes(total),
-			})
-		} else {
-			result = append(result, maps.Map{
-				"label": timeutil.FormatTime("H:i", timestamp),
-				"value": 0,
-				"text":  numberutils.FormatBytes(0),
-			})
-		}
-	}
-
-	this.Data["values"] = result
-
-	this.Success()
-}

internal/web/actions/default/clusters/cluster/node/nodeutils/utils.go

@@ -0,0 +1,94 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nodeutils
+
+import (
+	"errors"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
+	"strconv"
+)
+
+// InitNodeInfo 初始化节点信息
+func InitNodeInfo(parentAction *actionutils.ParentAction, nodeId int64) (*pb.Node, error) {
+	// 节点信息（用于菜单）
+	nodeResp, err := parentAction.RPC().NodeRPC().FindEnabledNode(parentAction.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: nodeId})
+	if err != nil {
+		return nil, err
+	}
+	if nodeResp.Node == nil {
+		return nil, errors.New("node '" + strconv.FormatInt(nodeId, 10) + "' not found")
+	}
+	var node = nodeResp.Node
+
+	var groupMap maps.Map
+	if node.NodeGroup != nil {
+		groupMap = maps.Map{
+			"id":   node.NodeGroup.Id,
+			"name": node.NodeGroup.Name,
+		}
+	}
+
+	parentAction.Data["node"] = maps.Map{
+		"id":    node.Id,
+		"name":  node.Name,
+		"isOn":  node.IsOn,
+		"isUp":  node.IsUp,
+		"group": groupMap,
+	}
+	var clusterId int64 = 0
+	if node.NodeCluster != nil {
+		parentAction.Data["clusterId"] = node.NodeCluster.Id
+		clusterId = node.NodeCluster.Id
+	}
+
+	// 左侧菜单
+	var prefix = "/clusters/cluster/node"
+	var query = "clusterId=" + types.String(clusterId) + "&nodeId=" + types.String(nodeId)
+	var menuItem = parentAction.Data.GetString("secondMenuItem")
+
+	var menuItems = []maps.Map{
+		{
+			"name":     "基础设置",
+			"url":      prefix + "/update?" + query,
+			"isActive": menuItem == "basic",
+		},
+		{
+			"name":     "DNS设置",
+			"url":      prefix + "/settings/dns?" + query,
+			"isActive": menuItem == "dns",
+		},
+		{
+			"name":     "缓存设置",
+			"url":      prefix + "/settings/cache?" + query,
+			"isActive": menuItem == "cache",
+		},
+	}
+	if teaconst.IsPlus {
+		menuItems = append(menuItems, []maps.Map{
+			{
+				"name":     "阈值设置",
+				"url":      prefix + "/settings/thresholds?" + query,
+				"isActive": menuItem == "threshold",
+			},
+		}...)
+	}
+	menuItems = append(menuItems, []maps.Map{
+		{
+			"name":     "SSH设置",
+			"url":      prefix + "/settings/ssh?" + query,
+			"isActive": menuItem == "ssh",
+		},
+		{
+			"name":     "系统设置",
+			"url":      prefix + "/settings/system?" + query,
+			"isActive": menuItem == "system",
+		},
+	}...)
+	parentAction.Data["leftMenuItems"] = menuItems
+
+	return nodeResp.Node, nil
+}

internal/web/actions/default/clusters/cluster/node/settings/cache/index.go

@@ -0,0 +1,117 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package cache
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "", "update")
+	this.SecondMenu("cache")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	NodeId int64
+}) {
+	node, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 缓存硬盘 & 内存容量
+	var maxCacheDiskCapacity maps.Map = nil
+	if node.MaxCacheDiskCapacity != nil {
+		maxCacheDiskCapacity = maps.Map{
+			"count": node.MaxCacheDiskCapacity.Count,
+			"unit":  node.MaxCacheDiskCapacity.Unit,
+		}
+	} else {
+		maxCacheDiskCapacity = maps.Map{
+			"count": 0,
+			"unit":  "gb",
+		}
+	}
+
+	var maxCacheMemoryCapacity maps.Map = nil
+	if node.MaxCacheMemoryCapacity != nil {
+		maxCacheMemoryCapacity = maps.Map{
+			"count": node.MaxCacheMemoryCapacity.Count,
+			"unit":  node.MaxCacheMemoryCapacity.Unit,
+		}
+	} else {
+		maxCacheMemoryCapacity = maps.Map{
+			"count": 0,
+			"unit":  "gb",
+		}
+	}
+
+	var nodeMap = this.Data["node"].(maps.Map)
+	nodeMap["maxCacheDiskCapacity"] = maxCacheDiskCapacity
+	nodeMap["maxCacheMemoryCapacity"] = maxCacheMemoryCapacity
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	NodeId                     int64
+	MaxCacheDiskCapacityJSON   []byte
+	MaxCacheMemoryCapacityJSON []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改节点 %d 缓存设置", params.NodeId)
+
+	// 缓存硬盘 & 内存容量
+	var pbMaxCacheDiskCapacity *pb.SizeCapacity
+	if len(params.MaxCacheDiskCapacityJSON) > 0 {
+		var sizeCapacity = &shared.SizeCapacity{}
+		err := json.Unmarshal(params.MaxCacheDiskCapacityJSON, sizeCapacity)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		pbMaxCacheDiskCapacity = &pb.SizeCapacity{
+			Count: sizeCapacity.Count,
+			Unit:  sizeCapacity.Unit,
+		}
+	}
+
+	var pbMaxCacheMemoryCapacity *pb.SizeCapacity
+	if len(params.MaxCacheMemoryCapacityJSON) > 0 {
+		var sizeCapacity = &shared.SizeCapacity{}
+		err := json.Unmarshal(params.MaxCacheMemoryCapacityJSON, sizeCapacity)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		pbMaxCacheMemoryCapacity = &pb.SizeCapacity{
+			Count: sizeCapacity.Count,
+			Unit:  sizeCapacity.Unit,
+		}
+	}
+
+	_, err := this.RPC().NodeRPC().UpdateNodeCache(this.AdminContext(), &pb.UpdateNodeCacheRequest{
+		NodeId:                 params.NodeId,
+		MaxCacheDiskCapacity:   pbMaxCacheDiskCapacity,
+		MaxCacheMemoryCapacity: pbMaxCacheMemoryCapacity,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/node/settings/dns/index.go

@@ -0,0 +1,125 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package dns
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "", "update")
+	this.SecondMenu("dns")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	NodeId int64
+}) {
+	node, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// DNS相关
+	var clusters = []*pb.NodeCluster{node.NodeCluster}
+	clusters = append(clusters, node.SecondaryNodeClusters...)
+	var allDNSRouteMaps = map[int64][]maps.Map{} // domain id => routes
+	var routeMaps = map[int64][]maps.Map{}       // domain id => routes
+	for _, cluster := range clusters {
+		dnsInfoResp, err := this.RPC().NodeRPC().FindEnabledNodeDNS(this.AdminContext(), &pb.FindEnabledNodeDNSRequest{
+			NodeId:        params.NodeId,
+			NodeClusterId: cluster.Id,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		var dnsInfo = dnsInfoResp.Node
+		if dnsInfo.DnsDomainId <= 0 || len(dnsInfo.DnsDomainName) == 0 {
+			continue
+		}
+		var domainId = dnsInfo.DnsDomainId
+		var domainName = dnsInfo.DnsDomainName
+		if len(dnsInfo.Routes) > 0 {
+			for _, route := range dnsInfo.Routes {
+				routeMaps[domainId] = append(routeMaps[domainId], maps.Map{
+					"domainId":   domainId,
+					"domainName": domainName,
+					"code":       route.Code,
+					"name":       route.Name,
+				})
+			}
+		}
+
+		// 所有线路选项
+		routesResp, err := this.RPC().DNSDomainRPC().FindAllDNSDomainRoutes(this.AdminContext(), &pb.FindAllDNSDomainRoutesRequest{DnsDomainId: dnsInfoResp.Node.DnsDomainId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		for _, route := range routesResp.Routes {
+			allDNSRouteMaps[domainId] = append(allDNSRouteMaps[domainId], maps.Map{
+				"domainId":   domainId,
+				"domainName": domainName,
+				"name":       route.Name,
+				"code":       route.Code,
+			})
+		}
+	}
+
+	var domainRoutes = []maps.Map{}
+	for _, m := range routeMaps {
+		domainRoutes = append(domainRoutes, m...)
+	}
+	this.Data["dnsRoutes"] = domainRoutes
+
+	var allDomainRoutes = []maps.Map{}
+	for _, m := range allDNSRouteMaps {
+		allDomainRoutes = append(allDomainRoutes, m...)
+	}
+	this.Data["allDNSRoutes"] = allDomainRoutes
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	NodeId        int64
+	DnsDomainId   int64
+	DnsRoutesJSON []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改节点 %d DNS设置", params.NodeId)
+
+	dnsRouteCodes := []string{}
+	if len(params.DnsRoutesJSON) > 0 {
+		err := json.Unmarshal(params.DnsRoutesJSON, &dnsRouteCodes)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	_, err := this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{
+		NodeId:      params.NodeId,
+		IpAddr:      "",
+		DnsDomainId: 0,
+		Routes:      dnsRouteCodes,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/node/settings/ssh/index.go

@@ -0,0 +1,114 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ssh
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "", "update")
+	this.SecondMenu("ssh")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	NodeId int64
+}) {
+	node, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 登录信息
+	var loginMap maps.Map = nil
+	if node.NodeLogin != nil {
+		loginParams := maps.Map{}
+		if len(node.NodeLogin.Params) > 0 {
+			err = json.Unmarshal(node.NodeLogin.Params, &loginParams)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+		}
+
+		grantMap := maps.Map{}
+		grantId := loginParams.GetInt64("grantId")
+		if grantId > 0 {
+			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			if grantResp.NodeGrant != nil {
+				grantMap = maps.Map{
+					"id":         grantResp.NodeGrant.Id,
+					"name":       grantResp.NodeGrant.Name,
+					"method":     grantResp.NodeGrant.Method,
+					"methodName": grantutils.FindGrantMethodName(grantResp.NodeGrant.Method),
+					"username":   grantResp.NodeGrant.Username,
+				}
+			}
+		}
+
+		loginMap = maps.Map{
+			"id":     node.NodeLogin.Id,
+			"name":   node.NodeLogin.Name,
+			"type":   node.NodeLogin.Type,
+			"params": loginParams,
+			"grant":  grantMap,
+		}
+	}
+
+	var nodeMap = this.Data["node"].(maps.Map)
+	nodeMap["login"] = loginMap
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	NodeId int64
+
+	LoginId int64
+	GrantId int64
+	SshHost string
+	SshPort int
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改节点 %d SSH登录信息", params.NodeId)
+
+	// TODO 检查登录授权
+	loginInfo := &pb.NodeLogin{
+		Id:   params.LoginId,
+		Name: "SSH",
+		Type: "ssh",
+		Params: maps.Map{
+			"grantId": params.GrantId,
+			"host":    params.SshHost,
+			"port":    params.SshPort,
+		}.AsJSON(),
+	}
+
+	_, err := this.RPC().NodeRPC().UpdateNodeLogin(this.AdminContext(), &pb.UpdateNodeLoginRequest{
+		NodeId:    params.NodeId,
+		NodeLogin: loginInfo,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/node/settings/system/index.go

@@ -0,0 +1,61 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package system
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "", "update")
+	this.SecondMenu("system")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	NodeId int64
+}) {
+	node, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 获取节点信息
+	var nodeMap = this.Data["node"].(maps.Map)
+	nodeMap["maxCPU"] = node.MaxCPU
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	NodeId int64
+	MaxCPU int32
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改节点 %d 系统信息", params.NodeId)
+
+	if params.MaxCPU < 0 {
+		this.Fail("CPU线程数不能小于0")
+	}
+
+	_, err := this.RPC().NodeRPC().UpdateNodeSystem(this.AdminContext(), &pb.UpdateNodeSystemRequest{
+		NodeId: params.NodeId,
+		MaxCPU: params.MaxCPU,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/node/settings/thresholds/index.go

@@ -4,6 +4,7 @@ package thresholds
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
@@ -14,13 +15,20 @@ type IndexAction struct {
 }
 
 func (this *IndexAction) Init() {
-	this.Nav("", "node", "threshold")
+	this.Nav("", "", "update")
+	this.SecondMenu("threshold")
 }
 
 func (this *IndexAction) RunGet(params struct {
 	ClusterId int64
 	NodeId    int64
 }) {
+	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Data["nodeId"] = params.NodeId
 
 	// 列出所有阈值

internal/web/actions/default/clusters/cluster/node/status.go

@@ -6,7 +6,7 @@ import (
 	"github.com/iwind/TeaGo/maps"
 )
 
-// 节点状态
+// StatusAction 节点状态
 type StatusAction struct {
 	actionutils.ParentAction
 }

internal/web/actions/default/clusters/cluster/node/syncDomain.go

@@ -0,0 +1,33 @@
+package node
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type SyncDomainAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SyncDomainAction) RunPost(params struct {
+	DomainId int64
+}) {
+	// 记录日志
+	defer this.CreateLog(oplogs.LevelInfo, "同步DNS域名数据 %d", params.DomainId)
+
+	// 执行同步
+	resp, err := this.RPC().DNSDomainRPC().SyncDNSDomainData(this.AdminContext(), &pb.SyncDNSDomainDataRequest{DnsDomainId: params.DomainId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if resp.IsOk {
+		this.Success()
+	} else {
+		this.Data["shouldFix"] = resp.ShouldFix
+		this.Fail(resp.Error)
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/node/update.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses/ipaddressutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
@@ -18,12 +18,18 @@ type UpdateAction struct {
 
 func (this *UpdateAction) Init() {
 	this.Nav("", "node", "update")
-	this.SecondMenu("nodes")
+	this.SecondMenu("basic")
 }
 
 func (this *UpdateAction) RunGet(params struct {
 	NodeId int64
 }) {
+	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Data["nodeId"] = params.NodeId
 
 	nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: params.NodeId})
@@ -46,197 +52,98 @@ func (this *UpdateAction) RunGet(params struct {
 	}
 
 	// IP地址
-	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{NodeId: params.NodeId})
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
+		NodeId: params.NodeId,
+		Role:   nodeconfigs.NodeRoleNode,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	ipAddressMaps := []maps.Map{}
-	for _, addr := range ipAddressesResp.Addresses {
-		ipAddressMaps = append(ipAddressMaps, maps.Map{
-			"id":        addr.Id,
-			"name":      addr.Name,
-			"ip":        addr.Ip,
-			"canAccess": addr.CanAccess,
-		})
-	}
-
-	// DNS相关
-	dnsInfoResp, err := this.RPC().NodeRPC().FindEnabledNodeDNS(this.AdminContext(), &pb.FindEnabledNodeDNSRequest{NodeId: params.NodeId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	nodeDNS := dnsInfoResp.Node
-	dnsRouteMaps := []maps.Map{}
-	if nodeDNS != nil {
-		for _, dnsInfo := range nodeDNS.Routes {
-			dnsRouteMaps = append(dnsRouteMaps, maps.Map{
-				"name": dnsInfo.Name,
-				"code": dnsInfo.Code,
-			})
-		}
-	}
-	this.Data["dnsRoutes"] = dnsRouteMaps
-	this.Data["allDNSRoutes"] = []maps.Map{}
-	if nodeDNS != nil {
-		this.Data["dnsDomainId"] = nodeDNS.DnsDomainId
-	} else {
-		this.Data["dnsDomainId"] = 0
-	}
-	if nodeDNS != nil && nodeDNS.DnsDomainId > 0 {
-		routesMaps := []maps.Map{}
-		routesResp, err := this.RPC().DNSDomainRPC().FindAllDNSDomainRoutes(this.AdminContext(), &pb.FindAllDNSDomainRoutesRequest{DnsDomainId: dnsInfoResp.Node.DnsDomainId})
+	for _, addr := range ipAddressesResp.NodeIPAddresses {
+		thresholds, err := ipaddressutils.InitNodeIPAddressThresholds(this.Parent(), addr.Id)
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		for _, route := range routesResp.Routes {
-			routesMaps = append(routesMaps, maps.Map{
-				"name": route.Name,
-				"code": route.Code,
-			})
-		}
-		this.Data["allDNSRoutes"] = routesMaps
-	}
 
-	// 登录信息
-	var loginMap maps.Map = nil
-	if node.Login != nil {
-		loginParams := maps.Map{}
-		if len(node.Login.Params) > 0 {
-			err = json.Unmarshal(node.Login.Params, &loginParams)
-			if err != nil {
-				this.ErrorPage(err)
-				return
-			}
-		}
-
-		grantMap := maps.Map{}
-		grantId := loginParams.GetInt64("grantId")
-		if grantId > 0 {
-			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
-			if err != nil {
-				this.ErrorPage(err)
-				return
-			}
-			if grantResp.NodeGrant != nil {
-				grantMap = maps.Map{
-					"id":         grantResp.NodeGrant.Id,
-					"name":       grantResp.NodeGrant.Name,
-					"method":     grantResp.NodeGrant.Method,
-					"methodName": grantutils.FindGrantMethodName(grantResp.NodeGrant.Method),
-				}
-			}
-		}
-
-		loginMap = maps.Map{
-			"id":     node.Login.Id,
-			"name":   node.Login.Name,
-			"type":   node.Login.Type,
-			"params": loginParams,
-			"grant":  grantMap,
-		}
+		ipAddressMaps = append(ipAddressMaps, maps.Map{
+			"id":         addr.Id,
+			"name":       addr.Name,
+			"ip":         addr.Ip,
+			"canAccess":  addr.CanAccess,
+			"isOn":       addr.IsOn,
+			"isUp":       addr.IsUp,
+			"thresholds": thresholds,
+		})
 	}
 
 	// 分组
 	var groupMap maps.Map = nil
-	if node.Group != nil {
+	if node.NodeGroup != nil {
 		groupMap = maps.Map{
-			"id":   node.Group.Id,
-			"name": node.Group.Name,
+			"id":   node.NodeGroup.Id,
+			"name": node.NodeGroup.Name,
 		}
 	}
 
 	// 区域
 	var regionMap maps.Map = nil
-	if node.Region != nil {
+	if node.NodeRegion != nil {
 		regionMap = maps.Map{
-			"id":   node.Region.Id,
-			"name": node.Region.Name,
+			"id":   node.NodeRegion.Id,
+			"name": node.NodeRegion.Name,
 		}
 	}
 
-	// 缓存硬盘 & 内存容量
-	var maxCacheDiskCapacity maps.Map = nil
-	if node.MaxCacheDiskCapacity != nil {
-		maxCacheDiskCapacity = maps.Map{
-			"count": node.MaxCacheDiskCapacity.Count,
-			"unit":  node.MaxCacheDiskCapacity.Unit,
+	var m = maps.Map{
+		"id":          node.Id,
+		"name":        node.Name,
+		"ipAddresses": ipAddressMaps,
+		"cluster":     clusterMap,
+		"isOn":        node.IsOn,
+		"group":       groupMap,
+		"region":      regionMap,
+	}
+
+	if node.NodeCluster != nil {
+		m["primaryCluster"] = maps.Map{
+			"id":   node.NodeCluster.Id,
+			"name": node.NodeCluster.Name,
 		}
 	} else {
-		maxCacheDiskCapacity = maps.Map{
-			"count": 0,
-			"unit":  "gb",
-		}
+		m["primaryCluster"] = nil
 	}
 
-	var maxCacheMemoryCapacity maps.Map = nil
-	if node.MaxCacheMemoryCapacity != nil {
-		maxCacheMemoryCapacity = maps.Map{
-			"count": node.MaxCacheMemoryCapacity.Count,
-			"unit":  node.MaxCacheMemoryCapacity.Unit,
+	if len(node.SecondaryNodeClusters) > 0 {
+		var secondaryClusterMaps = []maps.Map{}
+		for _, cluster := range node.SecondaryNodeClusters {
+			secondaryClusterMaps = append(secondaryClusterMaps, maps.Map{
+				"id":   cluster.Id,
+				"name": cluster.Name,
+			})
 		}
+		m["secondaryClusters"] = secondaryClusterMaps
 	} else {
-		maxCacheMemoryCapacity = maps.Map{
-			"count": 0,
-			"unit":  "gb",
-		}
+		m["secondaryClusters"] = []interface{}{}
 	}
 
-	this.Data["node"] = maps.Map{
-		"id":                     node.Id,
-		"name":                   node.Name,
-		"ipAddresses":            ipAddressMaps,
-		"cluster":                clusterMap,
-		"login":                  loginMap,
-		"maxCPU":                 node.MaxCPU,
-		"isOn":                   node.IsOn,
-		"group":                  groupMap,
-		"region":                 regionMap,
-		"maxCacheDiskCapacity":   maxCacheDiskCapacity,
-		"maxCacheMemoryCapacity": maxCacheMemoryCapacity,
-	}
-
-	// 所有集群
-	resp, err := this.RPC().NodeClusterRPC().FindAllEnabledNodeClusters(this.AdminContext(), &pb.FindAllEnabledNodeClustersRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-	}
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	clusterMaps := []maps.Map{}
-	for _, cluster := range resp.NodeClusters {
-		clusterMaps = append(clusterMaps, maps.Map{
-			"id":   cluster.Id,
-			"name": cluster.Name,
-		})
-	}
-	this.Data["clusters"] = clusterMaps
+	this.Data["node"] = m
 
 	this.Show()
 }
 
 func (this *UpdateAction) RunPost(params struct {
-	LoginId                    int64
-	NodeId                     int64
-	GroupId                    int64
-	RegionId                   int64
-	Name                       string
-	IPAddressesJSON            []byte `alias:"ipAddressesJSON"`
-	ClusterId                  int64
-	GrantId                    int64
-	SshHost                    string
-	SshPort                    int
-	MaxCPU                     int32
-	IsOn                       bool
-	MaxCacheDiskCapacityJSON   []byte
-	MaxCacheMemoryCapacityJSON []byte
-
-	DnsDomainId   int64
-	DnsRoutesJSON []byte
+	LoginId             int64
+	NodeId              int64
+	GroupId             int64
+	RegionId            int64
+	Name                string
+	IPAddressesJSON     []byte `alias:"ipAddressesJSON"`
+	PrimaryClusterId    int64
+	SecondaryClusterIds []byte
+	IsOn                bool
 
 	Must *actions.Must
 }) {
@@ -252,8 +159,17 @@ func (this *UpdateAction) RunPost(params struct {
 		Require("请输入节点名称")
 
 	// TODO 检查cluster
-	if params.ClusterId <= 0 {
-		this.Fail("请选择所在集群")
+	if params.PrimaryClusterId <= 0 {
+		this.Fail("请选择节点所在主集群")
+	}
+
+	var secondaryClusterIds = []int64{}
+	if len(params.SecondaryClusterIds) > 0 {
+		err := json.Unmarshal(params.SecondaryClusterIds, &secondaryClusterIds)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
 	}
 
 	// IP地址
@@ -269,70 +185,15 @@ func (this *UpdateAction) RunPost(params struct {
 		this.Fail("请至少输入一个IP地址")
 	}
 
-	dnsRouteCodes := []string{}
-	if len(params.DnsRoutesJSON) > 0 {
-		err := json.Unmarshal(params.DnsRoutesJSON, &dnsRouteCodes)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-	}
-
-	// TODO 检查登录授权
-	loginInfo := &pb.NodeLogin{
-		Id:   params.LoginId,
-		Name: "SSH",
-		Type: "ssh",
-		Params: maps.Map{
-			"grantId": params.GrantId,
-			"host":    params.SshHost,
-			"port":    params.SshPort,
-		}.AsJSON(),
-	}
-
-	// 缓存硬盘 & 内存容量
-	var pbMaxCacheDiskCapacity *pb.SizeCapacity
-	if len(params.MaxCacheDiskCapacityJSON) > 0 {
-		var sizeCapacity = &shared.SizeCapacity{}
-		err := json.Unmarshal(params.MaxCacheDiskCapacityJSON, sizeCapacity)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		pbMaxCacheDiskCapacity = &pb.SizeCapacity{
-			Count: sizeCapacity.Count,
-			Unit:  sizeCapacity.Unit,
-		}
-	}
-
-	var pbMaxCacheMemoryCapacity *pb.SizeCapacity
-	if len(params.MaxCacheMemoryCapacityJSON) > 0 {
-		var sizeCapacity = &shared.SizeCapacity{}
-		err := json.Unmarshal(params.MaxCacheMemoryCapacityJSON, sizeCapacity)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		pbMaxCacheMemoryCapacity = &pb.SizeCapacity{
-			Count: sizeCapacity.Count,
-			Unit:  sizeCapacity.Unit,
-		}
-	}
-
 	// 保存
 	_, err := this.RPC().NodeRPC().UpdateNode(this.AdminContext(), &pb.UpdateNodeRequest{
-		NodeId:                 params.NodeId,
-		GroupId:                params.GroupId,
-		RegionId:               params.RegionId,
-		Name:                   params.Name,
-		NodeClusterId:          params.ClusterId,
-		Login:                  loginInfo,
-		MaxCPU:                 params.MaxCPU,
-		IsOn:                   params.IsOn,
-		DnsDomainId:            params.DnsDomainId,
-		DnsRoutes:              dnsRouteCodes,
-		MaxCacheDiskCapacity:   pbMaxCacheDiskCapacity,
-		MaxCacheMemoryCapacity: pbMaxCacheMemoryCapacity,
+		NodeId:                  params.NodeId,
+		NodeGroupId:             params.GroupId,
+		NodeRegionId:            params.RegionId,
+		Name:                    params.Name,
+		NodeClusterId:           params.PrimaryClusterId,
+		SecondaryNodeClusterIds: secondaryClusterIds,
+		IsOn:                    params.IsOn,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -340,14 +201,17 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	// 禁用老的IP地址
-	_, err = this.RPC().NodeIPAddressRPC().DisableAllIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllIPAddressesWithNodeIdRequest{NodeId: params.NodeId})
+	_, err = this.RPC().NodeIPAddressRPC().DisableAllNodeIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllNodeIPAddressesWithNodeIdRequest{
+		NodeId: params.NodeId,
+		Role:   nodeconfigs.NodeRoleNode,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
 	// 添加新的IP地址
-	err = ipaddressutils.UpdateNodeIPAddresses(this.Parent(), params.NodeId, params.IPAddressesJSON)
+	err = ipaddressutils.UpdateNodeIPAddresses(this.Parent(), params.NodeId, nodeconfigs.NodeRoleNode, params.IPAddressesJSON)
 	if err != nil {
 		this.ErrorPage(err)
 		return

internal/web/actions/default/clusters/cluster/node/updateDNSPopup.go

@@ -0,0 +1,117 @@
+package node
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+	"net"
+)
+
+type UpdateDNSPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateDNSPopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UpdateDNSPopupAction) RunGet(params struct {
+	ClusterId int64
+	NodeId    int64
+}) {
+	this.Data["nodeId"] = params.NodeId
+
+	dnsInfoResp, err := this.RPC().NodeRPC().FindEnabledNodeDNS(this.AdminContext(), &pb.FindEnabledNodeDNSRequest{
+		NodeId:        params.NodeId,
+		NodeClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	dnsInfo := dnsInfoResp.Node
+	if dnsInfo == nil {
+		this.NotFound("node", params.NodeId)
+		return
+	}
+	this.Data["ipAddr"] = dnsInfo.IpAddr
+	this.Data["routes"] = domainutils.ConvertRoutesToMaps(dnsInfo)
+	this.Data["domainId"] = dnsInfo.DnsDomainId
+	this.Data["domainName"] = dnsInfo.DnsDomainName
+
+	// 读取所有线路
+	allRouteMaps := []maps.Map{}
+	if dnsInfo.DnsDomainId > 0 {
+		routesResp, err := this.RPC().DNSDomainRPC().FindAllDNSDomainRoutes(this.AdminContext(), &pb.FindAllDNSDomainRoutesRequest{DnsDomainId: dnsInfo.DnsDomainId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if len(routesResp.Routes) > 0 {
+			for _, route := range routesResp.Routes {
+				allRouteMaps = append(allRouteMaps, maps.Map{
+					"name":       route.Name,
+					"code":       route.Code,
+					"domainName": dnsInfo.DnsDomainName,
+					"domainId":   dnsInfo.DnsDomainId,
+				})
+			}
+
+			// 筛选
+			var routes = domainutils.FilterRoutes(dnsInfo.Routes, routesResp.Routes)
+			dnsInfo.Routes = routes
+			this.Data["routes"] = domainutils.ConvertRoutesToMaps(dnsInfo)
+		}
+	}
+	this.Data["allRoutes"] = allRouteMaps
+
+	this.Show()
+}
+
+func (this *UpdateDNSPopupAction) RunPost(params struct {
+	NodeId        int64
+	IpAddr        string
+	DomainId      int64
+	DnsRoutesJSON []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	// 操作日志
+	defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId)
+
+	routes := []string{}
+	if len(params.DnsRoutesJSON) > 0 {
+		err := json.Unmarshal(params.DnsRoutesJSON, &routes)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	params.Must.
+		Field("ipAddr", params.IpAddr).
+		Require("请输入IP地址")
+
+	if net.ParseIP(params.IpAddr) == nil {
+		this.FailField("ipAddr", "请输入正确的IP地址")
+	}
+
+	// 执行修改
+	_, err := this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{
+		NodeId:      params.NodeId,
+		IpAddr:      params.IpAddr,
+		DnsDomainId: params.DomainId,
+		Routes:      routes,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/nodes.go

@@ -0,0 +1,271 @@
+package cluster
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
+	"strconv"
+	"time"
+)
+
+type NodesAction struct {
+	actionutils.ParentAction
+}
+
+func (this *NodesAction) Init() {
+	this.Nav("", "node", "index")
+	this.SecondMenu("nodes")
+}
+
+func (this *NodesAction) RunGet(params struct {
+	ClusterId      int64
+	GroupId        int64
+	RegionId       int64
+	InstalledState int
+	ActiveState    int
+	Keyword        string
+
+	CpuOrder        string
+	MemoryOrder     string
+	TrafficInOrder  string
+	TrafficOutOrder string
+}) {
+	this.Data["groupId"] = params.GroupId
+	this.Data["regionId"] = params.RegionId
+	this.Data["installState"] = params.InstalledState
+	this.Data["activeState"] = params.ActiveState
+	this.Data["keyword"] = params.Keyword
+
+	// 集群是否已经设置了线路
+	clusterDNSResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeClusterDNS(this.AdminContext(), &pb.FindEnabledNodeClusterDNSRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["hasClusterDNS"] = clusterDNSResp.Domain != nil
+
+	// 数量
+	countAllResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
+		NodeClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["countAll"] = countAllResp.Count
+
+	countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
+		NodeClusterId: params.ClusterId,
+		NodeGroupId:   params.GroupId,
+		NodeRegionId:  params.RegionId,
+		InstallState:  types.Int32(params.InstalledState),
+		ActiveState:   types.Int32(params.ActiveState),
+		Keyword:       params.Keyword,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	page := this.NewPage(countResp.Count)
+	this.Data["page"] = page.AsHTML()
+
+	var req = &pb.ListEnabledNodesMatchRequest{
+		Offset:        page.Offset,
+		Size:          page.Size,
+		NodeClusterId: params.ClusterId,
+		NodeGroupId:   params.GroupId,
+		NodeRegionId:  params.RegionId,
+		InstallState:  types.Int32(params.InstalledState),
+		ActiveState:   types.Int32(params.ActiveState),
+		Keyword:       params.Keyword,
+	}
+	if params.CpuOrder == "asc" {
+		req.CpuAsc = true
+	} else if params.CpuOrder == "desc" {
+		req.CpuDesc = true
+	} else if params.MemoryOrder == "asc" {
+		req.MemoryAsc = true
+	} else if params.MemoryOrder == "desc" {
+		req.MemoryDesc = true
+	} else if params.TrafficInOrder == "asc" {
+		req.TrafficInAsc = true
+	} else if params.TrafficInOrder == "desc" {
+		req.TrafficInDesc = true
+	} else if params.TrafficOutOrder == "asc" {
+		req.TrafficOutAsc = true
+	} else if params.TrafficOutOrder == "desc" {
+		req.TrafficOutDesc = true
+	}
+	nodesResp, err := this.RPC().NodeRPC().ListEnabledNodesMatch(this.AdminContext(), req)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	nodeMaps := []maps.Map{}
+	for _, node := range nodesResp.Nodes {
+		// 状态
+		isSynced := false
+		status := &nodeconfigs.NodeStatus{}
+		if len(node.StatusJSON) > 0 {
+			err = json.Unmarshal(node.StatusJSON, &status)
+			if err != nil {
+				logs.Error(err)
+				continue
+			}
+			status.IsActive = status.IsActive && time.Now().Unix()-status.UpdatedAt <= 60 // N秒之内认为活跃
+			isSynced = status.ConfigVersion == node.Version
+		}
+
+		// IP
+		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
+			NodeId: node.Id,
+			Role:   nodeconfigs.NodeRoleNode,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		ipAddresses := []maps.Map{}
+		for _, addr := range ipAddressesResp.NodeIPAddresses {
+			ipAddresses = append(ipAddresses, maps.Map{
+				"id":        addr.Id,
+				"name":      addr.Name,
+				"ip":        addr.Ip,
+				"canAccess": addr.CanAccess,
+				"isUp":      addr.IsUp,
+				"isOn":      addr.IsOn,
+			})
+		}
+
+		// 分组
+		var groupMap maps.Map = nil
+		if node.NodeGroup != nil {
+			groupMap = maps.Map{
+				"id":   node.NodeGroup.Id,
+				"name": node.NodeGroup.Name,
+			}
+		}
+
+		// 区域
+		var regionMap maps.Map = nil
+		if node.NodeRegion != nil {
+			regionMap = maps.Map{
+				"id":   node.NodeRegion.Id,
+				"name": node.NodeRegion.Name,
+			}
+		}
+
+		// DNS
+		dnsRouteNames := []string{}
+		for _, route := range node.DnsRoutes {
+			dnsRouteNames = append(dnsRouteNames, route.Name)
+		}
+
+		// 从集群
+		var secondaryClusterMaps []maps.Map
+		for _, secondaryCluster := range node.SecondaryNodeClusters {
+			secondaryClusterMaps = append(secondaryClusterMaps, maps.Map{
+				"id":   secondaryCluster.Id,
+				"name": secondaryCluster.Name,
+				"isOn": secondaryCluster.IsOn,
+			})
+		}
+
+		nodeMaps = append(nodeMaps, maps.Map{
+			"id":          node.Id,
+			"name":        node.Name,
+			"isInstalled": node.IsInstalled,
+			"isOn":        node.IsOn,
+			"isUp":        node.IsUp,
+			"installStatus": maps.Map{
+				"isRunning":  node.InstallStatus.IsRunning,
+				"isFinished": node.InstallStatus.IsFinished,
+				"isOk":       node.InstallStatus.IsOk,
+				"error":      node.InstallStatus.Error,
+			},
+			"status": maps.Map{
+				"isActive":        status.IsActive,
+				"updatedAt":       status.UpdatedAt,
+				"hostname":        status.Hostname,
+				"cpuUsage":        status.CPUUsage,
+				"cpuUsageText":    fmt.Sprintf("%.2f%%", status.CPUUsage*100),
+				"memUsage":        status.MemoryUsage,
+				"memUsageText":    fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
+				"trafficInBytes":  status.TrafficInBytes,
+				"trafficOutBytes": status.TrafficOutBytes,
+			},
+			"cluster": maps.Map{
+				"id":   node.NodeCluster.Id,
+				"name": node.NodeCluster.Name,
+			},
+			"secondaryClusters": secondaryClusterMaps,
+			"isSynced":          isSynced,
+			"ipAddresses":       ipAddresses,
+			"group":             groupMap,
+			"region":            regionMap,
+			"dnsRouteNames":     dnsRouteNames,
+		})
+	}
+	this.Data["nodes"] = nodeMaps
+
+	// 所有分组
+	groupMaps := []maps.Map{}
+	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithNodeClusterIdRequest{
+		NodeClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	for _, group := range groupsResp.NodeGroups {
+		countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGroupId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGroupIdRequest{NodeGroupId: group.Id})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		countNodes := countResp.Count
+		groupName := group.Name
+		if countNodes > 0 {
+			groupName += "(" + strconv.FormatInt(countNodes, 10) + ")"
+		}
+		groupMaps = append(groupMaps, maps.Map{
+			"id":         group.Id,
+			"name":       groupName,
+			"countNodes": countNodes,
+		})
+	}
+	this.Data["groups"] = groupMaps
+
+	// 所有区域
+	regionsResp, err := this.RPC().NodeRegionRPC().FindAllEnabledAndOnNodeRegions(this.AdminContext(), &pb.FindAllEnabledAndOnNodeRegionsRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	regionMaps := []maps.Map{}
+	for _, region := range regionsResp.NodeRegions {
+		regionMaps = append(regionMaps, maps.Map{
+			"id":   region.Id,
+			"name": region.Name,
+		})
+	}
+	this.Data["regions"] = regionMaps
+
+	// 记录最近访问
+	_, err = this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{
+		ItemType: "cluster",
+		ItemId:   params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Show()
+}