修改文字

区域监控增加检测时间、结果页增加级别筛选
提示已经有服务分组配置时加入分组链接
2021-09-24 12:03:31 +08:00 · 2021-09-23 10:02:32 +08:00 · 2021-09-22 19:46:22 +08:00 · 2021-09-22 19:39:38 +08:00 · 2021-09-21 10:56:29 +08:00 · 2021-09-20 20:01:15 +08:00
628 changed files with 15383 additions and 3992 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-*_plus.go
+*_plus.go
+*-plus.sh
+*@plus.js
--- a/README.md
+++ b/README.md
@@ -8,6 +8,9 @@
 * `简单` - 架构简单清晰，安装简单，使用简单，运维简单
 * `高扩展性` - 可以自由扩展新的节点，支持亿级数据

+## 在线演示
+* [http://demo.goedge.cn](http://demo.goedge.cn)
+
 ## 文档
 * [新手指南](https://edge.teaos.cn/docs/QuickStart/Index.md)
 * [完整文档](https://edge.teaos.cn/docs)
--- a/build/build-all.sh
+++ b/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
--- a/build/build-demo.sh
+++ b/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
--- a/build/build.sh
+++ b/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,7 +51,7 @@ 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)
@@ -56,7 +60,7 @@ function build() {

 	# 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=$GOARCH 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
@@ -88,4 +92,4 @@ function lookup-version() {
 	fi
 }

-build $1 $2
+build $1 $2 $3
--- a/cmd/edge-admin/main.go
+++ b/cmd/edge-admin/main.go
@@ -15,7 +15,7 @@ func main() {
 	app := apps.NewAppCmd().
 		Version(teaconst.Version).
 		Product(teaconst.ProductName).
-		Usage(teaconst.ProcessName+" [-v|start|stop|restart|service|daemon|reset|recover]").
+		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").
@@ -57,6 +57,19 @@ func main() {
 		}
 		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.Run(func() {
 		adminNode := nodes.NewAdminNode()
 		adminNode.Run()
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/TeaOSLab/EdgeAdmin

-go 1.15
+go 1.16

 replace github.com/TeaOSLab/EdgeCommon => ../EdgeCommon

@@ -9,10 +9,9 @@ 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/golang/protobuf v1.5.2
 	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/iwind/TeaGo v0.0.0-20210720011303-fc255c995afa
-	github.com/iwind/gosock v0.0.0-20210720054405-4030f271aa3f
+	github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3
 	github.com/miekg/dns v1.1.35
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/tealeg/xlsx/v3 v3.2.3
--- a/go.sum
+++ b/go.sum
@@ -64,13 +64,10 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
 github.com/iwind/TeaGo v0.0.0-20210720011303-fc255c995afa h1:woN88uEmRRUNFD7pRZEtX9heDcjFn0ClMxjF5ButKow=
 github.com/iwind/TeaGo v0.0.0-20210720011303-fc255c995afa/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
-github.com/iwind/gosock v0.0.0-20210706152215-08fe64b7a8a3 h1:BVHIjJU5RUX0grmvDtr3ZZ2z0hX+ideJRpg4NtBXZfs=
-github.com/iwind/gosock v0.0.0-20210706152215-08fe64b7a8a3/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA=
-github.com/iwind/gosock v0.0.0-20210720054405-4030f271aa3f h1:+mKLTd5tCCLXK+iY5Xjz58hau6qFv9chGqcZ4FWUiIs=
-github.com/iwind/gosock v0.0.0-20210720054405-4030f271aa3f/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA=
+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/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.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 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=
@@ -78,12 +75,10 @@ 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/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=
@@ -146,6 +141,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/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=
@@ -169,6 +165,7 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/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=
--- a/internal/apps/app_cmd.go
+++ b/internal/apps/app_cmd.go
@@ -168,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+")")
 }

 // 帮助
--- a/internal/configloaders/admin_module.go
+++ b/internal/configloaders/admin_module.go
@@ -182,7 +182,7 @@ func AllModuleMaps() []maps.Map {
 	}
 	if teaconst.IsPlus {
 		m = append(m, maps.Map{
-			"name": "域名服务",
+			"name": "自建DNS",
 			"code": AdminModuleCodeNS,
 			"url":  "/ns",
 		})
--- a/internal/const/build.go
+++ b/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"
--- a/internal/const/const.go
+++ b/internal/const/const.go
@@ -1,7 +1,9 @@
 package teaconst

 const (
-	Version = "0.2.5"
+	Version = "0.3.1"
+
+	APINodeVersion = "0.3.1"

 	ProductName   = "Edge Admin"
 	ProcessName   = "edge-admin"
--- a/internal/const/const_demo.go
+++ b/internal/const/const_demo.go
@@ -1,7 +0,0 @@
-// +build demo
-
-package teaconst
-
-const (
-	IsDemo = true
-)
--- a/internal/const/const_normal.go
+++ b/internal/const/const_normal.go
@@ -1,7 +0,0 @@
-// +build !demo
-
-package teaconst
-
-const (
-	IsDemo = false
-)
--- a/internal/const/vars.go
+++ b/internal/const/vars.go
@@ -5,3 +5,8 @@ package teaconst
 var (
 	IsRecoverMode = false
 )
+
+var (
+	IsDemoMode         = false
+	ErrorDemoOperation = "DEMO模式下无法进行创建、修改、删除等操作"
+)
--- a/internal/nodes/admin_node.go
+++ b/internal/nodes/admin_node.go
@@ -323,6 +323,9 @@ func (this *AdminNode) listenSock() error {
 			case "recover":
 				teaconst.IsRecoverMode = true
 				_ = cmd.ReplyOk()
+			case "demo":
+				teaconst.IsDemoMode = !teaconst.IsDemoMode
+				_ = cmd.ReplyOk()
 			}
 		})

--- a/internal/rpc/rpc_client.go
+++ b/internal/rpc/rpc_client.go
@@ -71,6 +71,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())
 }
@@ -95,6 +99,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())
 }
@@ -292,6 +304,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())
 }
@@ -388,6 +412,10 @@ 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())
 }
@@ -400,6 +428,10 @@ 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())
 }
--- a/internal/tasks/task_authority.go
+++ b/internal/tasks/task_authority.go
@@ -1,89 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package tasks
-
-import (
-	"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"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-	"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() {
-	// 从缓存中读取
-	config := configs.ReadPlusConfig()
-	if config != nil {
-		teaconst.IsPlus = config.IsPlus
-	}
-
-	// 开始计时器
-	ticker := time.NewTicker(10 * time.Minute)
-	if Tea.IsTesting() {
-		// 快速测试
-		ticker = time.NewTicker(1 * time.Minute)
-	}
-
-	// 初始化的时候先获取一次
-	timeout := time.NewTimer(3 * 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 {
-	// 如果还没有安装直接返回
-	if !setup.IsConfigured() {
-		return nil
-	}
-
-	rpcClient, err := rpc.SharedRPC()
-	if err != nil {
-		return err
-	}
-	resp, err := rpcClient.AuthorityKeyRPC().ReadAuthorityKey(rpcClient.Context(0), &pb.ReadAuthorityKeyRequest{})
-	if err != nil {
-		return err
-	}
-	var oldState = teaconst.IsPlus
-	if resp.AuthorityKey != nil && len(resp.AuthorityKey.Value) > 0 && resp.AuthorityKey.DayTo >= timeutil.Format("Y-m-d") {
-		teaconst.IsPlus = true
-	} else {
-		teaconst.IsPlus = false
-	}
-
-	if oldState != teaconst.IsPlus {
-		_ = configs.WritePlusConfig(&configs.PlusConfig{IsPlus: teaconst.IsPlus})
-	}
-
-	return nil
-}
--- a/internal/web/actions/default/admins/recipients/createPopup.go
+++ b/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)
--- a/internal/web/actions/default/admins/recipients/index.go
+++ b/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 {
--- a/internal/web/actions/default/admins/recipients/instances/createPopup.go
+++ b/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)
--- a/internal/web/actions/default/admins/recipients/instances/index.go
+++ b/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 {
--- a/internal/web/actions/default/admins/recipients/instances/instance.go
+++ b/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()
--- a/internal/web/actions/default/admins/recipients/instances/update.go
+++ b/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 {
--- a/internal/web/actions/default/admins/recipients/recipient.go
+++ b/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()
--- a/internal/web/actions/default/admins/recipients/tasks/delete.go
+++ b/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()
+}
--- a/internal/web/actions/default/admins/recipients/tasks/index.go
+++ b/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()
+}
--- a/internal/web/actions/default/admins/recipients/tasks/init.go
+++ b/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()
 	})
 }
--- a/internal/web/actions/default/admins/recipients/update.go
+++ b/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)
--- a/internal/web/actions/default/clusters/cluster/boards/index.go
+++ b/internal/web/actions/default/clusters/cluster/boards/index.go
@@ -1,182 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/iwind/TeaGo/maps"
-	"github.com/iwind/TeaGo/types"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-	"strconv"
-)
-
-type IndexAction struct {
-	actionutils.ParentAction
-}
-
-func (this *IndexAction) Init() {
-	this.Nav("", "board", "")
-}
-
-func (this *IndexAction) RunGet(params struct {
-	ClusterId int64
-}) {
-	if !teaconst.IsPlus {
-		this.RedirectURL("/clusters/cluster?clusterId=" + strconv.FormatInt(params.ClusterId, 10))
-		return
-	}
-
-	resp, err := this.RPC().ServerStatBoardRPC().ComposeServerStatNodeClusterBoard(this.AdminContext(), &pb.ComposeServerStatNodeClusterBoardRequest{NodeClusterId: params.ClusterId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["board"] = maps.Map{
-		"countUsers":         resp.CountUsers,
-		"countActiveNodes":   resp.CountActiveNodes,
-		"countInactiveNodes": resp.CountInactiveNodes,
-		"countServers":       resp.CountServers,
-	}
-
-	// 24小时流量趋势
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.HourlyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"bytes":               stat.Bytes,
-				"cachedBytes":         stat.CachedBytes,
-				"countRequests":       stat.CountRequests,
-				"countCachedRequests": stat.CountCachedRequests,
-				"countAttackRequests": stat.CountAttackRequests,
-				"attackBytes":         stat.AttackBytes,
-				"day":                 stat.Hour[4:6] + "月" + stat.Hour[6:8] + "日",
-				"hour":                stat.Hour[8:],
-			})
-		}
-		this.Data["hourlyStats"] = statMaps
-	}
-
-	// 15天流量趋势
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.DailyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"bytes":               stat.Bytes,
-				"cachedBytes":         stat.CachedBytes,
-				"countRequests":       stat.CountRequests,
-				"countCachedRequests": stat.CountCachedRequests,
-				"countAttackRequests": stat.CountAttackRequests,
-				"attackBytes":         stat.AttackBytes,
-				"day":                 stat.Day[4:6] + "月" + stat.Day[6:] + "日",
-			})
-		}
-		this.Data["dailyStats"] = statMaps
-	}
-
-	// 节点排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopNodeStats {
-			statMaps = append(statMaps, maps.Map{
-				"nodeId":        stat.NodeId,
-				"nodeName":      stat.NodeName,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topNodeStats"] = statMaps
-	}
-
-	// 域名排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopDomainStats {
-			statMaps = append(statMaps, maps.Map{
-				"serverId":      stat.ServerId,
-				"domain":        stat.Domain,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topDomainStats"] = statMaps
-	}
-
-	// CPU
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.CpuNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["cpuValues"] = statMaps
-	}
-
-	// Memory
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.MemoryNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["memoryValues"] = statMaps
-	}
-
-	// Load
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.LoadNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["loadValues"] = statMaps
-	}
-
-	// 指标
-	{
-		var chartMaps = []maps.Map{}
-		for _, chart := range resp.MetricDataCharts {
-			var statMaps = []maps.Map{}
-			for _, stat := range chart.MetricStats {
-				statMaps = append(statMaps, maps.Map{
-					"keys":  stat.Keys,
-					"time":  stat.Time,
-					"value": stat.Value,
-					"count": stat.SumCount,
-					"total": stat.SumTotal,
-				})
-			}
-			chartMaps = append(chartMaps, maps.Map{
-				"chart": maps.Map{
-					"id":       chart.MetricChart.Id,
-					"name":     chart.MetricChart.Name,
-					"widthDiv": chart.MetricChart.WidthDiv,
-					"isOn":     chart.MetricChart.IsOn,
-					"maxItems": chart.MetricChart.MaxItems,
-					"type":     chart.MetricChart.Type,
-				},
-				"item": maps.Map{
-					"id":            chart.MetricChart.MetricItem.Id,
-					"name":          chart.MetricChart.MetricItem.Name,
-					"period":        chart.MetricChart.MetricItem.Period,
-					"periodUnit":    chart.MetricChart.MetricItem.PeriodUnit,
-					"valueType":     serverconfigs.FindMetricValueType(chart.MetricChart.MetricItem.Category, chart.MetricChart.MetricItem.Value),
-					"valueTypeName": serverconfigs.FindMetricValueName(chart.MetricChart.MetricItem.Category, chart.MetricChart.MetricItem.Value),
-					"keys":          chart.MetricChart.MetricItem.Keys,
-				},
-				"stats": statMaps,
-			})
-		}
-		this.Data["metricCharts"] = chartMaps
-	}
-
-	this.Show()
-}
--- a/internal/web/actions/default/clusters/cluster/createBatch.go
+++ b/internal/web/actions/default/clusters/cluster/createBatch.go
@@ -95,6 +95,7 @@ func (this *CreateBatchAction) RunPost(params struct {
 			Name:      "IP地址",
 			Ip:        ip,
 			CanAccess: true,
+			IsUp:      true,
 		})
 		if err != nil {
 			this.ErrorPage(err)
--- a/internal/web/actions/default/clusters/cluster/createNode.go
+++ b/internal/web/actions/default/clusters/cluster/createNode.go
@@ -4,14 +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
 }
@@ -57,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.Nodes
+	apiEndpoints := []string{}
+	for _, apiNode := range apiNodes {
+		if !apiNode.IsOn {
+			continue
+		}
+		apiEndpoints = append(apiEndpoints, apiNode.AccessAddrs...)
+	}
+	this.Data["apiEndpoints"] = "\"" + strings.Join(apiEndpoints, "\", \"") + "\""
+
 	this.Show()
 }

@@ -147,30 +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,
 				Role:      nodeconfigs.NodeRoleNode,
-				Name:      address.GetString("name"),
-				Ip:        address.GetString("ip"),
-				CanAccess: address.GetBool("canAccess"),
+				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()
 }
--- a/internal/web/actions/default/clusters/cluster/createNodeInstall.go
+++ b/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()
+}
--- a/internal/web/actions/default/clusters/cluster/init.go
+++ b/internal/web/actions/default/clusters/cluster/init.go
@@ -2,11 +2,13 @@ package cluster

 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/boards"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/groups"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node"
-	nodeboards "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/boards"
-	"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"
@@ -27,9 +29,11 @@ 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)).

 			// 节点相关
 			Prefix("/clusters/cluster/node").
@@ -42,9 +46,14 @@ func init() {
 			Post("/start", new(node.StartAction)).
 			Post("/stop", new(node.StopAction)).
 			Post("/up", new(node.UpAction)).
-			Get("/thresholds", new(thresholds.IndexAction)).
 			Get("/detail", new(node.DetailAction)).
-			GetPost("/boards", new(nodeboards.IndexAction)).
+			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)).

 			// 分组相关
 			Prefix("/clusters/cluster/groups").
@@ -54,11 +63,6 @@ func init() {
 			Post("/delete", new(groups.DeleteAction)).
 			Post("/sort", new(groups.SortAction)).
 			GetPost("/selectPopup", new(groups.SelectPopupAction)).
-
-			// 看板相关
-			Prefix("/clusters/cluster/boards").
-			Get("", new(boards.IndexAction)).
-
 			EndAll()
 	})
 }
--- a/internal/web/actions/default/clusters/cluster/installManual.go
+++ b/internal/web/actions/default/clusters/cluster/installManual.go
@@ -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,
 		})
--- a/internal/web/actions/default/clusters/cluster/installRemote.go
+++ b/internal/web/actions/default/clusters/cluster/installRemote.go
@@ -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,
 		})
--- a/internal/web/actions/default/clusters/cluster/node/boards/index.go
+++ b/internal/web/actions/default/clusters/cluster/node/boards/index.go
@@ -1,232 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	"encoding/json"
-	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"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/iwind/TeaGo/maps"
-	"github.com/iwind/TeaGo/types"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-	"strconv"
-)
-
-type IndexAction struct {
-	actionutils.ParentAction
-}
-
-func (this *IndexAction) Init() {
-	this.Nav("", "node", "board")
-	this.SecondMenu("nodes")
-}
-
-func (this *IndexAction) RunGet(params struct {
-	ClusterId int64
-	NodeId    int64
-}) {
-	err := nodeutils.InitNodeInfo(this, params.NodeId)
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	if !teaconst.IsPlus {
-		this.RedirectURL("/clusters/cluster/node?clusterId=" + strconv.FormatInt(params.ClusterId, 10) + "&nodeId=" + strconv.FormatInt(params.NodeId, 10))
-		return
-	}
-
-	resp, err := this.RPC().ServerStatBoardRPC().ComposeServerStatNodeBoard(this.AdminContext(), &pb.ComposeServerStatNodeBoardRequest{NodeId: params.NodeId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Data["board"] = maps.Map{
-		"isActive":            resp.IsActive,
-		"trafficInBytes":      resp.TrafficInBytes,
-		"trafficOutBytes":     resp.TrafficOutBytes,
-		"countConnections":    resp.CountConnections,
-		"countRequests":       resp.CountRequests,
-		"countAttackRequests": resp.CountAttackRequests,
-		"cpuUsage":            resp.CpuUsage,
-		"memoryUsage":         resp.MemoryUsage,
-		"memoryTotalSize":     resp.MemoryTotalSize,
-		"load":                resp.Load,
-		"cacheDiskSize":       resp.CacheDiskSize,
-		"cacheMemorySize":     resp.CacheMemorySize,
-	}
-
-	// 24小时流量趋势
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.HourlyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"bytes":               stat.Bytes,
-				"cachedBytes":         stat.CachedBytes,
-				"countRequests":       stat.CountRequests,
-				"countCachedRequests": stat.CountCachedRequests,
-				"countAttackRequests": stat.CountAttackRequests,
-				"attackBytes":         stat.AttackBytes,
-				"day":                 stat.Hour[4:6] + "月" + stat.Hour[6:8] + "日",
-				"hour":                stat.Hour[8:],
-			})
-		}
-		this.Data["hourlyStats"] = statMaps
-	}
-
-	// 15天流量趋势
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.DailyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"bytes":               stat.Bytes,
-				"cachedBytes":         stat.CachedBytes,
-				"countRequests":       stat.CountRequests,
-				"countCachedRequests": stat.CountCachedRequests,
-				"countAttackRequests": stat.CountAttackRequests,
-				"attackBytes":         stat.AttackBytes,
-				"day":                 stat.Day[4:6] + "月" + stat.Day[6:] + "日",
-			})
-		}
-		this.Data["dailyStats"] = statMaps
-	}
-
-	// 域名排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopDomainStats {
-			statMaps = append(statMaps, maps.Map{
-				"serverId":      stat.ServerId,
-				"domain":        stat.Domain,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topDomainStats"] = statMaps
-	}
-
-	// CPU
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.CpuNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["cpuValues"] = statMaps
-	}
-
-	// Memory
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.MemoryNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["memoryValues"] = statMaps
-	}
-
-	// Load
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.LoadNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["loadValues"] = statMaps
-	}
-
-	// CacheDirs
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.CacheDirsValues {
-			var m = maps.Map{}
-			err = json.Unmarshal(stat.ValueJSON, &m)
-			if err != nil {
-				continue
-			}
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": m,
-			})
-		}
-		this.Data["cacheDirValues"] = statMaps
-	}
-
-	// 指标
-	{
-		var chartMaps = []maps.Map{}
-		for _, chart := range resp.MetricDataCharts {
-			var statMaps = []maps.Map{}
-			for _, stat := range chart.MetricStats {
-				statMaps = append(statMaps, maps.Map{
-					"keys":  stat.Keys,
-					"time":  stat.Time,
-					"value": stat.Value,
-					"count": stat.SumCount,
-					"total": stat.SumTotal,
-				})
-			}
-			chartMaps = append(chartMaps, maps.Map{
-				"chart": maps.Map{
-					"id":       chart.MetricChart.Id,
-					"name":     chart.MetricChart.Name,
-					"widthDiv": chart.MetricChart.WidthDiv,
-					"isOn":     chart.MetricChart.IsOn,
-					"maxItems": chart.MetricChart.MaxItems,
-					"type":     chart.MetricChart.Type,
-				},
-				"item": maps.Map{
-					"id":            chart.MetricChart.MetricItem.Id,
-					"name":          chart.MetricChart.MetricItem.Name,
-					"period":        chart.MetricChart.MetricItem.Period,
-					"periodUnit":    chart.MetricChart.MetricItem.PeriodUnit,
-					"valueType":     serverconfigs.FindMetricValueType(chart.MetricChart.MetricItem.Category, chart.MetricChart.MetricItem.Value),
-					"valueTypeName": serverconfigs.FindMetricValueName(chart.MetricChart.MetricItem.Category, chart.MetricChart.MetricItem.Value),
-					"keys":          chart.MetricChart.MetricItem.Keys,
-				},
-				"stats": statMaps,
-			})
-		}
-		this.Data["metricCharts"] = chartMaps
-	}
-
-	this.Show()
-}
-
-func (this *IndexAction) RunPost(params struct {
-	ClusterId int64
-	NodeId    int64
-}) {
-	resp, err := this.RPC().ServerStatBoardRPC().ComposeServerStatNodeBoard(this.AdminContext(), &pb.ComposeServerStatNodeBoardRequest{NodeId: params.NodeId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Data["board"] = maps.Map{
-		"isActive":            resp.IsActive,
-		"trafficInBytes":      resp.TrafficInBytes,
-		"trafficOutBytes":     resp.TrafficOutBytes,
-		"countConnections":    resp.CountConnections,
-		"countRequests":       resp.CountRequests,
-		"countAttackRequests": resp.CountAttackRequests,
-		"cpuUsage":            resp.CpuUsage,
-		"memoryUsage":         resp.MemoryUsage,
-		"memoryTotalSize":     resp.MemoryTotalSize,
-		"load":                resp.Load,
-		"cacheDiskSize":       resp.CacheDiskSize,
-		"cacheMemorySize":     resp.CacheMemorySize,
-	}
-
-	this.Success()
-}
--- a/internal/web/actions/default/clusters/cluster/node/detail.go
+++ b/internal/web/actions/default/clusters/cluster/node/detail.go
@@ -3,9 +3,11 @@ 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"
@@ -37,6 +39,7 @@ func (this *DetailAction) RunGet(params struct {
 		return
 	}

+	// 主集群
 	var clusterMap maps.Map = nil
 	if node.NodeCluster != nil {
 		clusterId := node.NodeCluster.Id
@@ -55,8 +58,18 @@ func (this *DetailAction) 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{
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
 		NodeId: params.NodeId,
 		Role:   nodeconfigs.NodeRoleNode,
 	})
@@ -64,51 +77,84 @@ func (this *DetailAction) RunGet(params struct {
 		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
@@ -129,14 +175,15 @@ func (this *DetailAction) 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,
 		}
@@ -217,17 +264,20 @@ func (this *DetailAction) 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,
--- a/internal/web/actions/default/clusters/cluster/node/index.go
+++ b/internal/web/actions/default/clusters/cluster/node/index.go
@@ -20,7 +20,7 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct {
 	NodeId int64
 }) {
-	err := nodeutils.InitNodeInfo(this, params.NodeId)
+	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -29,6 +29,6 @@ func (this *IndexAction) RunGet(params struct {
 	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"]) + strconv.FormatInt(params.NodeId, 10))
+		this.RedirectURL("/clusters/cluster/node/detail?clusterId=" + fmt.Sprintf("%d", this.Data["clusterId"]) + "&nodeId=" + strconv.FormatInt(params.NodeId, 10))
 	}
 }
--- a/internal/web/actions/default/clusters/cluster/node/install.go
+++ b/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 {
@@ -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

--- a/internal/web/actions/default/clusters/cluster/node/logs.go
+++ b/internal/web/actions/default/clusters/cluster/node/logs.go
@@ -25,7 +25,7 @@ func (this *LogsAction) RunGet(params struct {
 	Level   string
 }) {
 	// 初始化节点信息（用于菜单）
-	err := nodeutils.InitNodeInfo(this, params.NodeId)
+	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -62,6 +62,10 @@ func (this *LogsAction) RunGet(params struct {
 		Offset:  page.Offset,
 		Size:    page.Size,
 	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}

 	logs := []maps.Map{}
 	for _, log := range logsResp.NodeLogs {
--- a/internal/web/actions/default/clusters/cluster/node/nodeutils/utils.go
+++ b/internal/web/actions/default/clusters/cluster/node/nodeutils/utils.go
@@ -7,26 +7,80 @@ import (
 	"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(action actionutils.ActionInterface, nodeId int64) error {
+func InitNodeInfo(parentAction *actionutils.ParentAction, nodeId int64) (*pb.Node, error) {
 	// 节点信息（用于菜单）
-	nodeResp, err := action.RPC().NodeRPC().FindEnabledNode(action.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: nodeId})
+	nodeResp, err := parentAction.RPC().NodeRPC().FindEnabledNode(parentAction.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: nodeId})
 	if err != nil {
-		return err
+		return nil, err
 	}
 	if nodeResp.Node == nil {
-		return errors.New("node '" + strconv.FormatInt(nodeId, 10) + "' not found")
+		return nil, errors.New("node '" + strconv.FormatInt(nodeId, 10) + "' not found")
 	}
 	var node = nodeResp.Node
-	action.ViewData()["node"] = maps.Map{
-		"id":   node.Id,
-		"name": node.Name,
+
+	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 {
-		action.ViewData()["clusterId"] = node.NodeCluster.Id
+		parentAction.Data["clusterId"] = node.NodeCluster.Id
+		clusterId = node.NodeCluster.Id
 	}
-	return nil
+
+	// 左侧菜单
+	var prefix = "/clusters/cluster/node"
+	var query = "clusterId=" + types.String(clusterId) + "&nodeId=" + types.String(nodeId)
+	var menuItem = parentAction.Data.GetString("secondMenuItem")
+
+	parentAction.Data["leftMenuItems"] = []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",
+		},
+		{
+			"name":     "阈值设置",
+			"url":      prefix + "/settings/thresholds?" + query,
+			"isActive": menuItem == "threshold",
+		},
+		{
+			"name":     "SSH设置",
+			"url":      prefix + "/settings/ssh?" + query,
+			"isActive": menuItem == "ssh",
+		},
+		{
+			"name":     "系统设置",
+			"url":      prefix + "/settings/system?" + query,
+			"isActive": menuItem == "system",
+		},
+	}
+
+	return nodeResp.Node, nil
 }
--- a/internal/web/actions/default/clusters/cluster/node/settings/cache/index.go
+++ b/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()
+}
--- a/internal/web/actions/default/clusters/cluster/node/settings/dns/index.go
+++ b/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()
+}
--- a/internal/web/actions/default/clusters/cluster/node/settings/ssh/index.go
+++ b/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()
+}
--- a/internal/web/actions/default/clusters/cluster/node/settings/system/index.go
+++ b/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()
+}
--- a/internal/web/actions/default/clusters/cluster/node/settings/thresholds/index.go
+++ b/internal/web/actions/default/clusters/cluster/node/settings/thresholds/index.go
@@ -15,22 +15,22 @@ 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
 }) {
-	this.Data["nodeId"] = params.NodeId
-
-	// 初始化节点信息（用于菜单）
-	err := nodeutils.InitNodeInfo(this, params.NodeId)
+	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}

+	this.Data["nodeId"] = params.NodeId
+
 	// 列出所有阈值
 	thresholdsResp, err := this.RPC().NodeThresholdRPC().FindAllEnabledNodeThresholds(this.AdminContext(), &pb.FindAllEnabledNodeThresholdsRequest{
 		Role:          "node",
--- a/internal/web/actions/default/clusters/cluster/node/status.go
+++ b/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
 }
--- a/internal/web/actions/default/clusters/cluster/node/syncDomain.go
+++ b/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()
+}
--- a/internal/web/actions/default/clusters/cluster/node/update.go
+++ b/internal/web/actions/default/clusters/cluster/node/update.go
@@ -4,11 +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"
 )
@@ -19,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})
@@ -47,7 +52,7 @@ func (this *UpdateAction) RunGet(params struct {
 	}

 	// IP地址
-	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
 		NodeId: params.NodeId,
 		Role:   nodeconfigs.NodeRoleNode,
 	})
@@ -56,91 +61,22 @@ func (this *UpdateAction) RunGet(params struct {
 		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,
+		})
 	}

 	// 分组
@@ -161,86 +97,53 @@ func (this *UpdateAction) RunGet(params struct {
 		}
 	}

-	// 缓存硬盘 & 内存容量
-	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
 }) {
@@ -256,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地址
@@ -273,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,
-		NodeGroupId:            params.GroupId,
-		NodeRegionId:           params.RegionId,
-		Name:                   params.Name,
-		NodeClusterId:          params.ClusterId,
-		NodeLogin:              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)
@@ -344,7 +201,7 @@ func (this *UpdateAction) RunPost(params struct {
 	}

 	// 禁用老的IP地址
-	_, err = this.RPC().NodeIPAddressRPC().DisableAllIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllIPAddressesWithNodeIdRequest{
+	_, err = this.RPC().NodeIPAddressRPC().DisableAllNodeIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllNodeIPAddressesWithNodeIdRequest{
 		NodeId: params.NodeId,
 		Role:   nodeconfigs.NodeRoleNode,
 	})
--- a/internal/web/actions/default/clusters/cluster/node/updateDNSPopup.go
+++ b/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()
+}
--- a/internal/web/actions/default/clusters/cluster/nodes.go
+++ b/internal/web/actions/default/clusters/cluster/nodes.go
@@ -41,6 +41,15 @@ func (this *NodesAction) RunGet(params struct {
 	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,
 	})
@@ -114,7 +123,7 @@ func (this *NodesAction) RunGet(params struct {
 		}

 		// IP
-		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
 			NodeId: node.Id,
 			Role:   nodeconfigs.NodeRoleNode,
 		})
@@ -123,12 +132,14 @@ func (this *NodesAction) RunGet(params struct {
 			return
 		}
 		ipAddresses := []maps.Map{}
-		for _, addr := range ipAddressesResp.Addresses {
+		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,
 			})
 		}

@@ -156,6 +167,16 @@ func (this *NodesAction) RunGet(params struct {
 			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,
@@ -183,11 +204,12 @@ func (this *NodesAction) RunGet(params struct {
 				"id":   node.NodeCluster.Id,
 				"name": node.NodeCluster.Name,
 			},
-			"isSynced":      isSynced,
-			"ipAddresses":   ipAddresses,
-			"group":         groupMap,
-			"region":        regionMap,
-			"dnsRouteNames": dnsRouteNames,
+			"secondaryClusters": secondaryClusterMaps,
+			"isSynced":          isSynced,
+			"ipAddresses":       ipAddresses,
+			"group":             groupMap,
+			"region":            regionMap,
+			"dnsRouteNames":     dnsRouteNames,
 		})
 	}
 	this.Data["nodes"] = nodeMaps
--- a/internal/web/actions/default/clusters/cluster/settings/dns/index.go
+++ b/internal/web/actions/default/clusters/cluster/settings/dns/index.go
@@ -46,6 +46,13 @@ func (this *IndexAction) RunGet(params struct {
 		this.Data["domainName"] = dnsInfoResp.Domain.Name
 	}

+	if len(dnsInfoResp.CnameRecords) == 0 {
+		this.Data["cnameRecords"] = []string{}
+	} else {
+		this.Data["cnameRecords"] = dnsInfoResp.CnameRecords
+	}
+	this.Data["ttl"] = dnsInfoResp.Ttl
+
 	this.Show()
 }

@@ -56,6 +63,8 @@ func (this *IndexAction) RunPost(params struct {
 	DnsName         string
 	NodesAutoSync   bool
 	ServersAutoSync bool
+	CnameRecords    []string
+	Ttl             int32

 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -63,6 +72,14 @@ func (this *IndexAction) RunPost(params struct {
 	// 创建日志
 	defer this.CreateLog(oplogs.LevelInfo, "修改集群 %d DNS设置", params.ClusterId)

+	if params.DnsDomainId <= 0 {
+		this.Fail("请选择集群的主域名")
+	}
+
+	params.Must.
+		Field("dnsName", params.DnsName).
+		Require("请输入DNS子域名")
+
 	// 检查DNS名称
 	if len(params.DnsName) > 0 {
 		if !domainutils.ValidateDomainFormat(params.DnsName) {
@@ -89,6 +106,8 @@ func (this *IndexAction) RunPost(params struct {
 		DnsDomainId:     params.DnsDomainId,
 		NodesAutoSync:   params.NodesAutoSync,
 		ServersAutoSync: params.ServersAutoSync,
+		CnameRecords:    params.CnameRecords,
+		Ttl:             params.Ttl,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/clusters/cluster/suggestLoginPorts.go
+++ b/internal/web/actions/default/clusters/cluster/suggestLoginPorts.go
@@ -0,0 +1,36 @@
+// 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"
+)
+
+type SuggestLoginPortsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SuggestLoginPortsAction) RunPost(params struct {
+	Host string
+}) {
+	portsResp, err := this.RPC().NodeLoginRPC().FindNodeLoginSuggestPorts(this.AdminContext(), &pb.FindNodeLoginSuggestPortsRequest{Host: params.Host})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	if len(portsResp.Ports) == 0 {
+		this.Data["ports"] = []int32{}
+	} else {
+		this.Data["ports"] = portsResp.Ports
+	}
+
+	if len(portsResp.AvailablePorts) == 0 {
+		this.Data["availablePorts"] = []int32{}
+	} else {
+		this.Data["availablePorts"] = portsResp.AvailablePorts
+	}
+
+	this.Success()
+}
--- a/internal/web/actions/default/clusters/cluster/updateNodeSSH.go
+++ b/internal/web/actions/default/clusters/cluster/updateNodeSSH.go
@@ -36,6 +36,11 @@ func (this *UpdateNodeSSHAction) RunGet(params struct {
 		"id":   node.Id,
 		"name": node.Name,
 	}
+	if nodeResp.Node.NodeCluster != nil {
+		this.Data["clusterId"] = nodeResp.Node.NodeCluster.Id
+	} else {
+		this.Data["clusterId"] = 0
+	}

 	// SSH
 	loginParams := maps.Map{
@@ -44,10 +49,10 @@ func (this *UpdateNodeSSHAction) RunGet(params struct {
 		"grantId": 0,
 	}
 	this.Data["loginId"] = 0
-	if node.Login != nil {
-		this.Data["loginId"] = node.Login.Id
-		if len(node.Login.Params) > 0 {
-			err = json.Unmarshal(node.Login.Params, &loginParams)
+	if node.NodeLogin != nil {
+		this.Data["loginId"] = node.NodeLogin.Id
+		if len(node.NodeLogin.Params) > 0 {
+			err = json.Unmarshal(node.NodeLogin.Params, &loginParams)
 			if err != nil {
 				this.ErrorPage(err)
 				return
--- a/internal/web/actions/default/clusters/cluster/upgradeRemote.go
+++ b/internal/web/actions/default/clusters/cluster/upgradeRemote.go
@@ -31,8 +31,8 @@ func (this *UpgradeRemoteAction) RunGet(params struct {
 	}
 	for _, node := range resp.Nodes {
 		loginParams := maps.Map{}
-		if node.Node.Login != nil && len(node.Node.Login.Params) > 0 {
-			err := json.Unmarshal(node.Node.Login.Params, &loginParams)
+		if node.Node.NodeLogin != nil && len(node.Node.NodeLogin.Params) > 0 {
+			err := json.Unmarshal(node.Node.NodeLogin.Params, &loginParams)
 			if err != nil {
 				this.ErrorPage(err)
 				return
@@ -46,7 +46,7 @@ func (this *UpgradeRemoteAction) RunGet(params struct {
 			"arch":          node.Arch,
 			"oldVersion":    node.OldVersion,
 			"newVersion":    node.NewVersion,
-			"login":         node.Node.Login,
+			"login":         node.Node.NodeLogin,
 			"loginParams":   loginParams,
 			"addresses":     node.Node.IpAddresses,
 			"installStatus": node.Node.InstallStatus,
--- a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go
+++ b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go
@@ -45,6 +45,7 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext
 			action.WriteString("can not find cluster")
 			return
 		}
+		action.Data["currentClusterName"] = cluster.Name

 		clusterInfo, err := dao.SharedNodeClusterDAO.FindEnabledNodeClusterConfigInfo(ctx, clusterId)
 		if err != nil {
--- a/internal/web/actions/default/clusters/create.go
+++ b/internal/web/actions/default/clusters/create.go
@@ -19,6 +19,7 @@ func (this *CreateAction) Init() {
 }

 func (this *CreateAction) RunGet(params struct{}) {
+	// 是否有域名
 	hasDomainsResp, err := this.RPC().DNSDomainRPC().ExistAvailableDomains(this.AdminContext(), &pb.ExistAvailableDomainsRequest{})
 	if err != nil {
 		this.ErrorPage(err)
@@ -53,13 +54,6 @@ func (this *CreateAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入集群名称")

-	if params.CachePolicyId <= 0 {
-		this.Fail("请选择或者创建缓存策略")
-	}
-	if params.HttpFirewallPolicyId <= 0 {
-		this.Fail("请选择或者创建WAF策略")
-	}
-
 	// 检查DNS名称
 	if len(params.DnsName) > 0 {
 		if !domainutils.ValidateDomainFormat(params.DnsName) {
@@ -113,5 +107,7 @@ func (this *CreateAction) RunPost(params struct {
 	// 创建日志
 	defer this.CreateLog(oplogs.LevelInfo, "创建节点集群：%d", createResp.NodeClusterId)

+	this.Data["clusterId"] = createResp.NodeClusterId
+
 	this.Success()
 }
--- a/internal/web/actions/default/clusters/grants/createPopup.go
+++ b/internal/web/actions/default/clusters/grants/createPopup.go
@@ -43,6 +43,9 @@ func (this *CreatePopupAction) RunPost(params struct {
 			this.FailField("username", "请输入SSH登录用户名")
 		}
 	case "privateKey":
+		if len(params.Username) == 0 {
+			this.FailField("username", "请输入SSH登录用户名")
+		}
 		if len(params.PrivateKey) == 0 {
 			this.FailField("privateKey", "请输入RSA私钥")
 		}
--- a/internal/web/actions/default/clusters/grants/selectPopup.go
+++ b/internal/web/actions/default/clusters/grants/selectPopup.go
@@ -16,7 +16,10 @@ func (this *SelectPopupAction) Init() {
 	this.Nav("", "", "")
 }

-func (this *SelectPopupAction) RunGet(params struct{}) {
+func (this *SelectPopupAction) RunGet(params struct {
+	NodeClusterId int64
+	NsClusterId   int64
+}) {
 	// 所有的认证
 	grantsResp, err := this.RPC().NodeGrantRPC().FindAllEnabledNodeGrants(this.AdminContext(), &pb.FindAllEnabledNodeGrantsRequest{})
 	if err != nil {
@@ -37,6 +40,28 @@ func (this *SelectPopupAction) RunGet(params struct{}) {
 	}
 	this.Data["grants"] = grantMaps

+	// 推荐的认证
+	suggestGrantsResp, err := this.RPC().NodeGrantRPC().FindSuggestNodeGrants(this.AdminContext(), &pb.FindSuggestNodeGrantsRequest{
+		NodeClusterId: params.NodeClusterId,
+		NsClusterId:   params.NsClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var suggestGrantMaps = []maps.Map{}
+	for _, grant := range suggestGrantsResp.NodeGrants {
+		suggestGrantMaps = append(suggestGrantMaps, maps.Map{
+			"id":          grant.Id,
+			"name":        grant.Name,
+			"method":      grant.Method,
+			"methodName":  grantutils.FindGrantMethodName(grant.Method),
+			"username":    grant.Username,
+			"description": grant.Description,
+		})
+	}
+	this.Data["suggestGrants"] = suggestGrantMaps
+
 	this.Show()
 }

--- a/internal/web/actions/default/clusters/grants/updatePopup.go
+++ b/internal/web/actions/default/clusters/grants/updatePopup.go
@@ -73,6 +73,9 @@ func (this *UpdatePopupAction) RunPost(params struct {
 			this.FailField("username", "请输入SSH登录用户名")
 		}
 	case "privateKey":
+		if len(params.Username) == 0 {
+			this.FailField("username", "请输入SSH登录用户名")
+		}
 		if len(params.PrivateKey) == 0 {
 			this.FailField("privateKey", "请输入RSA私钥")
 		}
--- a/internal/web/actions/default/clusters/index.go
+++ b/internal/web/actions/default/clusters/index.go
@@ -193,7 +193,7 @@ func (this *IndexAction) searchNodes(keyword string) {
 		}

 		// IP
-		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
 			NodeId: node.Id,
 			Role:   nodeconfigs.NodeRoleNode,
 		})
@@ -202,12 +202,14 @@ func (this *IndexAction) searchNodes(keyword string) {
 			return
 		}
 		ipAddresses := []maps.Map{}
-		for _, addr := range ipAddressesResp.Addresses {
+		for _, addr := range ipAddressesResp.NodeIPAddresses {
 			ipAddresses = append(ipAddresses, maps.Map{
 				"id":        addr.Id,
 				"name":      addr.Name,
 				"ip":        addr.Ip,
 				"canAccess": addr.CanAccess,
+				"isOn":      addr.IsOn,
+				"isUp":      addr.IsUp,
 			})
 		}

@@ -235,6 +237,16 @@ func (this *IndexAction) searchNodes(keyword string) {
 			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,
@@ -260,11 +272,12 @@ func (this *IndexAction) searchNodes(keyword string) {
 				"id":   node.NodeCluster.Id,
 				"name": node.NodeCluster.Name,
 			},
-			"isSynced":      isSynced,
-			"ipAddresses":   ipAddresses,
-			"group":         groupMap,
-			"region":        regionMap,
-			"dnsRouteNames": dnsRouteNames,
+			"secondaryClusters": secondaryClusterMaps,
+			"isSynced":          isSynced,
+			"ipAddresses":       ipAddresses,
+			"group":             groupMap,
+			"region":            regionMap,
+			"dnsRouteNames":     dnsRouteNames,
 		})
 	}
 	this.Data["nodes"] = nodeMaps
--- a/internal/web/actions/default/clusters/init.go
+++ b/internal/web/actions/default/clusters/init.go
@@ -20,6 +20,7 @@ func init() {
 			EndHelpers().
 			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeCommon)).
 			Post("/options", new(OptionsAction)).
+			GetPost("/selectPopup", new(SelectPopupAction)).

 			EndAll()
 	})
--- a/internal/web/actions/default/clusters/logs/index.go
+++ b/internal/web/actions/default/clusters/logs/index.go
@@ -51,6 +51,10 @@ func (this *IndexAction) RunGet(params struct {
 		Offset:  page.Offset,
 		Size:    page.Size,
 	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}

 	logs := []maps.Map{}
 	for _, log := range logsResp.NodeLogs {
--- a/internal/web/actions/default/clusters/monitors/groups/options.go
+++ b/internal/web/actions/default/clusters/monitors/groups/options.go
@@ -0,0 +1,32 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package groups
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type OptionsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *OptionsAction) RunPost(params struct{}) {
+	resp, err := this.RPC().ReportNodeGroupRPC().FindAllEnabledReportNodeGroups(this.AdminContext(), &pb.FindAllEnabledReportNodeGroupsRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var groupMaps = []maps.Map{}
+	for _, group := range resp.ReportNodeGroups {
+		groupMaps = append(groupMaps, maps.Map{
+			"id":   group.Id,
+			"name": group.Name,
+		})
+	}
+	this.Data["groups"] = groupMaps
+
+	this.Success()
+}
--- a/internal/web/actions/default/clusters/selectPopup.go
+++ b/internal/web/actions/default/clusters/selectPopup.go
@@ -0,0 +1,71 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package clusters
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/lists"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type SelectPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SelectPopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *SelectPopupAction) RunGet(params struct {
+	SelectedClusterIds string
+	Keyword            string
+}) {
+	this.Data["keyword"] = params.Keyword
+
+	var selectedIds = utils.SplitNumbers(params.SelectedClusterIds)
+
+	countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{
+		Keyword: params.Keyword,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var count = countResp.Count
+	var page = this.NewPage(count)
+	page.Size = 6
+	this.Data["page"] = page.AsHTML()
+
+	clustersResp, err := this.RPC().NodeClusterRPC().ListEnabledNodeClusters(this.AdminContext(), &pb.ListEnabledNodeClustersRequest{
+		Keyword: params.Keyword,
+		Offset:  page.Offset,
+		Size:    page.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var clusterMaps = []maps.Map{}
+	for _, cluster := range clustersResp.NodeClusters {
+		// 节点数
+		countNodesResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{NodeClusterId: cluster.Id})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		var countNodes = countNodesResp.Count
+
+		clusterMaps = append(clusterMaps, maps.Map{
+			"id":         cluster.Id,
+			"name":       cluster.Name,
+			"isOn":       cluster.IsOn,
+			"countNodes": countNodes,
+			"isSelected": lists.ContainsInt64(selectedIds, cluster.Id),
+		})
+	}
+	this.Data["clusters"] = clusterMaps
+
+	this.Show()
+}
--- a/internal/web/actions/default/dashboard/boards/dns.go
+++ b/internal/web/actions/default/dashboard/boards/dns.go
@@ -1,133 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	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"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-)
-
-type DnsAction struct {
-	actionutils.ParentAction
-}
-
-func (this *DnsAction) Init() {
-	this.Nav("", "", "dns")
-}
-
-func (this *DnsAction) RunGet(params struct{}) {
-	if !teaconst.IsPlus {
-		this.RedirectURL("/dashboard")
-		return
-	}
-
-	resp, err := this.RPC().NSRPC().ComposeNSBoard(this.AdminContext(), &pb.ComposeNSBoardRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["board"] = maps.Map{
-		"countDomains":      resp.CountNSDomains,
-		"countRecords":      resp.CountNSRecords,
-		"countClusters":     resp.CountNSClusters,
-		"countNodes":        resp.CountNSNodes,
-		"countOfflineNodes": resp.CountOfflineNSNodes,
-	}
-
-	// 流量排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.HourlyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"day":           stat.Hour[4:6] + "月" + stat.Hour[6:8] + "日",
-				"hour":          stat.Hour[8:],
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["hourlyStats"] = statMaps
-	}
-
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.DailyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"day":           stat.Day[4:6] + "月" + stat.Day[6:] + "日",
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["dailyStats"] = statMaps
-	}
-
-	// 域名排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopNSDomainStats {
-			statMaps = append(statMaps, maps.Map{
-				"domainId":      stat.NsDomainId,
-				"domainName":    stat.NsDomainName,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topDomainStats"] = statMaps
-	}
-
-	// 节点排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopNSNodeStats {
-			statMaps = append(statMaps, maps.Map{
-				"clusterId":     stat.NsClusterId,
-				"nodeId":        stat.NsNodeId,
-				"nodeName":      stat.NsNodeName,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topNodeStats"] = statMaps
-	}
-
-	// CPU
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.CpuNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["cpuValues"] = statMaps
-	}
-
-	// Memory
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.MemoryNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["memoryValues"] = statMaps
-	}
-
-	// Load
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.LoadNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["loadValues"] = statMaps
-	}
-
-	this.Show()
-}
--- a/internal/web/actions/default/dashboard/boards/index.go
+++ b/internal/web/actions/default/dashboard/boards/index.go
@@ -1,249 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/iwind/TeaGo/maps"
-	"regexp"
-)
-
-type IndexAction struct {
-	actionutils.ParentAction
-}
-
-func (this *IndexAction) Init() {
-	this.Nav("", "", "index")
-}
-
-func (this *IndexAction) RunGet(params struct{}) {
-	if !teaconst.IsPlus {
-		this.RedirectURL("/dashboard")
-		return
-	}
-
-	// 取得用户的权限
-	module, ok := configloaders.FindFirstAdminModule(this.AdminId())
-	if ok {
-		if module != "dashboard" {
-			for _, m := range configloaders.AllModuleMaps() {
-				if m.GetString("code") == module {
-					this.RedirectURL(m.GetString("url"))
-					return
-				}
-			}
-		}
-	}
-
-	// 读取看板数据
-	resp, err := this.RPC().AdminRPC().ComposeAdminDashboard(this.AdminContext(), &pb.ComposeAdminDashboardRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["dashboard"] = maps.Map{
-		"countServers":      resp.CountServers,
-		"countNodeClusters": resp.CountNodeClusters,
-		"countNodes":        resp.CountNodes,
-		"countUsers":        resp.CountUsers,
-		"countAPINodes":     resp.CountAPINodes,
-		"countDBNodes":      resp.CountDBNodes,
-		"countUserNodes":    resp.CountUserNodes,
-
-		"canGoServers":  configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeServer),
-		"canGoNodes":    configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeNode),
-		"canGoSettings": configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeSetting),
-		"canGoUsers":    configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeUser),
-	}
-
-	// 今日流量
-	todayTrafficBytes := int64(0)
-	if len(resp.DailyTrafficStats) > 0 {
-		todayTrafficBytes = resp.DailyTrafficStats[len(resp.DailyTrafficStats)-1].Bytes
-	}
-	todayTrafficString := numberutils.FormatBytes(todayTrafficBytes)
-	result := regexp.MustCompile(`^(?U)(.+)([a-zA-Z]+)$`).FindStringSubmatch(todayTrafficString)
-	if len(result) > 2 {
-		this.Data["todayTraffic"] = result[1]
-		this.Data["todayTrafficUnit"] = result[2]
-	} else {
-		this.Data["todayTraffic"] = todayTrafficString
-		this.Data["todayTrafficUnit"] = ""
-	}
-
-	// 24小时流量趋势
-	{
-		statMaps := []maps.Map{}
-		for _, stat := range resp.HourlyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"bytes":               stat.Bytes,
-				"cachedBytes":         stat.CachedBytes,
-				"countRequests":       stat.CountRequests,
-				"countCachedRequests": stat.CountCachedRequests,
-				"countAttackRequests": stat.CountAttackRequests,
-				"attackBytes":         stat.AttackBytes,
-				"day":                 stat.Hour[4:6] + "月" + stat.Hour[6:8] + "日",
-				"hour":                stat.Hour[8:],
-			})
-		}
-		this.Data["hourlyTrafficStats"] = statMaps
-	}
-
-	// 15天流量趋势
-	{
-		statMaps := []maps.Map{}
-		for _, stat := range resp.DailyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"bytes":               stat.Bytes,
-				"cachedBytes":         stat.CachedBytes,
-				"countRequests":       stat.CountRequests,
-				"countCachedRequests": stat.CountCachedRequests,
-				"countAttackRequests": stat.CountAttackRequests,
-				"attackBytes":         stat.AttackBytes,
-				"day":                 stat.Day[4:6] + "月" + stat.Day[6:] + "日",
-			})
-		}
-		this.Data["dailyTrafficStats"] = statMaps
-	}
-
-	// 节点排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopNodeStats {
-			statMaps = append(statMaps, maps.Map{
-				"nodeId":        stat.NodeId,
-				"nodeName":      stat.NodeName,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topNodeStats"] = statMaps
-	}
-
-	// 域名排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopDomainStats {
-			statMaps = append(statMaps, maps.Map{
-				"serverId":      stat.ServerId,
-				"domain":        stat.Domain,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topDomainStats"] = statMaps
-	}
-
-	// 版本升级
-	if resp.NodeUpgradeInfo != nil {
-		this.Data["nodeUpgradeInfo"] = maps.Map{
-			"count":   resp.NodeUpgradeInfo.CountNodes,
-			"version": resp.NodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["nodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
-	if resp.MonitorNodeUpgradeInfo != nil {
-		this.Data["monitorNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.MonitorNodeUpgradeInfo.CountNodes,
-			"version": resp.MonitorNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["monitorNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
-	if resp.ApiNodeUpgradeInfo != nil {
-		this.Data["apiNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.ApiNodeUpgradeInfo.CountNodes,
-			"version": resp.ApiNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["apiNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
-	if resp.UserNodeUpgradeInfo != nil {
-		this.Data["userNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.UserNodeUpgradeInfo.CountNodes,
-			"version": resp.UserNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["userNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": 0,
-		}
-	}
-	if resp.AuthorityNodeUpgradeInfo != nil {
-		this.Data["authorityNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.AuthorityNodeUpgradeInfo.CountNodes,
-			"version": resp.AuthorityNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["authorityNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
-	if resp.NsNodeUpgradeInfo != nil {
-		this.Data["nsNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.NsNodeUpgradeInfo.CountNodes,
-			"version": resp.NsNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["nsNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
-
-	// 指标
-	{
-		var chartMaps = []maps.Map{}
-		for _, chart := range resp.MetricDataCharts {
-			var statMaps = []maps.Map{}
-			for _, stat := range chart.MetricStats {
-				statMaps = append(statMaps, maps.Map{
-					"keys":  stat.Keys,
-					"time":  stat.Time,
-					"value": stat.Value,
-					"count": stat.SumCount,
-					"total": stat.SumTotal,
-				})
-			}
-			chartMaps = append(chartMaps, maps.Map{
-				"chart": maps.Map{
-					"id":       chart.MetricChart.Id,
-					"name":     chart.MetricChart.Name,
-					"widthDiv": chart.MetricChart.WidthDiv,
-					"isOn":     chart.MetricChart.IsOn,
-					"maxItems": chart.MetricChart.MaxItems,
-					"type":     chart.MetricChart.Type,
-				},
-				"item": maps.Map{
-					"id":            chart.MetricChart.MetricItem.Id,
-					"name":          chart.MetricChart.MetricItem.Name,
-					"period":        chart.MetricChart.MetricItem.Period,
-					"periodUnit":    chart.MetricChart.MetricItem.PeriodUnit,
-					"valueType":     serverconfigs.FindMetricValueType(chart.MetricChart.MetricItem.Category, chart.MetricChart.MetricItem.Value),
-					"valueTypeName": serverconfigs.FindMetricValueName(chart.MetricChart.MetricItem.Category, chart.MetricChart.MetricItem.Value),
-					"keys":          chart.MetricChart.MetricItem.Keys,
-				},
-				"stats": statMaps,
-			})
-		}
-		this.Data["metricCharts"] = chartMaps
-	}
-
-	this.Show()
-}
--- a/internal/web/actions/default/dashboard/boards/user.go
+++ b/internal/web/actions/default/dashboard/boards/user.go
@@ -1,103 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	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"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-)
-
-type UserAction struct {
-	actionutils.ParentAction
-}
-
-func (this *UserAction) Init() {
-	this.Nav("", "", "user")
-}
-
-func (this *UserAction) RunGet(params struct{}) {
-	if !teaconst.IsPlus {
-		this.RedirectURL("/dashboard")
-		return
-	}
-
-	resp, err := this.RPC().UserRPC().ComposeUserGlobalBoard(this.AdminContext(), &pb.ComposeUserGlobalBoardRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["board"] = maps.Map{
-		"totalUsers":            resp.TotalUsers,
-		"countTodayUsers":       resp.CountTodayUsers,
-		"countWeeklyUsers":      resp.CountWeeklyUsers,
-		"countUserNodes":        resp.CountUserNodes,
-		"countOfflineUserNodes": resp.CountOfflineUserNodes,
-	}
-
-	{
-		statMaps := []maps.Map{}
-		for _, stat := range resp.DailyStats {
-			statMaps = append(statMaps, maps.Map{
-				"day":   stat.Day,
-				"count": stat.Count,
-			})
-		}
-		this.Data["dailyStats"] = statMaps
-	}
-
-	// CPU
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.CpuNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["cpuValues"] = statMaps
-	}
-
-	// Memory
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.MemoryNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["memoryValues"] = statMaps
-	}
-
-	// Load
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.LoadNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["loadValues"] = statMaps
-	}
-
-	// 流量排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"userId":        stat.UserId,
-				"userName":      stat.UserName,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topTrafficStats"] = statMaps
-	}
-
-	this.Show()
-}
--- a/internal/web/actions/default/dashboard/boards/waf.go
+++ b/internal/web/actions/default/dashboard/boards/waf.go
@@ -1,76 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	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"
-)
-
-type WafAction struct {
-	actionutils.ParentAction
-}
-
-func (this *WafAction) Init() {
-	this.Nav("", "", "waf")
-}
-
-func (this *WafAction) RunGet(params struct{}) {
-	if !teaconst.IsPlus {
-		this.RedirectURL("/dashboard")
-		return
-	}
-
-	resp, err := this.RPC().FirewallRPC().ComposeFirewallGlobalBoard(this.AdminContext(), &pb.ComposeFirewallGlobalBoardRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["board"] = maps.Map{
-		"countDailyLogs":    resp.CountDailyLogs,
-		"countDailyBlocks":  resp.CountDailyBlocks,
-		"countDailyCaptcha": resp.CountDailyCaptcha,
-		"countWeeklyBlocks": resp.CountWeeklyBlocks,
-	}
-
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.HourlyStats {
-			statMaps = append(statMaps, maps.Map{
-				"hour":         stat.Hour,
-				"countLogs":    stat.CountLogs,
-				"countCaptcha": stat.CountCaptcha,
-				"countBlocks":  stat.CountBlocks,
-			})
-		}
-		this.Data["hourlyStats"] = statMaps
-	}
-
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.DailyStats {
-			statMaps = append(statMaps, maps.Map{
-				"day":          stat.Day,
-				"countLogs":    stat.CountLogs,
-				"countCaptcha": stat.CountCaptcha,
-				"countBlocks":  stat.CountBlocks,
-			})
-		}
-		this.Data["dailyStats"] = statMaps
-	}
-
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.HttpFirewallRuleGroups {
-			statMaps = append(statMaps, maps.Map{
-				"name":  stat.HttpFirewallRuleGroup.Name,
-				"count": stat.Count,
-			})
-		}
-		this.Data["groupStats"] = statMaps
-	}
-
-	this.Show()
-}
--- a/internal/web/actions/default/dashboard/boards/wafLogs.go
+++ b/internal/web/actions/default/dashboard/boards/wafLogs.go
@@ -1,28 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-)
-
-type WafLogsAction struct {
-	actionutils.ParentAction
-}
-
-func (this *WafLogsAction) RunPost(params struct{}) {
-	resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
-		HasFirewallPolicy: true,
-		Reverse:           false,
-		Day:               timeutil.Format("Ymd"),
-		Size:              5,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["accessLogs"] = resp.HttpAccessLogs
-	this.Success()
-}
--- a/internal/web/actions/default/dashboard/index.go
+++ b/internal/web/actions/default/dashboard/index.go
@@ -40,13 +40,21 @@ func (this *IndexAction) RunGet(params struct{}) {
 		}
 	}

+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct{}) {
 	// 读取看板数据
-	resp, err := this.RPC().AdminRPC().ComposeAdminDashboard(this.AdminContext(), &pb.ComposeAdminDashboardRequest{})
+	resp, err := this.RPC().AdminRPC().ComposeAdminDashboard(this.AdminContext(), &pb.ComposeAdminDashboardRequest{
+		ApiVersion: teaconst.APINodeVersion,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	this.Data["dashboard"] = maps.Map{
+		"defaultClusterId": resp.DefaultNodeClusterId,
+
 		"countServers":      resp.CountServers,
 		"countNodeClusters": resp.CountNodeClusters,
 		"countNodes":        resp.CountNodes,
@@ -81,8 +89,14 @@ func (this *IndexAction) RunGet(params struct{}) {
 		statMaps := []maps.Map{}
 		for _, stat := range resp.HourlyTrafficStats {
 			statMaps = append(statMaps, maps.Map{
-				"bytes": stat.Bytes,
-				"hour":  stat.Hour[8:],
+				"bytes":               stat.Bytes,
+				"cachedBytes":         stat.CachedBytes,
+				"countRequests":       stat.CountRequests,
+				"countCachedRequests": stat.CountCachedRequests,
+				"countAttackRequests": stat.CountAttackRequests,
+				"attackBytes":         stat.AttackBytes,
+				"day":                 stat.Hour[4:6] + "月" + stat.Hour[6:8] + "日",
+				"hour":                stat.Hour[8:],
 			})
 		}
 		this.Data["hourlyTrafficStats"] = statMaps
@@ -93,8 +107,13 @@ func (this *IndexAction) RunGet(params struct{}) {
 		statMaps := []maps.Map{}
 		for _, stat := range resp.DailyTrafficStats {
 			statMaps = append(statMaps, maps.Map{
-				"bytes": stat.Bytes,
-				"day":   stat.Day[4:6] + "月" + stat.Day[6:] + "日",
+				"bytes":               stat.Bytes,
+				"cachedBytes":         stat.CachedBytes,
+				"countRequests":       stat.CountRequests,
+				"countCachedRequests": stat.CountCachedRequests,
+				"countAttackRequests": stat.CountAttackRequests,
+				"attackBytes":         stat.AttackBytes,
+				"day":                 stat.Day[4:6] + "月" + stat.Day[6:] + "日",
 			})
 		}
 		this.Data["dailyTrafficStats"] = statMaps
@@ -168,6 +187,20 @@ func (this *IndexAction) RunGet(params struct{}) {
 		}
 	}

+	// 域名排行
+	{
+		var statMaps = []maps.Map{}
+		for _, stat := range resp.TopDomainStats {
+			statMaps = append(statMaps, maps.Map{
+				"serverId":      stat.ServerId,
+				"domain":        stat.Domain,
+				"countRequests": stat.CountRequests,
+				"bytes":         stat.Bytes,
+			})
+		}
+		this.Data["topDomainStats"] = statMaps
+	}
+
 	// 指标
 	{
 		var chartMaps = []maps.Map{}
@@ -206,5 +239,5 @@ func (this *IndexAction) RunGet(params struct{}) {
 		this.Data["metricCharts"] = chartMaps
 	}

-	this.Show()
+	this.Success()
 }
--- a/internal/web/actions/default/dashboard/init.go
+++ b/internal/web/actions/default/dashboard/init.go
@@ -2,7 +2,6 @@ package dashboard

 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dashboard/boards"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
 )
@@ -13,15 +12,6 @@ func init() {
 			Data("teaMenu", "dashboard").
 			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeCommon)).
 			GetPost("", new(IndexAction)).
-
-			// 看板
-			Prefix("/dashboard/boards").
-			Get("", new(boards.IndexAction)).
-			Get("/waf", new(boards.WafAction)).
-			Post("/wafLogs", new(boards.WafLogsAction)).
-			Get("/dns", new(boards.DnsAction)).
-			Get("/user", new(boards.UserAction)).
-
 			EndAll()
 	})
 }
--- a/internal/web/actions/default/db/cleanPopup.go
+++ b/internal/web/actions/default/db/cleanPopup.go
@@ -3,28 +3,35 @@ package db
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/db/dbnodeutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )

-type CleanPopupAction struct {
+type CleanAction struct {
 	actionutils.ParentAction
 }

-func (this *CleanPopupAction) Init() {
-	this.Nav("", "", "")
+func (this *CleanAction) Init() {
+	this.Nav("", "", "clean")
 }

-func (this *CleanPopupAction) RunGet(params struct {
+func (this *CleanAction) RunGet(params struct {
 	NodeId int64
 }) {
+	_, err := dbnodeutils.InitNode(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Data["nodeId"] = params.NodeId

 	this.Show()
 }

-func (this *CleanPopupAction) RunPost(params struct {
+func (this *CleanAction) RunPost(params struct {
 	NodeId int64

 	Must *actions.Must
@@ -33,8 +40,7 @@ func (this *CleanPopupAction) RunPost(params struct {
 		DbNodeId: params.NodeId,
 	})
 	if err != nil {
-		this.ErrorPage(err)
-		return
+		this.Fail("查询数据时出错了：" + err.Error())
 	}

 	tableMaps := []maps.Map{}
--- a/internal/web/actions/default/db/dbnodeutils/utils.go
+++ b/internal/web/actions/default/db/dbnodeutils/utils.go
@@ -0,0 +1,34 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package dbnodeutils
+
+import (
+	"errors"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"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"
+)
+
+// InitNode 初始化指标信息
+func InitNode(parent *actionutils.ParentAction, nodeId int64) (*pb.DBNode, error) {
+	client, err := rpc.SharedRPC()
+	if err != nil {
+		return nil, err
+	}
+
+	resp, err := client.DBNodeRPC().FindEnabledDBNode(parent.AdminContext(), &pb.FindEnabledDBNodeRequest{DbNodeId: nodeId})
+	if err != nil {
+		return nil, err
+	}
+	var node = resp.DbNode
+	if node == nil {
+		return nil, errors.New("not found db node with id '" + types.String(nodeId) + "'")
+	}
+	parent.Data["node"] = maps.Map{
+		"id":   node.Id,
+		"name": node.Name,
+	}
+	return node, nil
+}
--- a/internal/web/actions/default/db/index.go
+++ b/internal/web/actions/default/db/index.go
@@ -42,9 +42,10 @@ func (this *IndexAction) RunGet(params struct{}) {
 			"port":     node.Port,
 			"database": node.Database,
 			"status": maps.Map{
-				"isOk":  node.Status.IsOk,
-				"error": node.Status.Error,
-				"size":  numberutils.FormatBytes(node.Status.Size),
+				"isOk":    node.Status.IsOk,
+				"error":   node.Status.Error,
+				"size":    numberutils.FormatBytes(node.Status.Size),
+				"version": node.Status.Version,
 			},
 		})
 	}
--- a/internal/web/actions/default/db/init.go
+++ b/internal/web/actions/default/db/init.go
@@ -16,12 +16,14 @@ func init() {
 			Prefix("/db").
 			Get("", new(IndexAction)).
 			GetPost("/createPopup", new(CreatePopupAction)).
-			GetPost("/updatePopup", new(UpdatePopupAction)).
+			GetPost("/update", new(UpdateAction)).
 			Post("/delete", new(DeleteAction)).
-			GetPost("/cleanPopup", new(CleanPopupAction)).
+			GetPost("/clean", new(CleanAction)).
 			Post("/deleteTable", new(DeleteTableAction)).
 			Post("/truncateTable", new(TruncateTableAction)).
-
+			Get("/node", new(NodeAction)).
+			Get("/logs", new(LogsAction)).
+			Post("/status", new(StatusAction)).
 			EndAll()
 	})
 }
--- a/internal/web/actions/default/db/logs.go
+++ b/internal/web/actions/default/db/logs.go
@@ -0,0 +1,82 @@
+package db
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/db/dbnodeutils"
+	"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"
+)
+
+type LogsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *LogsAction) Init() {
+	this.Nav("", "", "log")
+}
+
+func (this *LogsAction) RunGet(params struct {
+	NodeId int64
+
+	DayFrom string
+	DayTo   string
+	Keyword string
+	Level   string
+}) {
+	_, err := dbnodeutils.InitNode(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:    nodeconfigs.NodeRoleDatabase,
+		NodeId:  params.NodeId,
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	count := countResp.Count
+	page := this.NewPage(count, 20)
+
+	logsResp, err := this.RPC().NodeLogRPC().ListNodeLogs(this.AdminContext(), &pb.ListNodeLogsRequest{
+		NodeId:  params.NodeId,
+		Role:    nodeconfigs.NodeRoleDatabase,
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+
+		Offset: page.Offset,
+		Size:   page.Size,
+	})
+
+	logs := []maps.Map{}
+	for _, log := range logsResp.NodeLogs {
+		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"),
+		})
+	}
+	this.Data["logs"] = logs
+
+	this.Data["page"] = page.AsHTML()
+
+	this.Show()
+}
--- a/internal/web/actions/default/db/node.go
+++ b/internal/web/actions/default/db/node.go
@@ -0,0 +1,41 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package db
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/db/dbnodeutils"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type NodeAction struct {
+	actionutils.ParentAction
+}
+
+func (this *NodeAction) Init() {
+	this.Nav("", "", "node")
+}
+
+func (this *NodeAction) RunGet(params struct {
+	NodeId int64
+}) {
+	node, err := dbnodeutils.InitNode(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["node"] = maps.Map{
+		"id":          node.Id,
+		"isOn":        node.IsOn,
+		"name":        node.Name,
+		"database":    node.Database,
+		"host":        node.Host,
+		"port":        node.Port,
+		"username":    node.Username,
+		"password":    node.Password,
+		"description": node.Description,
+	}
+
+	this.Show()
+}
--- a/internal/web/actions/default/db/status.go
+++ b/internal/web/actions/default/db/status.go
@@ -0,0 +1,38 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package db
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type StatusAction struct {
+	actionutils.ParentAction
+}
+
+func (this *StatusAction) RunPost(params struct {
+	NodeId int64
+}) {
+	statusResp, err := this.RPC().DBNodeRPC().CheckDBNodeStatus(this.AdminContext(), &pb.CheckDBNodeStatusRequest{DbNodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var status = statusResp.DbNodeStatus
+	if status != nil {
+		this.Data["status"] = maps.Map{
+			"isOk":    status.IsOk,
+			"error":   status.Error,
+			"size":    numberutils.FormatBytes(status.Size),
+			"version": status.Version,
+		}
+	} else {
+		this.Data["status"] = nil
+	}
+
+	this.Success()
+}
--- a/internal/web/actions/default/db/updatePopup.go
+++ b/internal/web/actions/default/db/updatePopup.go
@@ -8,15 +8,15 @@ import (
 	"github.com/iwind/TeaGo/maps"
 )

-type UpdatePopupAction struct {
+type UpdateAction struct {
 	actionutils.ParentAction
 }

-func (this *UpdatePopupAction) Init() {
-	this.Nav("", "", "")
+func (this *UpdateAction) Init() {
+	this.Nav("", "", "update")
 }

-func (this *UpdatePopupAction) RunGet(params struct {
+func (this *UpdateAction) RunGet(params struct {
 	NodeId int64
 }) {
 	nodeResp, err := this.RPC().DBNodeRPC().FindEnabledDBNode(this.AdminContext(), &pb.FindEnabledDBNodeRequest{DbNodeId: params.NodeId})
@@ -46,7 +46,7 @@ func (this *UpdatePopupAction) RunGet(params struct {
 	this.Show()
 }

-func (this *UpdatePopupAction) RunPost(params struct {
+func (this *UpdateAction) RunPost(params struct {
 	NodeId int64

 	Name     string
--- a/internal/web/actions/default/dns/clusters/cluster.go
+++ b/internal/web/actions/default/dns/clusters/cluster.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/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
 )

 type ClusterAction struct {
@@ -40,6 +41,7 @@ func (this *ClusterAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
+	var defaultRoute = dnsResp.DefaultRoute
 	domainName := ""
 	dnsMap := maps.Map{
 		"dnsName":          dnsResp.Name,
@@ -60,6 +62,12 @@ func (this *ClusterAction) RunGet(params struct {
 		dnsMap["providerTypeName"] = dnsResp.Provider.TypeName
 	}

+	if len(dnsResp.CnameRecords) > 0 {
+		dnsMap["cnameRecords"] = dnsResp.CnameRecords
+	} else {
+		dnsMap["cnameRecords"] = []string{}
+	}
+
 	this.Data["dnsInfo"] = dnsMap

 	// 节点DNS解析记录
@@ -106,6 +114,26 @@ func (this *ClusterAction) RunGet(params struct {
 				})
 			}
 		} else {
+			// 默认线路
+			var isResolved = false
+			if len(defaultRoute) > 0 {
+				recordType := "A"
+				if utils.IsIPv6(node.IpAddr) {
+					recordType = "AAAA"
+				}
+				checkResp, err := this.RPC().DNSDomainRPC().ExistDNSDomainRecord(this.AdminContext(), &pb.ExistDNSDomainRecordRequest{
+					DnsDomainId: cluster.DnsDomainId,
+					Name:        cluster.DnsName,
+					Type:        recordType,
+					Route:       defaultRoute,
+					Value:       node.IpAddr,
+				})
+				if err != nil {
+					this.ErrorPage(err)
+					return
+				}
+				isResolved = checkResp.IsOk
+			}
 			nodeMaps = append(nodeMaps, maps.Map{
 				"id":     node.Id,
 				"name":   node.Name,
@@ -115,7 +143,7 @@ func (this *ClusterAction) RunGet(params struct {
 					"code": "",
 				},
 				"clusterId":  node.NodeClusterId,
-				"isResolved": false,
+				"isResolved": isResolved,
 			})
 		}
 	}
@@ -182,5 +210,60 @@ func (this *ClusterAction) RunGet(params struct {
 	}
 	this.Data["issues"] = issueMaps

+	// 当前正在执行的任务
+	resp, err := this.RPC().DNSTaskRPC().FindAllDoingDNSTasks(this.AdminContext(), &pb.FindAllDoingDNSTasksRequest{
+		NodeClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	taskMaps := []maps.Map{}
+	for _, task := range resp.DnsTasks {
+		var clusterMap maps.Map = nil
+		var nodeMap maps.Map = nil
+		var serverMap maps.Map = nil
+		var domainMap maps.Map = nil
+
+		if task.NodeCluster != nil {
+			clusterMap = maps.Map{
+				"id":   task.NodeCluster.Id,
+				"name": task.NodeCluster.Name,
+			}
+		}
+		if task.Node != nil {
+			nodeMap = maps.Map{
+				"id":   task.Node.Id,
+				"name": task.Node.Name,
+			}
+		}
+		if task.Server != nil {
+			serverMap = maps.Map{
+				"id":   task.Server.Id,
+				"name": task.Server.Name,
+			}
+		}
+		if task.DnsDomain != nil {
+			domainMap = maps.Map{
+				"id":   task.DnsDomain.Id,
+				"name": task.DnsDomain.Name,
+			}
+		}
+
+		taskMaps = append(taskMaps, maps.Map{
+			"id":          task.Id,
+			"type":        task.Type,
+			"isDone":      task.IsDone,
+			"isOk":        task.IsOk,
+			"error":       task.Error,
+			"updatedTime": timeutil.FormatTime("Y-m-d H:i:s", task.UpdatedAt),
+			"cluster":     clusterMap,
+			"node":        nodeMap,
+			"server":      serverMap,
+			"domain":      domainMap,
+		})
+	}
+	this.Data["tasks"] = taskMaps
+
 	this.Show()
 }
--- a/internal/web/actions/default/dns/domains/clustersPopup.go
+++ b/internal/web/actions/default/dns/domains/clustersPopup.go
@@ -43,16 +43,21 @@ func (this *ClustersPopupAction) RunGet(params struct {
 	for _, cluster := range clustersResp.NodeClusters {
 		isOk := false
 		if len(cluster.Name) > 0 {
-			checkResp, err := this.RPC().DNSDomainRPC().ExistDNSDomainRecord(this.AdminContext(), &pb.ExistDNSDomainRecordRequest{
-				DnsDomainId: params.DomainId,
-				Name:        cluster.DnsName,
-				Type:        "A",
-			})
-			if err != nil {
-				this.ErrorPage(err)
-				return
+			for _, recordType := range []string{"A", "AAAA"} {
+				checkResp, err := this.RPC().DNSDomainRPC().ExistDNSDomainRecord(this.AdminContext(), &pb.ExistDNSDomainRecordRequest{
+					DnsDomainId: params.DomainId,
+					Name:        cluster.DnsName,
+					Type:        recordType,
+				})
+				if err != nil {
+					this.ErrorPage(err)
+					return
+				}
+				if checkResp.IsOk {
+					isOk = true
+					break
+				}
 			}
-			isOk = checkResp.IsOk
 		}

 		clusterMaps = append(clusterMaps, maps.Map{
--- a/internal/web/actions/default/dns/domains/domainutils/utils.go
+++ b/internal/web/actions/default/dns/domains/domainutils/utils.go
@@ -33,12 +33,17 @@ func ValidateDomainFormat(domain string) bool {
 }

 // ConvertRoutesToMaps 转换线路列表
-func ConvertRoutesToMaps(routes []*pb.DNSRoute) []maps.Map {
+func ConvertRoutesToMaps(info *pb.NodeDNSInfo) []maps.Map {
+	if info == nil {
+		return []maps.Map{}
+	}
 	result := []maps.Map{}
-	for _, route := range routes {
+	for _, route := range info.Routes {
 		result = append(result, maps.Map{
-			"name": route.Name,
-			"code": route.Code,
+			"name":       route.Name,
+			"code":       route.Code,
+			"domainId":   info.DnsDomainId,
+			"domainName": info.DnsDomainName,
 		})
 	}
 	return result
--- a/internal/web/actions/default/dns/domains/nodesPopup.go
+++ b/internal/web/actions/default/dns/domains/nodesPopup.go
@@ -1,6 +1,7 @@
 package domains

 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
@@ -55,10 +56,14 @@ func (this *NodesPopupAction) RunGet(params struct {
 					// 检查是否有域名解析记录
 					isOk := false
 					if len(route.Name) > 0 && len(node.IpAddr) > 0 && len(cluster.DnsName) > 0 {
+						var recordType = "A"
+						if utils.IsIPv6(node.IpAddr) {
+							recordType = "AAAA"
+						}
 						checkResp, err := this.RPC().DNSDomainRPC().ExistDNSDomainRecord(this.AdminContext(), &pb.ExistDNSDomainRecordRequest{
 							DnsDomainId: params.DomainId,
 							Name:        cluster.DnsName,
-							Type:        "A",
+							Type:        recordType,
 							Route:       route.Code,
 							Value:       node.IpAddr,
 						})
--- a/internal/web/actions/default/dns/index.go
+++ b/internal/web/actions/default/dns/index.go
@@ -14,8 +14,14 @@ func (this *IndexAction) Init() {
 	this.Nav("dns", "dns", "")
 }

-func (this *IndexAction) RunGet(params struct{}) {
-	countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{})
+func (this *IndexAction) RunGet(params struct {
+	Keyword string
+}) {
+	this.Data["keyword"] = params.Keyword
+
+	countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{
+		Keyword: params.Keyword,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -24,8 +30,9 @@ func (this *IndexAction) RunGet(params struct{}) {
 	this.Data["page"] = page.AsHTML()

 	clustersResp, err := this.RPC().NodeClusterRPC().ListEnabledNodeClusters(this.AdminContext(), &pb.ListEnabledNodeClustersRequest{
-		Offset: page.Offset,
-		Size:   page.Size,
+		Keyword: params.Keyword,
+		Offset:  page.Offset,
+		Size:    page.Size,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/dns/init.go
+++ b/internal/web/actions/default/dns/init.go
@@ -34,6 +34,7 @@ func init() {
 			GetPost("/updatePopup", new(providers.UpdatePopupAction)).
 			Post("/delete", new(providers.DeleteAction)).
 			Get("/provider", new(providers.ProviderAction)).
+			Post("/syncDomains", new(providers.SyncDomainsAction)).
 			EndData().

 			// 域名
@@ -55,8 +56,8 @@ func init() {
 			Data("teaSubMenu", "issue").
 			GetPost("", new(issues.IndexAction)).
 			GetPost("/updateNodePopup", new(issues.UpdateNodePopupAction)).
+			Post("/syncDomain", new(issues.SyncDomainAction)).
 			EndData().
-
 			EndAll()
 	})
 }
--- a/internal/web/actions/default/dns/issues/syncDomain.go
+++ b/internal/web/actions/default/dns/issues/syncDomain.go
@@ -0,0 +1,33 @@
+package issues
+
+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()
+}
--- a/internal/web/actions/default/dns/issues/updateNodePopup.go
+++ b/internal/web/actions/default/dns/issues/updateNodePopup.go
@@ -20,11 +20,15 @@ func (this *UpdateNodePopupAction) Init() {
 }

 func (this *UpdateNodePopupAction) RunGet(params struct {
-	NodeId int64
+	ClusterId int64
+	NodeId    int64
 }) {
 	this.Data["nodeId"] = params.NodeId

-	dnsInfoResp, err := this.RPC().NodeRPC().FindEnabledNodeDNS(this.AdminContext(), &pb.FindEnabledNodeDNSRequest{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
@@ -35,7 +39,7 @@ func (this *UpdateNodePopupAction) RunGet(params struct {
 		return
 	}
 	this.Data["ipAddr"] = dnsInfo.IpAddr
-	this.Data["routes"] = domainutils.ConvertRoutesToMaps(dnsInfo.Routes)
+	this.Data["routes"] = domainutils.ConvertRoutesToMaps(dnsInfo)
 	this.Data["domainId"] = dnsInfo.DnsDomainId
 	this.Data["domainName"] = dnsInfo.DnsDomainName

@@ -50,13 +54,17 @@ func (this *UpdateNodePopupAction) RunGet(params struct {
 		if len(routesResp.Routes) > 0 {
 			for _, route := range routesResp.Routes {
 				allRouteMaps = append(allRouteMaps, maps.Map{
-					"name": route.Name,
-					"code": route.Code,
+					"name":       route.Name,
+					"code":       route.Code,
+					"domainName": dnsInfo.DnsDomainName,
+					"domainId":   dnsInfo.DnsDomainId,
 				})
 			}

 			// 筛选
-			this.Data["routes"] = domainutils.ConvertRoutesToMaps(domainutils.FilterRoutes(dnsInfo.Routes, routesResp.Routes))
+			var routes = domainutils.FilterRoutes(dnsInfo.Routes, routesResp.Routes)
+			dnsInfo.Routes = routes
+			this.Data["routes"] = domainutils.ConvertRoutesToMaps(dnsInfo)
 		}
 	}
 	this.Data["allRoutes"] = allRouteMaps
@@ -77,10 +85,12 @@ func (this *UpdateNodePopupAction) RunPost(params struct {
 	defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId)

 	routes := []string{}
-	err := json.Unmarshal(params.DnsRoutesJSON, &routes)
-	if err != nil {
-		this.ErrorPage(err)
-		return
+	if len(params.DnsRoutesJSON) > 0 {
+		err := json.Unmarshal(params.DnsRoutesJSON, &routes)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
 	}

 	params.Must.
@@ -92,7 +102,7 @@ func (this *UpdateNodePopupAction) RunPost(params struct {
 	}

 	// 执行修改
-	_, err = this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{
+	_, err := this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{
 		NodeId:      params.NodeId,
 		IpAddr:      params.IpAddr,
 		DnsDomainId: params.DomainId,
--- a/internal/web/actions/default/dns/providers/createPopup.go
+++ b/internal/web/actions/default/dns/providers/createPopup.go
@@ -67,6 +67,10 @@ func (this *CreatePopupAction) RunPost(params struct {
 	ParamAccessKeyId     string
 	ParamAccessKeySecret string

+	// HuaweiDNS
+	ParamHuaweiAccessKeyId     string
+	ParamHuaweiAccessKeySecret string
+
 	// DNS.COM
 	ParamApiKey    string
 	ParamApiSecret string
@@ -111,6 +115,15 @@ func (this *CreatePopupAction) RunPost(params struct {

 		apiParams["accessKeyId"] = params.ParamAccessKeyId
 		apiParams["accessKeySecret"] = params.ParamAccessKeySecret
+	case "huaweiDNS":
+		params.Must.
+			Field("paramHuaweiAccessKeyId", params.ParamHuaweiAccessKeyId).
+			Require("请输入AccessKeyId").
+			Field("paramHuaweiAccessKeySecret", params.ParamHuaweiAccessKeySecret).
+			Require("请输入AccessKeySecret")
+
+		apiParams["accessKeyId"] = params.ParamHuaweiAccessKeyId
+		apiParams["accessKeySecret"] = params.ParamHuaweiAccessKeySecret
 	case "dnscom":
 		params.Must.
 			Field("paramApiKey", params.ParamApiKey).
--- a/internal/web/actions/default/dns/providers/index.go
+++ b/internal/web/actions/default/dns/providers/index.go
@@ -15,9 +15,14 @@ func (this *IndexAction) Init() {
 	this.Nav("", "", "")
 }

-func (this *IndexAction) RunGet(params struct{}) {
+func (this *IndexAction) RunGet(params struct {
+	Keyword string
+}) {
+	this.Data["keyword"] = params.Keyword
+
 	countResp, err := this.RPC().DNSProviderRPC().CountAllEnabledDNSProviders(this.AdminContext(), &pb.CountAllEnabledDNSProvidersRequest{
 		AdminId: this.AdminId(),
+		Keyword: params.Keyword,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -29,6 +34,7 @@ func (this *IndexAction) RunGet(params struct{}) {

 	providersResp, err := this.RPC().DNSProviderRPC().ListEnabledDNSProviders(this.AdminContext(), &pb.ListEnabledDNSProvidersRequest{
 		AdminId: this.AdminId(),
+		Keyword: params.Keyword,
 		Offset:  page.Offset,
 		Size:    page.Size,
 	})
--- a/internal/web/actions/default/dns/providers/provider.go
+++ b/internal/web/actions/default/dns/providers/provider.go
@@ -82,6 +82,7 @@ func (this *ProviderAction) RunGet(params struct {
 			"id":                 domain.Id,
 			"name":               domain.Name,
 			"isOn":               domain.IsOn,
+			"isUp":               domain.IsUp,
 			"dataUpdatedTime":    dataUpdatedTime,
 			"countRoutes":        len(domain.Routes),
 			"countServerRecords": domain.CountServerRecords,
--- a/internal/web/actions/default/dns/providers/syncDomains.go
+++ b/internal/web/actions/default/dns/providers/syncDomains.go
@@ -0,0 +1,25 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package providers
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type SyncDomainsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SyncDomainsAction) RunPost(params struct {
+	ProviderId int64
+}) {
+	resp, err := this.RPC().DNSDomainRPC().SyncDNSDomainsFromProvider(this.AdminContext(), &pb.SyncDNSDomainsFromProviderRequest{DnsProviderId: params.ProviderId})
+	if err != nil {
+		this.Fail("更新域名失败：" + err.Error())
+	}
+
+	this.Data["hasChanges"] = resp.HasChanges
+
+	this.Success()
+}
--- a/internal/web/actions/default/dns/providers/updatePopup.go
+++ b/internal/web/actions/default/dns/providers/updatePopup.go
@@ -96,6 +96,10 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	ParamAccessKeyId     string
 	ParamAccessKeySecret string

+	// HuaweiDNS
+	ParamHuaweiAccessKeyId     string
+	ParamHuaweiAccessKeySecret string
+
 	// DNS.COM
 	ParamApiKey    string
 	ParamApiSecret string
@@ -142,6 +146,15 @@ func (this *UpdatePopupAction) RunPost(params struct {

 		apiParams["accessKeyId"] = params.ParamAccessKeyId
 		apiParams["accessKeySecret"] = params.ParamAccessKeySecret
+	case "huaweiDNS":
+		params.Must.
+			Field("paramHuaweiAccessKeyId", params.ParamHuaweiAccessKeyId).
+			Require("请输入AccessKeyId").
+			Field("paramHuaweiAccessKeySecret", params.ParamHuaweiAccessKeySecret).
+			Require("请输入AccessKeySecret")
+
+		apiParams["accessKeyId"] = params.ParamHuaweiAccessKeyId
+		apiParams["accessKeySecret"] = params.ParamHuaweiAccessKeySecret
 	case "dnscom":
 		params.Must.
 			Field("paramApiKey", params.ParamApiKey).
--- a/internal/web/actions/default/dns/updateClusterPopup.go
+++ b/internal/web/actions/default/dns/updateClusterPopup.go
@@ -9,7 +9,7 @@ import (
 	"github.com/iwind/TeaGo/maps"
 )

-// 修改集群的DNS设置
+// UpdateClusterPopupAction 修改集群的DNS设置
 type UpdateClusterPopupAction struct {
 	actionutils.ParentAction
 }
@@ -46,6 +46,14 @@ func (this *UpdateClusterPopupAction) RunGet(params struct {
 		this.Data["providerId"] = 0
 	}

+	if len(dnsResp.CnameRecords) == 0 {
+		this.Data["cnameRecords"] = []string{}
+	} else {
+		this.Data["cnameRecords"] = dnsResp.CnameRecords
+	}
+
+	this.Data["ttl"] = dnsResp.Ttl
+
 	// 所有服务商
 	providerTypesResp, err := this.RPC().DNSProviderRPC().FindAllDNSProviderTypes(this.AdminContext(), &pb.FindAllDNSProviderTypesRequest{})
 	if err != nil {
@@ -70,6 +78,8 @@ func (this *UpdateClusterPopupAction) RunPost(params struct {
 	DomainId        int64
 	NodesAutoSync   bool
 	ServersAutoSync bool
+	CnameRecords    []string
+	Ttl             int32

 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -103,6 +113,8 @@ func (this *UpdateClusterPopupAction) RunPost(params struct {
 		DnsDomainId:     params.DomainId,
 		NodesAutoSync:   params.NodesAutoSync,
 		ServersAutoSync: params.ServersAutoSync,
+		CnameRecords:    params.CnameRecords,
+		Ttl:             params.Ttl,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/index/index.go
+++ b/internal/web/actions/default/index/index.go
@@ -34,6 +34,9 @@ func (this *IndexAction) RunGet(params struct {

 	Auth *helpers.UserShouldAuth
 }) {
+	// DEMO模式
+	this.Data["isDemo"] = teaconst.IsDemoMode
+
 	// 检查系统是否已经配置过
 	if !setup.IsConfigured() {
 		this.RedirectURL("/setup")
@@ -53,19 +56,26 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["token"] = stringutil.Md5(TokenSalt+timestamp) + timestamp
 	this.Data["from"] = params.From

-	config, err := configloaders.LoadAdminUIConfig()
+	uiConfig, err := configloaders.LoadAdminUIConfig()
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	this.Data["systemName"] = config.AdminSystemName
-	this.Data["showVersion"] = config.ShowVersion
-	if len(config.Version) > 0 {
-		this.Data["version"] = config.Version
+	this.Data["systemName"] = uiConfig.AdminSystemName
+	this.Data["showVersion"] = uiConfig.ShowVersion
+	if len(uiConfig.Version) > 0 {
+		this.Data["version"] = uiConfig.Version
 	} else {
 		this.Data["version"] = teaconst.Version
 	}
-	this.Data["faviconFileId"] = config.FaviconFileId
+	this.Data["faviconFileId"] = uiConfig.FaviconFileId
+
+	securityConfig, err := configloaders.LoadSecurityConfig()
+	if err != nil {
+		this.Data["rememberLogin"] = false
+	} else {
+		this.Data["rememberLogin"] = securityConfig.AllowRememberLogin
+	}

 	this.Show()
 }
--- a/internal/web/actions/default/messages/index.go
+++ b/internal/web/actions/default/messages/index.go
@@ -55,6 +55,7 @@ func (this *IndexAction) RunGet(params struct{}) {

 		messages = append(messages, maps.Map{
 			"id":       message.Id,
+			"role":     message.Role,
 			"isRead":   message.IsRead,
 			"body":     message.Body,
 			"level":    message.Level,
--- a/internal/web/actions/default/nodes/delete.go
+++ b/internal/web/actions/default/nodes/delete.go
@@ -10,12 +10,16 @@ type DeleteAction struct {
 }

 func (this *DeleteAction) RunPost(params struct {
-	NodeId int64
+	ClusterId int64
+	NodeId    int64
 }) {
 	// 创建日志
-	defer this.CreateLogInfo("删除节点", params.NodeId)
+	defer this.CreateLogInfo("从集群 %d 中删除节点 %d", params.ClusterId, params.NodeId)

-	_, err := this.RPC().NodeRPC().DeleteNode(this.AdminContext(), &pb.DeleteNodeRequest{NodeId: params.NodeId})
+	_, err := this.RPC().NodeRPC().DeleteNodeFromNodeCluster(this.AdminContext(), &pb.DeleteNodeFromNodeClusterRequest{
+		NodeId:        params.NodeId,
+		NodeClusterId: params.ClusterId,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
--- a/internal/web/actions/default/nodes/ipAddresses/createPopup.go
+++ b/internal/web/actions/default/nodes/ipAddresses/createPopup.go
@@ -1,7 +1,10 @@
 package ipAddresses

 import (
+	"encoding/json"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 	"net"
@@ -15,33 +18,46 @@ func (this *CreatePopupAction) Init() {
 	this.Nav("", "", "")
 }

-func (this *CreatePopupAction) RunGet(params struct{}) {
+func (this *CreatePopupAction) RunGet(params struct {
+	SupportThresholds bool
+}) {
+	this.Data["supportThresholds"] = params.SupportThresholds
+
 	this.Show()
 }

 func (this *CreatePopupAction) RunPost(params struct {
-	IP        string `alias:"ip"`
-	CanAccess bool
-	Name      string
+	IP             string `alias:"ip"`
+	CanAccess      bool
+	Name           string
+	IsUp           bool
+	ThresholdsJSON []byte

 	Must *actions.Must
 }) {
-	// TODO 严格校验IP地址
-
-	ip := net.ParseIP(params.IP)
-	if len(ip) == 0 {
-		this.Fail("请输入正确的IP")
-	}
-
 	params.Must.
 		Field("ip", params.IP).
 		Require("请输入IP地址")

+	ip := net.ParseIP(params.IP)
+	if len(ip) == 0 {
+		this.FailField("ip", "请输入正确的IP")
+	}
+
+	// 阈值设置
+	var thresholds = []*nodeconfigs.IPAddressThresholdConfig{}
+	if teaconst.IsPlus && len(params.ThresholdsJSON) > 0 {
+		_ = json.Unmarshal(params.ThresholdsJSON, &thresholds)
+	}
+
 	this.Data["ipAddress"] = maps.Map{
-		"name":      params.Name,
-		"canAccess": params.CanAccess,
-		"ip":        params.IP,
-		"id":        0,
+		"name":       params.Name,
+		"canAccess":  params.CanAccess,
+		"ip":         params.IP,
+		"id":         0,
+		"isOn":       true,
+		"isUp":       params.IsUp,
+		"thresholds": thresholds,
 	}
 	this.Success()
 }
--- a/internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go
+++ b/internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go
@@ -18,22 +18,49 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 	for _, addr := range addresses {
 		addrId := addr.GetInt64("id")
 		if addrId > 0 {
+			var isOn = false
+			if !addr.Has("isOn") { // 兼容老版本
+				isOn = true
+			} else {
+				isOn = addr.GetBool("isOn")
+			}
+
 			_, err = parentAction.RPC().NodeIPAddressRPC().UpdateNodeIPAddress(parentAction.AdminContext(), &pb.UpdateNodeIPAddressRequest{
-				AddressId: addrId,
-				Ip:        addr.GetString("ip"),
-				Name:      addr.GetString("name"),
-				CanAccess: addr.GetBool("canAccess"),
+				NodeIPAddressId: addrId,
+				Ip:              addr.GetString("ip"),
+				Name:            addr.GetString("name"),
+				CanAccess:       addr.GetBool("canAccess"),
+				IsOn:            isOn,
+				IsUp:            addr.GetBool("isUp"),
 			})
 			if err != nil {
 				return err
 			}
 		} else {
-			_, err = parentAction.RPC().NodeIPAddressRPC().CreateNodeIPAddress(parentAction.AdminContext(), &pb.CreateNodeIPAddressRequest{
+			createResp, err := parentAction.RPC().NodeIPAddressRPC().CreateNodeIPAddress(parentAction.AdminContext(), &pb.CreateNodeIPAddressRequest{
 				NodeId:    nodeId,
 				Role:      role,
 				Name:      addr.GetString("name"),
 				Ip:        addr.GetString("ip"),
 				CanAccess: addr.GetBool("canAccess"),
+				IsUp:      addr.GetBool("isUp"),
+			})
+			if err != nil {
+				return err
+			}
+			addrId = createResp.NodeIPAddressId
+		}
+
+		// 保存阈值
+		var thresholds = addr.GetSlice("thresholds")
+		if len(thresholds) > 0 {
+			thresholdsJSON, err := json.Marshal(thresholds)
+			if err != nil {
+				return err
+			}
+			_, err = parentAction.RPC().NodeIPAddressThresholdRPC().UpdateAllNodeIPAddressThresholds(parentAction.AdminContext(), &pb.UpdateAllNodeIPAddressThresholdsRequest{
+				NodeIPAddressId:             addrId,
+				NodeIPAddressThresholdsJSON: thresholdsJSON,
 			})
 			if err != nil {
 				return err
@@ -42,3 +69,35 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 	}
 	return nil
 }
+
+// InitNodeIPAddressThresholds 初始化IP阈值
+func InitNodeIPAddressThresholds(parentAction *actionutils.ParentAction, addrId int64) ([]*nodeconfigs.IPAddressThresholdConfig, error) {
+	thresholdsResp, err := parentAction.RPC().NodeIPAddressThresholdRPC().FindAllEnabledNodeIPAddressThresholds(parentAction.AdminContext(), &pb.FindAllEnabledNodeIPAddressThresholdsRequest{NodeIPAddressId: addrId})
+	if err != nil {
+		return nil, err
+	}
+	var thresholds = []*nodeconfigs.IPAddressThresholdConfig{}
+	if len(thresholdsResp.NodeIPAddressThresholds) > 0 {
+		for _, pbThreshold := range thresholdsResp.NodeIPAddressThresholds {
+			var threshold = &nodeconfigs.IPAddressThresholdConfig{
+				Id:      pbThreshold.Id,
+				Items:   []*nodeconfigs.IPAddressThresholdItemConfig{},
+				Actions: []*nodeconfigs.IPAddressThresholdActionConfig{},
+			}
+			if len(pbThreshold.ItemsJSON) > 0 {
+				err = json.Unmarshal(pbThreshold.ItemsJSON, &threshold.Items)
+				if err != nil {
+					return nil, err
+				}
+			}
+			if len(pbThreshold.ActionsJSON) > 0 {
+				err = json.Unmarshal(pbThreshold.ActionsJSON, &threshold.Actions)
+				if err != nil {
+					return nil, err
+				}
+			}
+			thresholds = append(thresholds, threshold)
+		}
+	}
+	return thresholds, nil
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
刘祥超	e4e3591413	修改文字	2021-09-24 12:03:31 +08:00
刘祥超	3f847d7c7f	区域监控增加检测时间、结果页增加级别筛选	2021-09-23 10:02:32 +08:00
刘祥超	67a10994a4	提示已经有服务分组配置时加入分组链接	2021-09-22 19:46:22 +08:00
刘祥超	4016296e0b	可以在分组中设置一些全局配置选项	2021-09-22 19:39:38 +08:00
刘祥超	92777366ec	域名解析任务列表中增加集群解析页面链接/在域名解析--集群详情中显示正在执行的任务	2021-09-21 10:56:29 +08:00
刘祥超	beb34f8264	可以设置集群的DNS记录TTL	2021-09-20 20:01:15 +08:00
刘祥超	f6f8c5c858	在集群中可以设置自动加入DNS的CNAME记录	2021-09-20 16:37:41 +08:00
刘祥超	a19c4dffcd	反向代理源站实现使用域名分组	2021-09-20 11:54:28 +08:00
刘祥超	a5754971f6	开源版本也显示域名排行、缓存流量趋势、攻击流量趋势	2021-09-19 16:10:52 +08:00
刘祥超	dbe6435809	实现连通性变化发送通知功能	2021-09-18 14:22:01 +08:00
刘祥超	7e5b980600	优化消息弹窗交互	2021-09-18 11:02:23 +08:00
刘祥超	a6c3b70ee7	修改生成的YAML配置中可能含有tab的Bug	2021-09-16 15:06:37 +08:00
刘祥超	0a23e7951a	增加商业版激活功能	2021-09-16 10:32:58 +08:00
刘祥超	e0e3fc8fef	看板提醒商业版过期日期	2021-09-16 09:21:44 +08:00
刘祥超	a8b947f5ca	修复日期控件初始化格式可能错误的问题	2021-09-15 19:40:42 +08:00
刘祥超	0f28df51f1	优化界面	2021-09-15 19:22:54 +08:00
刘祥超	6e36528f35	IP地址详情中增加区域监控雷达图、数据列表	2021-09-15 17:54:03 +08:00
刘祥超	a885fdbea7	修复IP地址不能修改在线状态的Bug	2021-09-15 11:46:50 +08:00
刘祥超	713de74abb	调整部分命名	2021-09-14 19:39:41 +08:00
刘祥超	8db6a33e15	IP阈值动作增加WebHook	2021-09-14 15:27:54 +08:00
刘祥超	ed2d577be0	IP阈值增加节点分组和集群相关统计项目	2021-09-14 11:36:08 +08:00
刘祥超	084eddecbf	优化节点设置交互	2021-09-13 16:47:34 +08:00
刘祥超	5e09ba302a	IP地址支持手动上线和从备用IP中恢复	2021-09-13 13:45:39 +08:00
刘祥超	fa37b40435	实现节点自动切换到备用IP	2021-09-13 10:51:16 +08:00
刘祥超	c95dde5187	实现基础的IP地址阈值	2021-09-12 20:21:32 +08:00
刘祥超	4d5a4d501a	修复当集群没有绑定DNS域名时无法修改节点DNS信息的Bug	2021-09-11 20:12:06 +08:00
刘祥超	ce97f20826	实现基本的监控终端管理	2021-09-08 19:34:51 +08:00
刘祥超	ab9cd13abc	版本修改为0.3.1	2021-09-08 19:34:47 +08:00
刘祥超	7af5e828bb	在选择线路弹窗可以从域名中获取线路	2021-09-06 09:16:19 +08:00
刘祥超	98d53c49a0	修复打开网站服务菜单时无法点击系统设置的Bug	2021-09-06 08:53:51 +08:00
刘祥超	bb32849e47	安装时延长API节点初始化等待时间	2021-09-06 08:53:26 +08:00
刘祥超	13221faee0	实现区域监控节点运行日志和运行结果	2021-09-06 08:53:08 +08:00
刘祥超	abda14f543	实现基本的区域监控终端管理功能	2021-09-05 11:10:07 +08:00
刘祥超	3f0e459181	删除不需要的文件	2021-09-04 10:27:45 +08:00
刘祥超	3df61381a4	删除部分不需要的文件/阶段性提交	2021-09-04 10:17:14 +08:00
刘祥超	daf8ae2192	修复IP地址保存后跳转错误的问题	2021-09-04 08:27:24 +08:00
刘祥超	3bf374ea5a	优化URL跳转交互	2021-09-01 08:49:59 +08:00
刘祥超	94b3559eee	增加独立的IP地址管理功能	2021-08-31 17:24:30 +08:00
刘祥超	1c93b42681	企业认证信息中增加节点数显示	2021-08-30 18:57:35 +08:00
刘祥超	1d9d44ecc3	数据看板和节点看板都改成异步加载	2021-08-30 15:23:31 +08:00
刘祥超	19178f963e	服务看板改成异步	2021-08-30 11:26:23 +08:00
刘祥超	4dc54f95b6	优化数据库节点管理	2021-08-30 10:56:03 +08:00
刘祥超	0790403923	优化交互	2021-08-30 09:52:09 +08:00
刘祥超	c55008d302	看板在健康检查失败离线时提供手动上线按钮	2021-08-29 16:56:37 +08:00
刘祥超	df9df94bb8	节点选择集群时可以根据关键词搜索	2021-08-29 16:41:59 +08:00
刘祥超	502ce4e414	健康检查连续下线次数默认值从1次改为3次	2021-08-29 15:26:56 +08:00
刘祥超	f5f07c0e96	可以在节点列表中直接修改节点所属线路	2021-08-29 14:00:59 +08:00
刘祥超	9549424835	缓存策略里的默认缓存条件增加、修改或者删除后自动保存	2021-08-29 09:40:21 +08:00
刘祥超	062b9baeab	修复缓存条件状态码无法修改的问题	2021-08-29 09:22:02 +08:00
刘祥超	08d1fcaf03	服务 -- 缓存设置中增加清理和预热功能	2021-08-29 09:21:44 +08:00
刘祥超	ad7523a500	修改accessKeys package因为大小写而无法编译的问题	2021-08-26 14:02:53 +08:00
刘祥超	28aa0f3b76	删除不需要的文件	2021-08-26 14:01:48 +08:00
刘祥超	8247843936	添加IP到IP名单时，可以选择批量输入	2021-08-26 10:28:52 +08:00
刘祥超	09ff5a37a9	DNS服务商支持搜索	2021-08-25 18:46:57 +08:00
刘祥超	663ec7710c	集群支持使用域名搜索	2021-08-25 18:39:35 +08:00
刘祥超	0dad0b10e6	选择DNS线路时增加搜索/节点如果没有设置DNS线路就使用默认线路	2021-08-25 17:16:14 +08:00
刘祥超	8c352813c4	优化HTTP Header管理界面交互	2021-08-25 14:09:37 +08:00
刘祥超	745f5d9759	优化集群选择DNS设置交互	2021-08-25 11:55:06 +08:00
刘祥超	6536ace4f7	默认集群没有节点时，在看板提示添加	2021-08-25 11:40:57 +08:00
刘祥超	67e6e06e72	新安装检查数据库权限后删除测试表	2021-08-25 11:27:09 +08:00
刘祥超	d0bf85de17	创建集群时自动创建缓存策略和WAF策略/优化界面	2021-08-25 11:17:24 +08:00
刘祥超	14cb3bdc67	增加忽略相似消息周期设置	2021-08-24 20:45:07 +08:00
刘祥超	e9dadd5571	消息接收人可以设置接收消息时间段	2021-08-24 17:46:00 +08:00
刘祥超	d5eceb05ce	消息发送任务队列可以删除单个任务	2021-08-24 16:36:47 +08:00
刘祥超	b510c88f84	通知媒介可以设置发送频率	2021-08-24 15:46:37 +08:00
刘祥超	16e409e5f5	通知媒介增加任务队列查看功能	2021-08-24 14:22:15 +08:00
刘祥超	ad257fcd0e	优化js	2021-08-24 09:31:14 +08:00
刘祥超	e84087d6ec	修复指标table类型图表的js错误	2021-08-24 09:31:07 +08:00
刘祥超	218c2385f0	在服务日志中增加WAF日志筛选	2021-08-22 16:49:15 +08:00
刘祥超	4ef8c2bc77	全局访问日志增加WAF日志/优化交互/数据看板--WAF--最新拦截记录增加更多链接	2021-08-22 16:34:20 +08:00
刘祥超	d9bc1bdfca	Dashboard可以提示API节点升级	2021-08-21 19:44:03 +08:00
刘祥超	a5c287e8d6	自建DNS支持递归查询	2021-08-21 16:46:49 +08:00
刘祥超	1e9f5c9c56	DNS访问日志显示匹配的线路	2021-08-20 11:27:06 +08:00
刘祥超	fbcf439f89	集群界面数据改成异步加载	2021-08-20 10:51:01 +08:00
刘祥超	766c3666d8	添加DNS账号时自动读取DNS服务商下域名	2021-08-19 14:26:25 +08:00
刘祥超	f08289351d	IP名单批量导入IP支持CIDR	2021-08-19 10:50:15 +08:00
刘祥超	e426bba8b5	优化界面	2021-08-18 17:09:09 +08:00
刘祥超	4b200762a5	节点IP地址可以设置阈值	2021-08-18 16:19:07 +08:00
刘祥超	fd203ed436	节点IP增加是否启用、是否在线状态	2021-08-18 09:24:03 +08:00
刘祥超	04cea4dbd6	优化界面	2021-08-17 10:48:38 +08:00
刘祥超	a8f1056c3c	调整版本为0.3.0	2021-08-17 09:44:14 +08:00
刘祥超	c2576f4c62	优化界面	2021-08-16 14:44:32 +08:00
刘祥超	1da5d1094f	WAF设置处增加文字提示	2021-08-16 10:03:44 +08:00
刘祥超	34e6122407	修复可能edgeTest无法升级的问题	2021-08-16 10:03:14 +08:00
刘祥超	ee61feb581	优化IPBox交互	2021-08-15 15:44:24 +08:00
刘祥超	7f04f1ed62	IPBox增加地域、ISP、添加到黑名单等功能	2021-08-15 15:42:05 +08:00
刘祥超	82646c3576	改进细节	2021-08-15 10:39:22 +08:00
刘祥超	b3f62240c4	节点选择认证时增加推荐	2021-08-14 21:33:48 +08:00
刘祥超	86a5992e8a	优化节点创建流程	2021-08-14 18:06:24 +08:00
刘祥超	82a731ed06	修复在MySQL8下安装提示无法创建edgeTest的问题	2021-08-13 19:37:56 +08:00
刘祥超	e650529efb	可以远程停止和启动DNS节点	2021-08-12 11:47:27 +08:00
刘祥超	1de57e124f	DNS节点可以修改SSH登录相关信息	2021-08-12 11:04:28 +08:00
刘祥超	9e72dcc390	实现DNS节点远程安装	2021-08-11 20:59:58 +08:00
刘祥超	80019e2071	修改文字	2021-08-11 17:16:36 +08:00
刘祥超	ab7cdcd1b1	增加全局访问日志	2021-08-11 15:38:49 +08:00
刘祥超	7afe1e0a30	安全设置检查IP时同时也检查直接连接管理平台的上游IP	2021-08-11 10:01:23 +08:00
刘祥超	a39eb80214	安全设置中增加允许记住登录选项	2021-08-11 09:36:16 +08:00
刘祥超	10e2a08cd2	访问日志显示节点信息	2021-08-10 11:14:41 +08:00
刘祥超	6da4949c98	优化自建DNS交互	2021-08-10 10:47:12 +08:00
刘祥超	4d092f329b	自建DNS增加解析测试	2021-08-09 18:42:00 +08:00
刘祥超	69c1d35406	EdgeDNS支持内置线路	2021-08-09 13:56:11 +08:00
刘祥超	a256a7328e	DNS节点增加在线状态通知	2021-08-08 10:29:57 +08:00
刘祥超	75c8658366	访问日志搜索增加域名和IP搜索	2021-08-07 22:04:30 +08:00
刘祥超	c3e68915a3	优化代码/支持IP名单的更多格式的导入、导出	2021-08-07 18:26:50 +08:00
刘祥超	d97f4da7fa	修复节点无法修改线路的Bug	2021-08-07 16:11:04 +08:00
刘祥超	06e81dbe37	调整版本为0.2.9	2021-08-07 15:41:21 +08:00
刘祥超	4a46aaa880	自建DNS增加全局配置	2021-08-05 16:08:18 +08:00
刘祥超	e766372a81	域名解析支持华为云解析DNS	2021-08-04 22:14:35 +08:00
刘祥超	c5ee9f095a	调整版本号	2021-08-04 15:36:30 +08:00
刘祥超	9734ed1cf8	调整版本号	2021-08-03 10:40:24 +08:00
刘祥超	548d122c64	修复在自动安装过程中不能填写SSH认证用户名的Bug	2021-08-03 06:29:01 +08:00
刘祥超	c5205ef7a9	优化界面	2021-08-02 14:51:15 +08:00
刘祥超	f71a27960b	优化界面	2021-08-01 14:54:27 +08:00
刘祥超	d747e656dc	优化界面	2021-08-01 11:13:17 +08:00
刘祥超	867215e2af	初步实现多集群共享节点	2021-07-31 22:23:07 +08:00
刘祥超	3614b9f3b7	修复服务设置 -- HTTP/HTTPS页面可能为空的Bug	2021-07-30 13:43:36 +08:00
刘祥超	cbfa4c85c1	优化文字	2021-07-29 17:40:16 +08:00
刘祥超	b9bef5042a	优化界面	2021-07-29 17:33:42 +08:00
刘祥超	46e523d005	实现基本的访问日志策略	2021-07-29 16:51:22 +08:00
刘祥超	fa2930dfc5	调整样式	2021-07-27 15:24:32 +08:00
刘祥超	086ab15e8a	优化交互	2021-07-27 11:49:04 +08:00
刘祥超	c2e3e784a2	优化一处规则显示	2021-07-27 11:26:52 +08:00
刘祥超	9dd01bd36e	网站服务显示服务错误的时候增加节点信息和链接	2021-07-27 10:48:42 +08:00
刘祥超	02d08b0762	图表中攻击流量类型改为Line Area	2021-07-27 09:51:47 +08:00
刘祥超	cbd312e67d	指标图表可以设置忽略空值和其他对象值	2021-07-26 16:44:22 +08:00
刘祥超	5084d9f87e	各个线图改成圆滑曲线	2021-07-26 14:32:24 +08:00
刘祥超	3c3408624d	URL跳转模式默认改成匹配前缀	2021-07-26 12:57:41 +08:00
刘祥超	6e8403390b	自动跳转到HTTPS可以设置允许和排除的域名	2021-07-26 11:21:47 +08:00
刘祥超	ef9e5d4bbc	修复一个跳转到详情的链接错误	2021-07-26 10:09:07 +08:00
刘祥超	c0b49948d7	版本改为0.2.6	2021-07-26 08:27:06 +08:00
刘祥超	48b066fb83	改进文字	2021-07-25 20:34:31 +08:00
刘祥超	7d551d59db	缓存目录默认为/opt/cache	2021-07-25 20:19:58 +08:00
刘祥超	5a057857dc	点击访问日志的IP弹出该IP最近访问日志	2021-07-25 19:58:30 +08:00
刘祥超	0a9cea722c	修改部分文字	2021-07-25 19:42:07 +08:00
刘祥超	f7eb7b1ec6	将访问日志保留天数从30天改成14天	2021-07-25 19:41:38 +08:00
刘祥超	0eb57a734e	更新编译脚本	2021-07-25 16:28:48 +08:00
刘祥超	82ff9a2b06	区分社区版和商业版	2021-07-25 15:44:14 +08:00
刘祥超	051a48bc73	DNS支持TSIG	2021-07-25 15:08:11 +08:00
刘祥超	6b9d5cf7a0	DNS服务支持密钥管理/“域名服务”改为“自建DNS”	2021-07-25 09:44:29 +08:00
刘祥超	2e7d64d97b	更新相关库	2021-07-22 18:44:55 +08:00
刘祥超	dd6050ee0b	修复在手机端无法正常浏览图表的Bug	2021-07-22 10:45:36 +08:00
刘祥超	c954910728	修复企业版身份认证可能会导致异常退出的问题	2021-07-22 10:45:23 +08:00
刘祥超	0fe2bc4a54	修复在使用内存缓存时导致节点看板页为空的Bug	2021-07-22 08:25:42 +08:00
刘祥超	9f39cd615f	Demo模式下不允许调用Sync方法	2021-07-22 08:25:14 +08:00
刘祥超	07bf21dbb4	修改DEMO链接地址	2021-07-21 22:18:08 +08:00
刘祥超	43e8c65473	增加DEMO连接	2021-07-21 22:14:40 +08:00
刘祥超	8a926eabbe	增加DEMO模式、修复监控节点、用户节点、认证节点无法查看运行日志的Bug	2021-07-21 22:14:33 +08:00