删除不必要的代码

.gitignore

@@ -2,4 +2,7 @@
 *-plus.sh
 *_plus.html
 *_plus.js
-*@plus.js
+*@plus.js
+*_plus.less
+*_plus.css
+*_plus.css.map

README.md

@@ -8,13 +8,42 @@
 * `简单` - 架构简单清晰，安装简单，使用简单，运维简单
 * `高扩展性` - 可以自由扩展新的节点，支持亿级数据
 
+## 功能介绍
+* 多用户
+* 日志审计
+* 集群管理
+* HTTP/HTTPS/TCP/UDP等协议支持
+* WAF
+* 缓存
+* DNS自动解析
+* 多域名绑定
+* 免费证书申请
+* IP黑白名单
+* 访问日志
+* 统计
+* 内容压缩
+* Protocol Proxy协议
+* 本地静态文件
+* URL跳转
+* 路由规则
+* 重写规则
+* 访问控制
+* 字符编码
+* 自定义页面
+* 自定义HTTP Header
+* Websocket
+* WebP自动转换
+* Fastcgi
+* 请求限制
+* 流量限制
+
 ## 在线演示
 * [http://demo.goedge.cn](http://demo.goedge.cn)
 
 ## 文档
-* [新手指南](https://edge.teaos.cn/docs/QuickStart/Index.md)
-* [完整文档](https://edge.teaos.cn/docs)
-* [开发者指南](https://edge.teaos.cn/docs/Developer/Build.md)
+* [新手指南](https://goedge.cn/docs/QuickStart/Index.md)
+* [完整文档](https://goedge.cn/docs)
+* [开发者指南](https://goedge.cn/docs/Developer/Build.md)
 
 ## 架构
 ![架构](doc/architect-zh.jpg)
@@ -25,7 +54,7 @@
 * [管理平台](https://github.com/TeaOSLab/EdgeAdmin)
 
 ## 联系我们
-有什么问题和建议都可以加入QQ群 `659832182`。
+有什么问题和建议都可以加入QQ群 `659832182` 或者 [Telegram群](https://t.me/+5kVCMGxQhZxiODY9) 。
 
 ## 感谢
-* 感谢[Gitee](https://gitee.com/)提供国内源代码托管平台
+* 感谢 [Gitee](https://gitee.com/) 提供国内源代码托管平台

build/.gitignore

@@ -1 +1,2 @@
-edge-api/
+edge-api/
+build-all-test.sh

build/build.sh

@@ -1,22 +1,23 @@
 #!/usr/bin/env bash
 
 function build() {
-	ROOT=$(dirname $0)
+	ROOT=$(dirname "$0")
+	JS_ROOT=$ROOT/../web/public/js
 	NAME="edge-admin"
 	DIST=$ROOT/"../dist/${NAME}"
 	OS=${1}
 	ARCH=${2}
 	TAG=${3}
 
-	if [ -z $OS ]; then
+	if [ -z "$OS" ]; then
 		echo "usage: build.sh OS ARCH"
 		exit
 	fi
-	if [ -z $ARCH ]; then
+	if [ -z "$ARCH" ]; then
 		echo "usage: build.sh OS ARCH"
 		exit
 	fi
-	if [ -z $TAG ]; then
+	if [ -z "$TAG" ]; then
 		TAG="community"
 	fi
 
@@ -24,7 +25,7 @@ function build() {
 	echo "checking required commands ..."
 	commands=("zip" "unzip" "go" "find" "sed")
 	for cmd in "${commands[@]}"; do
-		if [ `which ${cmd}` ]; then
+		if [ "$(which "${cmd}")" ]; then
 			echo "checking ${cmd}: ok"
 		else
 			echo "checking ${cmd}: not found"
@@ -32,40 +33,49 @@ function build() {
 		fi
 	done
 
-	VERSION=$(lookup-version $ROOT/../internal/const/const.go)
+	VERSION=$(lookup-version "$ROOT"/../internal/const/const.go)
 	ZIP="${NAME}-${OS}-${ARCH}-${TAG}-v${VERSION}.zip"
 
 	# build edge-api
-	APINodeVersion=$(lookup-version $ROOT"/../../EdgeAPI/internal/const/const.go")
+	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
+	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"
+	cd "$ROOT""/../../EdgeAPI/build" || exit
 	echo "=============================="
-	./build.sh $OS $ARCH $TAG
+	./build.sh "$OS" "$ARCH" $TAG
 	echo "=============================="
-	cd -
+	cd - || exit
 
     # generate files
     echo "generating files ..."
-	go run -tags $TAG $ROOT/../cmd/edge-admin/main.go generate
+	go run -tags $TAG "$ROOT"/../cmd/edge-admin/main.go generate
+	if [ "$(which uglifyjs)" ]; then
+    	echo "compress to component.js ..."
+    	uglifyjs --compress --mangle -- "${JS_ROOT}"/components.src.js > "${JS_ROOT}"/components.js
+    else
+    	echo "copy to component.js ..."
+    	cp "${JS_ROOT}"/components.src.js "${JS_ROOT}"/components.js
+    fi
 
 	# create dir & copy files
 	echo "copying ..."
-	if [ ! -d $DIST ]; then
-		mkdir $DIST
-		mkdir $DIST/bin
-		mkdir $DIST/configs
-		mkdir $DIST/logs
+	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/
+	cp -R "$ROOT"/../web "$DIST"/
+	rm -f "$DIST"/web/tmp/*
+	rm -rf "$DIST"/web/public/js/components
+	rm -f "$DIST"/web/public/js/components.src.js
+	cp "$ROOT"/configs/server.template.yaml "$DIST"/configs/
 
 	# change _plus.[ext] to .[ext]
 	if [ "${TAG}" = "plus" ]; then
@@ -73,30 +83,30 @@ function build() {
 		exts=("html" "js" "css")
 		for ext in "${exts[@]}"; do
 			pattern="*_plus."${ext}
-			find $DIST/web/views -type f -name $pattern | \
+			find "$DIST"/web/views -type f -name "$pattern" | \
 				while read filename; do
-					mv ${filename} "${filename/_plus."${ext}"/."${ext}"}"
+					mv "${filename}" "${filename/_plus."${ext}"/."${ext}"}"
 				done
 		done
 	fi
 
 	EDGE_API_ZIP_FILE=$ROOT"/../../EdgeAPI/dist/edge-api-${OS}-${ARCH}-${TAG}-v${APINodeVersion}.zip"
-	cp $EDGE_API_ZIP_FILE $DIST/
-	cd $DIST/
-	unzip -q $(basename $EDGE_API_ZIP_FILE)
-	rm -f $(basename $EDGE_API_ZIP_FILE)
-	cd -
+	cp "$EDGE_API_ZIP_FILE" "$DIST"/
+	cd "$DIST"/ || exit
+	unzip -q "$(basename "$EDGE_API_ZIP_FILE")"
+	rm -f "$(basename "$EDGE_API_ZIP_FILE")"
+	cd - || exit
 
 	# build
-	echo "building "${NAME}" ..."
-	env GOOS=$OS GOARCH=$ARCH go build -tags $TAG -ldflags="-s -w" -o $DIST/bin/${NAME} $ROOT/../cmd/edge-admin/main.go
+	echo "building ${NAME} ..."
+	env GOOS="$OS" GOARCH="$ARCH" go build -trimpath -tags $TAG -ldflags="-s -w" -o "$DIST"/bin/${NAME} "$ROOT"/../cmd/edge-admin/main.go
 
 	# delete hidden files
-	find $DIST -name ".DS_Store" -delete
-	find $DIST -name ".gitignore" -delete
-	find $DIST -name "*.less" -delete
-	find $DIST -name "*.css.map" -delete
-	find $DIST -name "*.js.map" -delete
+	find "$DIST" -name ".DS_Store" -delete
+	find "$DIST" -name ".gitignore" -delete
+	find "$DIST" -name "*.less" -delete
+	find "$DIST" -name "*.css.map" -delete
+	find "$DIST" -name "*.js.map" -delete
 
 	# zip
 	echo "zip files ..."
@@ -113,15 +123,15 @@ function build() {
 
 function lookup-version() {
 	FILE=$1
-	VERSION_DATA=$(cat $FILE)
+	VERSION_DATA=$(cat "$FILE")
 	re="Version[ ]+=[ ]+\"([0-9.]+)\""
 	if [[ $VERSION_DATA =~ $re ]]; then
 		VERSION=${BASH_REMATCH[1]}
-		echo $VERSION
+		echo "$VERSION"
 	else
 		echo "could not match version"
 		exit
 	fi
 }
 
-build $1 $2 $3
+build "$1" "$2" "$3"

build/generate.sh

@@ -1,3 +1,16 @@
 #!/usr/bin/env bash
 
+JS_ROOT=../web/public/js
+
+echo "generate component.src.js ..."
 go run -tags=community ../cmd/edge-admin/main.go  generate
+
+if [ `which uglifyjs` ]; then
+	echo "compress to component.js ..."
+	uglifyjs --compress --mangle -- ${JS_ROOT}/components.src.js > ${JS_ROOT}/components.js
+else
+	echo "copy to component.js ..."
+	cp ${JS_ROOT}/components.src.js ${JS_ROOT}/components.js
+fi
+
+echo "ok"

cmd/edge-admin/main.go

@@ -7,25 +7,34 @@ import (
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/gen"
 	"github.com/TeaOSLab/EdgeAdmin/internal/nodes"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web"
 	_ "github.com/iwind/TeaGo/bootstrap"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/gosock/pkg/gosock"
+	"log"
+	"time"
 )
 
 func main() {
-	app := apps.NewAppCmd().
+	var app = apps.NewAppCmd().
 		Version(teaconst.Version).
 		Product(teaconst.ProductName).
-		Usage(teaconst.ProcessName+" [-v|start|stop|restart|service|daemon|reset|recover|demo]").
+		Usage(teaconst.ProcessName+" [-v|start|stop|restart|service|daemon|reset|recover|demo|upgrade]").
+		Usage(teaconst.ProcessName+" [dev|prod]").
 		Option("-h", "show this help").
 		Option("-v", "show version").
 		Option("start", "start the service").
 		Option("stop", "stop the service").
+		Option("restart", "restart the service").
 		Option("service", "register service into systemd").
 		Option("daemon", "start the service with daemon").
 		Option("reset", "reset configs").
-		Option("recover", "enter recovery mode")
+		Option("recover", "enter recovery mode").
+		Option("demo", "switch to demo mode").
+		Option("dev", "switch to 'dev' mode").
+		Option("prod", "switch to 'prod' mode").
+		Option("upgrade", "upgrade from official site")
 
 	app.On("daemon", func() {
 		nodes.NewAdminNode().Daemon()
@@ -84,8 +93,68 @@ func main() {
 			return
 		}
 	})
+	app.On("dev", func() {
+		var env = "dev"
+		var sock = gosock.NewTmpSock(teaconst.ProcessName)
+		_, err := sock.Send(&gosock.Command{
+			Code:   env,
+			Params: nil,
+		})
+		if err != nil {
+			fmt.Println("failed to switch to '" + env + "': " + err.Error())
+		} else {
+			fmt.Println("switch to '" + env + "' ok")
+		}
+	})
+	app.On("prod", func() {
+		var env = "prod"
+		var sock = gosock.NewTmpSock(teaconst.ProcessName)
+		_, err := sock.Send(&gosock.Command{
+			Code:   env,
+			Params: nil,
+		})
+		if err != nil {
+			fmt.Println("failed to switch to '" + env + "': " + err.Error())
+		} else {
+			fmt.Println("switch to '" + env + "' ok")
+		}
+	})
+	app.On("upgrade", func() {
+		var manager = utils.NewUpgradeManager("admin")
+		log.Println("checking latest version ...")
+		var ticker = time.NewTicker(1 * time.Second)
+		go func() {
+			var lastProgress float32 = 0
+			var isStarted = false
+			for range ticker.C {
+				if manager.IsDownloading() {
+					if !isStarted {
+						log.Println("start downloading v" + manager.NewVersion() + " ...")
+						isStarted = true
+					}
+					var progress = manager.Progress()
+					if progress >= 0 {
+						if progress == 0 || progress == 1 || progress-lastProgress >= 0.1 {
+							lastProgress = progress
+							log.Println(fmt.Sprintf("%.2f%%", manager.Progress()*100))
+						}
+					}
+				} else {
+					break
+				}
+			}
+		}()
+		err := manager.Start()
+		if err != nil {
+			log.Println("upgrade failed: " + err.Error())
+			return
+		}
+		log.Println("finished!")
+		log.Println("restarting ...")
+		app.RunRestart()
+	})
 	app.Run(func() {
-		adminNode := nodes.NewAdminNode()
+		var adminNode = nodes.NewAdminNode()
 		adminNode.Run()
 	})
 }

dist/.gitignore

@@ -1,2 +1,2 @@
 *.zip
-shield-admin
+edge-admin

go.mod

@@ -1,6 +1,6 @@
 module github.com/TeaOSLab/EdgeAdmin
 
-go 1.16
+go 1.18
 
 replace github.com/TeaOSLab/EdgeCommon => ../EdgeCommon
 
@@ -8,17 +8,37 @@ require (
 	github.com/TeaOSLab/EdgeCommon v0.0.0-00010101000000-000000000000
 	github.com/cespare/xxhash v1.1.0
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/iwind/TeaGo v0.0.0-20220304043459-0dd944a5b475
 	github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/miekg/dns v1.1.35
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/miekg/dns v1.1.43
+	github.com/shirou/gopsutil/v3 v3.22.5
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/tealeg/xlsx/v3 v3.2.3
 	github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8
+	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
 	google.golang.org/grpc v1.45.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
+
+require (
+	github.com/frankban/quicktest v1.11.3 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/btree v1.0.0 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/kr/pretty v0.2.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/rogpeppe/fastuuid v1.2.0 // indirect
+	github.com/shabbyrobe/xmlwriter v0.0.0-20200208144257-9fca06d00ffa // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+)

go.sum

@@ -11,7 +11,6 @@ github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiU
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -20,6 +19,7 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -30,12 +30,15 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/frankban/quicktest v1.5.0 h1:Tb4jWdSpdjKzTUicPnY61PZxKbDoGa7ABbrReT3gQVY=
 github.com/frankban/quicktest v1.5.0/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
+github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY=
+github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-redis/redis/v8 v8.0.0-beta.7/go.mod h1:FGJAWDWFht1sQ4qxyJHZZbVyvnVcKQN0E3u5/5lRz+g=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
@@ -62,18 +65,15 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
-github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24 h1:1cGulkD2SNJJRok5OKwyhP/Ddm+PgSWKOupn0cR36/A=
-github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
-github.com/iwind/TeaGo v0.0.0-20220304042834-d8b5103e9027 h1:4knh28YgldmEtu8QG8pgQhUaI3i//qRjOdEyj9OVqXA=
-github.com/iwind/TeaGo v0.0.0-20220304042834-d8b5103e9027/go.mod h1:IyKPaIhjbjsTctPguMWJZDHuBHu+XiYcV5ZEDxQpq94=
 github.com/iwind/TeaGo v0.0.0-20220304043459-0dd944a5b475 h1:EseyfFaQOjWanGiby9KMw7PjDBMg/95tLDgIw/ns0Cw=
 github.com/iwind/TeaGo v0.0.0-20220304043459-0dd944a5b475/go.mod h1:HRHK0zoC/og3c9/hKosD9yYVMTnnzm3PgXUdhRYHaLc=
 github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4 h1:VWGsCqTzObdlbf7UUE3oceIpcEKi4C/YBUszQXk118A=
@@ -81,20 +81,22 @@ github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4/go.mod h1:H5Q7SXwbx3a
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-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/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg=
+github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
 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/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -111,11 +113,15 @@ github.com/pkg/profile v1.5.0 h1:042Buzk+NhDI+DeSAA62RwJL8VAuZUMQZUjCsRz1Mug=
 github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/shabbyrobe/xmlwriter v0.0.0-20200208144257-9fca06d00ffa h1:2cO3RojjYl3hVTbEvJVqrMaFmORhL6O06qdW42toftk=
 github.com/shabbyrobe/xmlwriter v0.0.0-20200208144257-9fca06d00ffa/go.mod h1:Yjr3bdWaVWyME1kha7X0jsz3k2DgXNa1Pj3XGyUAbx8=
+github.com/shirou/gopsutil/v3 v3.22.5 h1:atX36I/IXgFiB81687vSiBI5zrMsxcIBkP9cQMJQoJA=
+github.com/shirou/gopsutil/v3 v3.22.5/go.mod h1:so9G9VzeHt/hsd0YwqprnjHnfARAUktauykSbr+y2gA=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
@@ -124,17 +130,21 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tealeg/xlsx/v3 v3.2.3 h1:MXnVh+9Y8cUglowItTy2HL3Kv6z+q/0aNjeKuTsVqZQ=
 github.com/tealeg/xlsx/v3 v3.2.3/go.mod h1:0hGmAEoZ48SS1ZAE6eqZJkJVXgOMY+8a33vjXa8S8HA=
+github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
+github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
 github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119 h1:YyPWX3jLOtYKulBR6AScGIs74lLrJcgeKRwcbAuQOG4=
 github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119/go.mod h1:/nuTSlK+okRfR/vnIPqR89fFKonnWPiZymN5ydRJkX8=
+github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
+github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opentelemetry.io/otel v0.7.0/go.mod h1:aZMyHG5TqDOXEgH2tyLiXSUKly1jT3yqE9PmrzIeCdo=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -158,6 +168,7 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 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-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+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-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
@@ -175,7 +186,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -183,14 +194,16 @@ 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-20201204225414-ed752295db88/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-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -204,11 +217,9 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -217,8 +228,6 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20220303160752-862486edd9cc h1:fb/ViRpv3ln/LvbqZtTpoOd1YQDNH12gaGZreoSFovE=
-google.golang.org/genproto v0.0.0-20220303160752-862486edd9cc/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e h1:fNKDNuUyC4WH+inqDMpfXDdfvwfYILbsX+oskGZ8hxg=
 google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -228,8 +237,6 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg=
-google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M=
 google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
@@ -247,8 +254,9 @@ google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+Rur
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -256,10 +264,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/apps/app_cmd.go

@@ -18,7 +18,7 @@ import (
 type AppCmd struct {
 	product       string
 	version       string
-	usage         string
+	usages        []string
 	options       []*CommandHelpOption
 	appendStrings []string
 
@@ -52,7 +52,7 @@ func (this *AppCmd) Version(version string) *AppCmd {
 
 // Usage 使用方法
 func (this *AppCmd) Usage(usage string) *AppCmd {
-	this.usage = usage
+	this.usages = append(this.usages, usage)
 	return this
 }
 
@@ -75,8 +75,10 @@ func (this *AppCmd) Append(appendString string) *AppCmd {
 func (this *AppCmd) Print() {
 	fmt.Println(this.product + " v" + this.version)
 
-	usage := this.usage
-	fmt.Println("Usage:", "\n   "+usage)
+	fmt.Println("Usage:")
+	for _, usage := range this.usages {
+		fmt.Println("   " + usage)
+	}
 
 	if len(this.options) > 0 {
 		fmt.Println("")
@@ -121,7 +123,7 @@ func (this *AppCmd) On(arg string, callback func()) {
 // Run 运行
 func (this *AppCmd) Run(main func()) {
 	// 获取参数
-	args := os.Args[1:]
+	var args = os.Args[1:]
 	if len(args) > 0 {
 		switch args[0] {
 		case "-v", "version", "-version", "--version":
@@ -137,7 +139,7 @@ func (this *AppCmd) Run(main func()) {
 			this.runStop()
 			return
 		case "restart":
-			this.runRestart()
+			this.RunRestart()
 			return
 		case "status":
 			this.runStatus()
@@ -158,7 +160,7 @@ func (this *AppCmd) Run(main func()) {
 	}
 
 	// 日志
-	writer := new(LogWriter)
+	var writer = new(LogWriter)
 	writer.Init()
 	logs.SetWriter(writer)
 
@@ -208,7 +210,7 @@ func (this *AppCmd) runStop() {
 }
 
 // 重启
-func (this *AppCmd) runRestart() {
+func (this *AppCmd) RunRestart() {
 	this.runStop()
 	time.Sleep(1 * time.Second)
 	this.runStart()

internal/apps/log_writer.go

@@ -1,51 +1,108 @@
 package apps
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/goman"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/sizes"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/files"
-	"github.com/iwind/TeaGo/logs"
-	"github.com/iwind/TeaGo/utils/time"
+	timeutil "github.com/iwind/TeaGo/utils/time"
 	"log"
+	"os"
+	"runtime"
+	"strconv"
+	"strings"
 )
 
 type LogWriter struct {
-	fileAppender *files.Appender
+	fp *os.File
+	c  chan string
 }
 
 func (this *LogWriter) Init() {
 	// 创建目录
-	dir := files.NewFile(Tea.LogDir())
+	var dir = files.NewFile(Tea.LogDir())
 	if !dir.Exists() {
 		err := dir.Mkdir()
 		if err != nil {
-			log.Println("[error]" + err.Error())
+			log.Println("[LOG]create log dir failed: " + err.Error())
 		}
 	}
 
-	logFile := files.NewFile(Tea.LogFile("run.log"))
-
 	// 打开要写入的日志文件
-	appender, err := logFile.Appender()
+	var logPath = Tea.LogFile("run.log")
+	fp, err := os.OpenFile(logPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
 	if err != nil {
-		logs.Error(err)
+		log.Println("[LOG]open log file failed: " + err.Error())
 	} else {
-		this.fileAppender = appender
+		this.fp = fp
+	}
+
+	this.c = make(chan string, 1024)
+
+	// 异步写入文件
+	var maxFileSize = 2 * sizes.G // 文件最大尺寸，超出此尺寸则清空
+	if fp != nil {
+		goman.New(func() {
+			var totalSize int64 = 0
+			stat, err := fp.Stat()
+			if err == nil {
+				totalSize = stat.Size()
+			}
+
+			for message := range this.c {
+				totalSize += int64(len(message))
+				_, err := fp.WriteString(timeutil.Format("Y/m/d H:i:s ") + message + "\n")
+				if err != nil {
+					log.Println("[LOG]write log failed: " + err.Error())
+				} else {
+					// 如果太大则Truncate
+					if totalSize > maxFileSize {
+						_ = fp.Truncate(0)
+						totalSize = 0
+					}
+				}
+			}
+		})
 	}
 }
 
 func (this *LogWriter) Write(message string) {
-	log.Println(message)
+	backgroundEnv, _ := os.LookupEnv("EdgeBackground")
+	if backgroundEnv != "on" {
+		// 文件和行号
+		var file string
+		var line int
+		if Tea.IsTesting() {
+			var callDepth = 3
+			var ok bool
+			_, file, line, ok = runtime.Caller(callDepth)
+			if ok {
+				file = this.packagePath(file)
+			}
+		}
 
-	if this.fileAppender != nil {
-		_, err := this.fileAppender.AppendString(timeutil.Format("Y/m/d H:i:s ") + message + "\n")
-		if err != nil {
-			log.Println("[error]" + err.Error())
+		if len(file) > 0 {
+			log.Println(message + " (" + file + ":" + strconv.Itoa(line) + ")")
+		} else {
+			log.Println(message)
 		}
 	}
+
+	this.c <- message
 }
 
 func (this *LogWriter) Close() {
-	if this.fileAppender != nil {
-		_ = this.fileAppender.Close()
+	if this.fp != nil {
+		_ = this.fp.Close()
 	}
+
+	close(this.c)
+}
+
+func (this *LogWriter) packagePath(path string) string {
+	var pieces = strings.Split(path, "/")
+	if len(pieces) >= 2 {
+		return strings.Join(pieces[len(pieces)-2:], "/")
+	}
+	return path
 }

internal/configloaders/admin_module.go

@@ -22,6 +22,7 @@ const (
 	AdminModuleCodePlan      AdminModuleCode = "plan"      // 套餐
 	AdminModuleCodeLog       AdminModuleCode = "log"       // 日志
 	AdminModuleCodeSetting   AdminModuleCode = "setting"   // 设置
+	AdminModuleCodeTicket    AdminModuleCode = "ticket"    // 工单
 	AdminModuleCodeCommon    AdminModuleCode = "common"    // 只要登录就可以访问的模块
 )
 
@@ -159,7 +160,7 @@ func UpdateAdminTheme(adminId int64, theme string) {
 
 // AllModuleMaps 所有权限列表
 func AllModuleMaps() []maps.Map {
-	m := []maps.Map{
+	var m = []maps.Map{
 		{
 			"name": "看板",
 			"code": AdminModuleCodeDashboard,
@@ -204,11 +205,24 @@ func AllModuleMaps() []maps.Map {
 			"code": AdminModuleCodeFinance,
 			"url":  "/finance",
 		},
-		{
-			"name": "套餐管理",
-			"code": AdminModuleCodePlan,
-			"url":  "/plans",
-		},
+	}...)
+
+	if teaconst.IsPlus {
+		m = append(m, []maps.Map{
+			{
+				"name": "套餐管理",
+				"code": AdminModuleCodePlan,
+				"url":  "/plans",
+			},
+			{
+				"name": "工单系统",
+				"code": AdminModuleCodeTicket,
+				"url":  "/tickets",
+			},
+		}...)
+	}
+
+	m = append(m, []maps.Map{
 		{
 			"name": "日志审计",
 			"code": AdminModuleCodeLog,

internal/configloaders/admin_module_test.go

@@ -6,7 +6,7 @@ import (
 )
 
 func TestLoadAdminModuleMapping(t *testing.T) {
-	m, err := LoadAdminModuleMapping()
+	m, err := loadAdminModuleMapping()
 	if err != nil {
 		t.Fatal(err)
 	}

internal/configloaders/admin_ui_config.go

@@ -3,10 +3,12 @@ package configloaders
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
 	"github.com/iwind/TeaGo/logs"
 	"reflect"
+	"time"
 )
 
 var sharedAdminUIConfig *systemconfigs.AdminUIConfig = nil
@@ -24,6 +26,15 @@ func LoadAdminUIConfig() (*systemconfigs.AdminUIConfig, error) {
 	return &v, nil
 }
 
+func ReloadAdminUIConfig() error {
+	locker.Lock()
+	defer locker.Unlock()
+
+	sharedAdminUIConfig = nil
+	_, err := loadAdminUIConfig()
+	return err
+}
+
 func UpdateAdminUIConfig(uiConfig *systemconfigs.AdminUIConfig) error {
 	locker.Lock()
 	defer locker.Unlock()
@@ -45,6 +56,9 @@ func UpdateAdminUIConfig(uiConfig *systemconfigs.AdminUIConfig) error {
 	}
 	sharedAdminUIConfig = uiConfig
 
+	// timezone
+	updateTimeZone(uiConfig)
+
 	return nil
 }
 
@@ -76,13 +90,17 @@ func loadAdminUIConfig() (*systemconfigs.AdminUIConfig, error) {
 		return sharedAdminUIConfig, nil
 	}
 
-	config := &systemconfigs.AdminUIConfig{}
+	var config = &systemconfigs.AdminUIConfig{}
 	err = json.Unmarshal(resp.ValueJSON, config)
 	if err != nil {
 		logs.Println("[UI_MANAGER]" + err.Error())
 		sharedAdminUIConfig = defaultAdminUIConfig()
 		return sharedAdminUIConfig, nil
 	}
+
+	// timezone
+	updateTimeZone(config)
+
 	sharedAdminUIConfig = config
 	return sharedAdminUIConfig, nil
 }
@@ -95,5 +113,16 @@ func defaultAdminUIConfig() *systemconfigs.AdminUIConfig {
 		ShowVersion:        true,
 		ShowFinance:        true,
 		DefaultPageSize:    10,
+		TimeZone:           nodeconfigs.DefaultTimeZoneLocation,
+	}
+}
+
+// 修改时区
+func updateTimeZone(config *systemconfigs.AdminUIConfig) {
+	if len(config.TimeZone) > 0 {
+		location, err := time.LoadLocation(config.TimeZone)
+		if err == nil && time.Local != location {
+			time.Local = location
+		}
 	}
 }

internal/configloaders/admin_ui_config_test.go

@@ -9,7 +9,7 @@ import (
 func TestLoadUIConfig(t *testing.T) {
 	for i := 0; i < 10; i++ {
 		before := time.Now()
-		config, err := LoadUIConfig()
+		config, err := LoadAdminUIConfig()
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -20,7 +20,7 @@ func TestLoadUIConfig(t *testing.T) {
 
 func TestLoadUIConfig2(t *testing.T) {
 	for i := 0; i < 10; i++ {
-		config, err := LoadUIConfig()
+		config, err := LoadAdminUIConfig()
 		if err != nil {
 			t.Fatal(err)
 		}

internal/configloaders/user_ui_config.go

@@ -84,10 +84,13 @@ func loadUserUIConfig() (*systemconfigs.UserUIConfig, error) {
 
 func defaultUserUIConfig() *systemconfigs.UserUIConfig {
 	return &systemconfigs.UserUIConfig{
-		ProductName:        "GoEdge",
-		UserSystemName:     "GoEdge用户系统",
-		ShowOpenSourceInfo: true,
-		ShowVersion:        true,
-		ShowFinance:        true,
+		ProductName:         "GoEdge",
+		UserSystemName:      "GoEdge用户系统",
+		ShowOpenSourceInfo:  true,
+		ShowVersion:         true,
+		ShowFinance:         true,
+		BandwidthUnit:       systemconfigs.BandwidthUnitBit,
+		ShowBandwidthCharts: true,
+		ShowTrafficCharts:   true,
 	}
 }

internal/configs/api_config.go

@@ -4,7 +4,6 @@ import (
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/iwind/TeaGo/Tea"
 	"gopkg.in/yaml.v3"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 )
@@ -12,7 +11,8 @@ import (
 // APIConfig API配置
 type APIConfig struct {
 	RPC struct {
-		Endpoints []string `yaml:"endpoints"`
+		Endpoints     []string `yaml:"endpoints"`
+		DisableUpdate bool     `yaml:"disableUpdate"`
 	} `yaml:"rpc"`
 	NodeId string `yaml:"nodeId"`
 	Secret string `yaml:"secret"`
@@ -33,7 +33,7 @@ func LoadAPIConfig() (*APIConfig, error) {
 	var data []byte
 	var err error
 	for _, path := range paths {
-		data, err = ioutil.ReadFile(path)
+		data, err = os.ReadFile(path)
 		if err == nil {
 			if path == localFile {
 				isFromLocal = true
@@ -53,7 +53,7 @@ func LoadAPIConfig() (*APIConfig, error) {
 
 	if !isFromLocal {
 		// 恢复文件
-		_ = ioutil.WriteFile(localFile, data, 0666)
+		_ = os.WriteFile(localFile, data, 0666)
 	}
 
 	return config, nil
@@ -109,41 +109,48 @@ func (this *APIConfig) WriteFile(path string) error {
 		return err
 	}
 
+	err = os.WriteFile(path, data, 0666)
+	if err != nil {
+		return err
+	}
+
 	// 写入 ~/ 和 /etc/ 目录，因为是备份需要，所以不需要提示错误信息
 	// 写入 ~/.edge-admin/
-	filename := filepath.Base(path)
+	// 这个用来判断用户是否为重装，所以比较重要
+	var filename = filepath.Base(path)
 	homeDir, homeErr := os.UserHomeDir()
 	if homeErr == nil {
 		dir := homeDir + "/." + teaconst.ProcessName
 		stat, err := os.Stat(dir)
 		if err == nil && stat.IsDir() {
-			_ = ioutil.WriteFile(dir+"/"+filename, data, 0666)
+			err = os.WriteFile(dir+"/"+filename, data, 0666)
+			if err != nil {
+				return err
+			}
 		} else if err != nil && os.IsNotExist(err) {
 			err = os.Mkdir(dir, 0777)
 			if err == nil {
-				_ = ioutil.WriteFile(dir+"/"+filename, data, 0666)
+				err = os.WriteFile(dir+"/"+filename, data, 0666)
+				if err != nil {
+					return err
+				}
 			}
 		}
 	}
 
 	// 写入 /etc/edge-admin
 	{
-		dir := "/etc/" + teaconst.ProcessName
+		var dir = "/etc/" + teaconst.ProcessName
 		stat, err := os.Stat(dir)
 		if err == nil && stat.IsDir() {
-			_ = ioutil.WriteFile(dir+"/"+filename, data, 0666)
+			_ = os.WriteFile(dir+"/"+filename, data, 0666)
 		} else if err != nil && os.IsNotExist(err) {
 			err = os.Mkdir(dir, 0777)
 			if err == nil {
-				_ = ioutil.WriteFile(dir+"/"+filename, data, 0666)
+				_ = os.WriteFile(dir+"/"+filename, data, 0666)
 			}
 		}
 	}
 
-	err = ioutil.WriteFile(path, data, 0666)
-	if err != nil {
-		return err
-	}
-
 	return nil
 }

internal/configs/api_config_test.go

@@ -14,13 +14,7 @@ func TestLoadAPIConfig(t *testing.T) {
 }
 
 func TestAPIConfig_WriteFile(t *testing.T) {
-	config := &APIConfig{
-		RPC: struct {
-			Endpoints []string `yaml:"endpoints"`
-		}{},
-		NodeId: "1",
-		Secret: "2",
-	}
+	config := &APIConfig{}
 	err := config.WriteFile("/tmp/api_config.yaml")
 	if err != nil {
 		t.Fatal(err)

internal/configs/plus_config.go

@@ -5,7 +5,7 @@ package configs
 import (
 	"encoding/json"
 	"github.com/iwind/TeaGo/Tea"
-	"io/ioutil"
+	"os"
 )
 
 var plusConfigFile = "plus.cache.json"
@@ -17,7 +17,7 @@ type PlusConfig struct {
 }
 
 func ReadPlusConfig() *PlusConfig {
-	data, err := ioutil.ReadFile(Tea.ConfigFile(plusConfigFile))
+	data, err := os.ReadFile(Tea.ConfigFile(plusConfigFile))
 	if err != nil {
 		return &PlusConfig{IsPlus: false}
 	}
@@ -34,7 +34,7 @@ func WritePlusConfig(config *PlusConfig) error {
 	if err != nil {
 		return err
 	}
-	err = ioutil.WriteFile(Tea.ConfigFile(plusConfigFile), configJSON, 0777)
+	err = os.WriteFile(Tea.ConfigFile(plusConfigFile), configJSON, 0777)
 	if err != nil {
 		return err
 	}

internal/const/build.go

@@ -1,5 +1,5 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-// +build community
+//go:build !plus
 
 package teaconst
 

internal/const/const.go

@@ -1,9 +1,9 @@
 package teaconst
 
 const (
-	Version = "0.4.5"
+	Version = "0.5.4"
 
-	APINodeVersion = "0.4.5"
+	APINodeVersion = "0.5.4"
 
 	ProductName   = "Edge Admin"
 	ProcessName   = "edge-admin"

internal/const/plus.go

@@ -1,6 +1,5 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-//go:build community
-// +build community
+//go:build !plus
 
 package teaconst
 

internal/csrf/utils.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-// 生成Token
+// Generate 生成Token
 func Generate() string {
 	timestamp := strconv.FormatInt(time.Now().Unix(), 10)
 
@@ -23,7 +23,7 @@ func Generate() string {
 	return token
 }
 
-// 校验Token
+// Validate 校验Token
 func Validate(token string) (b bool) {
 	if len(token) == 0 {
 		return

internal/gen/generate.go

@@ -21,7 +21,7 @@ import (
 func Generate() error {
 	err := generateComponentsJSFile()
 	if err != nil {
-		return errors.New("generate 'components.js' failed: " + err.Error())
+		return errors.New("generate 'components.src.js' failed: " + err.Error())
 	}
 
 	return nil
@@ -115,7 +115,7 @@ func generateComponentsJSFile() error {
 		buffer.Write([]byte{'\n', '\n'})
 	}
 
-	fp, err := os.OpenFile(filepath.Clean(Tea.PublicFile("/js/components.js")), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0777)
+	fp, err := os.OpenFile(filepath.Clean(Tea.PublicFile("/js/components.src.js")), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0777)
 	if err != nil {
 		return err
 	}

internal/nodes/admin_node.go

@@ -1,9 +1,9 @@
 package nodes
 
 import (
+	"errors"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
-	"github.com/TeaOSLab/EdgeAdmin/internal/errors"
 	"github.com/TeaOSLab/EdgeAdmin/internal/events"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/iwind/TeaGo"
@@ -13,9 +13,11 @@ import (
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/rands"
 	"github.com/iwind/TeaGo/sessions"
+	"github.com/iwind/TeaGo/types"
 	"github.com/iwind/gosock/pkg/gosock"
-	"io/ioutil"
+	"gopkg.in/yaml.v3"
 	"log"
+	"net"
 	"os"
 	"os/exec"
 	"os/signal"
@@ -38,7 +40,7 @@ func (this *AdminNode) Run() {
 	SharedAdminNode = this
 
 	// 启动管理界面
-	secret := this.genSecret()
+	var secret = this.genSecret()
 	configs.Secret = secret
 
 	// 本地Sock
@@ -58,6 +60,9 @@ func (this *AdminNode) Run() {
 		return
 	}
 
+	// 添加端口到防火墙
+	this.addPortsToFirewall()
+
 	// 监听信号
 	sigQueue := make(chan os.Signal)
 	signal.Notify(sigQueue, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL, syscall.SIGQUIT)
@@ -85,7 +90,7 @@ func (this *AdminNode) Run() {
 		EndAll().
 		Session(sessions.NewFileSessionManager(86400, secret), teaconst.CookieSID).
 		ReadHeaderTimeout(3 * time.Second).
-		ReadTimeout(600 * time.Second).
+		ReadTimeout(1200 * time.Second).
 		Start()
 }
 
@@ -167,9 +172,9 @@ func (this *AdminNode) checkServer() error {
 	if os.IsNotExist(err) {
 		// 创建文件
 		templateFile := Tea.ConfigFile("server.template.yaml")
-		data, err := ioutil.ReadFile(templateFile)
+		data, err := os.ReadFile(templateFile)
 		if err == nil {
-			err = ioutil.WriteFile(configFile, data, 0666)
+			err = os.WriteFile(configFile, data, 0666)
 			if err != nil {
 				return errors.New("create config file failed: " + err.Error())
 			}
@@ -189,7 +194,7 @@ https:
   cert: ""
   key: ""
 `
-			err = ioutil.WriteFile(configFile, []byte(templateYAML), 0666)
+			err = os.WriteFile(configFile, []byte(templateYAML), 0666)
 			if err != nil {
 				return errors.New("create config file failed: " + err.Error())
 			}
@@ -201,6 +206,44 @@ https:
 	return nil
 }
 
+// 添加端口到防火墙
+func (this *AdminNode) addPortsToFirewall() {
+	var configFile = Tea.ConfigFile("server.yaml")
+	data, err := os.ReadFile(configFile)
+	if err != nil {
+		return
+	}
+
+	var config = &TeaGo.ServerConfig{}
+	err = yaml.Unmarshal(data, config)
+	if err != nil {
+		return
+	}
+
+	var ports = []int{}
+	if config.Http.On {
+		for _, listen := range config.Http.Listen {
+			_, portString, _ := net.SplitHostPort(listen)
+			var port = types.Int(portString)
+			if port > 0 && !lists.ContainsInt(ports, port) {
+				ports = append(ports, port)
+			}
+		}
+	}
+
+	if config.Https.On {
+		for _, listen := range config.Https.Listen {
+			_, portString, _ := net.SplitHostPort(listen)
+			var port = types.Int(portString)
+			if port > 0 && !lists.ContainsInt(ports, port) {
+				ports = append(ports, port)
+			}
+		}
+	}
+
+	utils.AddPortsToFirewall(ports)
+}
+
 // 启动API节点
 func (this *AdminNode) startAPINode() {
 	configPath := Tea.Root + "/edge-api/configs/api.yaml"
@@ -219,9 +262,9 @@ func (this *AdminNode) startAPINode() {
 		for _, path := range paths {
 			_, err = os.Stat(path)
 			if err == nil {
-				data, err := ioutil.ReadFile(path)
+				data, err := os.ReadFile(path)
 				if err == nil {
-					err = ioutil.WriteFile(configPath, data, 0666)
+					err = os.WriteFile(configPath, data, 0666)
 					if err == nil {
 						logs.Println("[NODE]recover 'edge-api/configs/api.yaml' from '" + path + "'")
 						canStart = true
@@ -245,9 +288,9 @@ func (this *AdminNode) startAPINode() {
 		for _, path := range paths {
 			_, err = os.Stat(path)
 			if err == nil {
-				data, err := ioutil.ReadFile(path)
+				data, err := os.ReadFile(path)
 				if err == nil {
-					err = ioutil.WriteFile(dbPath, data, 0666)
+					err = os.WriteFile(dbPath, data, 0666)
 					if err == nil {
 						logs.Println("[NODE]recover 'edge-api/configs/db.yaml' from '" + path + "'")
 						break
@@ -272,12 +315,12 @@ func (this *AdminNode) startAPINode() {
 // 生成Secret
 func (this *AdminNode) genSecret() string {
 	tmpFile := os.TempDir() + "/edge-admin-secret.tmp"
-	data, err := ioutil.ReadFile(tmpFile)
+	data, err := os.ReadFile(tmpFile)
 	if err == nil && len(data) == 32 {
 		return string(data)
 	}
 	secret := rands.String(32)
-	_ = ioutil.WriteFile(tmpFile, []byte(secret), 0666)
+	_ = os.WriteFile(tmpFile, []byte(secret), 0666)
 	return secret
 }
 
@@ -338,6 +381,12 @@ func (this *AdminNode) listenSock() error {
 						"path":    exePath,
 					},
 				})
+			case "dev": // 切换到dev
+				Tea.Env = Tea.EnvDev
+				_ = cmd.ReplyOk()
+			case "prod": // 切换到prod
+				Tea.Env = Tea.EnvProd
+				_ = cmd.ReplyOk()
 			}
 		})
 

internal/rpc/rpc_client.go

@@ -11,6 +11,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/rands"
 	"google.golang.org/grpc"
@@ -19,7 +20,9 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/encoding/gzip"
 	"google.golang.org/grpc/metadata"
+	"net"
 	"net/url"
+	"strings"
 	"sync"
 	"time"
 )
@@ -38,7 +41,7 @@ func NewRPCClient(apiConfig *configs.APIConfig, isPrimary bool) (*RPCClient, err
 		return nil, errors.New("api config should not be nil")
 	}
 
-	client := &RPCClient{
+	var client = &RPCClient{
 		apiConfig: apiConfig,
 	}
 
@@ -123,6 +126,10 @@ func (this *RPCClient) ServerRPC() pb.ServerServiceClient {
 	return pb.NewServerServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) ServerBandwidthStatRPC() pb.ServerBandwidthStatServiceClient {
+	return pb.NewServerBandwidthStatServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) ServerClientSystemMonthlyStatRPC() pb.ServerClientSystemMonthlyStatServiceClient {
 	return pb.NewServerClientSystemMonthlyStatServiceClient(this.pickConn())
 }
@@ -167,18 +174,10 @@ func (this *RPCClient) APIMethodStatRPC() pb.APIMethodStatServiceClient {
 	return pb.NewAPIMethodStatServiceClient(this.pickConn())
 }
 
-func (this *RPCClient) UserNodeRPC() pb.UserNodeServiceClient {
-	return pb.NewUserNodeServiceClient(this.pickConn())
-}
-
 func (this *RPCClient) DBNodeRPC() pb.DBNodeServiceClient {
 	return pb.NewDBNodeServiceClient(this.pickConn())
 }
 
-func (this *RPCClient) MonitorNodeRPC() pb.MonitorNodeServiceClient {
-	return pb.NewMonitorNodeServiceClient(this.pickConn())
-}
-
 func (this *RPCClient) DBRPC() pb.DBServiceClient {
 	return pb.NewDBServiceClient(this.pickConn())
 }
@@ -219,6 +218,14 @@ func (this *RPCClient) HTTPCachePolicyRPC() pb.HTTPCachePolicyServiceClient {
 	return pb.NewHTTPCachePolicyServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) HTTPCacheTaskRPC() pb.HTTPCacheTaskServiceClient {
+	return pb.NewHTTPCacheTaskServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) HTTPCacheTaskKeyRPC() pb.HTTPCacheTaskKeyServiceClient {
+	return pb.NewHTTPCacheTaskKeyServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) HTTPFirewallPolicyRPC() pb.HTTPFirewallPolicyServiceClient {
 	return pb.NewHTTPFirewallPolicyServiceClient(this.pickConn())
 }
@@ -308,22 +315,18 @@ func (this *RPCClient) IPLibraryRPC() pb.IPLibraryServiceClient {
 	return pb.NewIPLibraryServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) IPLibraryFileRPC() pb.IPLibraryFileServiceClient {
+	return pb.NewIPLibraryFileServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) IPLibraryArtifactRPC() pb.IPLibraryArtifactServiceClient {
+	return pb.NewIPLibraryArtifactServiceClient(this.pickConn())
+}
+
 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())
 }
@@ -344,6 +347,18 @@ func (this *RPCClient) RegionProvinceRPC() pb.RegionProvinceServiceClient {
 	return pb.NewRegionProvinceServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) RegionCityRPC() pb.RegionCityServiceClient {
+	return pb.NewRegionCityServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) RegionTownRPC() pb.RegionTownServiceClient {
+	return pb.NewRegionTownServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) RegionProviderRPC() pb.RegionProviderServiceClient {
+	return pb.NewRegionProviderServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) LogRPC() pb.LogServiceClient {
 	return pb.NewLogServiceClient(this.pickConn())
 }
@@ -408,6 +423,10 @@ func (this *RPCClient) UserAccessKeyRPC() pb.UserAccessKeyServiceClient {
 	return pb.NewUserAccessKeyServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) UserIdentityRPC() pb.UserIdentityServiceClient {
+	return pb.NewUserIdentityServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) LoginRPC() pb.LoginServiceClient {
 	return pb.NewLoginServiceClient(this.pickConn())
 }
@@ -428,42 +447,6 @@ func (this *RPCClient) LatestItemRPC() pb.LatestItemServiceClient {
 	return pb.NewLatestItemServiceClient(this.pickConn())
 }
 
-func (this *RPCClient) NSClusterRPC() pb.NSClusterServiceClient {
-	return pb.NewNSClusterServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSNodeRPC() pb.NSNodeServiceClient {
-	return pb.NewNSNodeServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSDomainRPC() pb.NSDomainServiceClient {
-	return pb.NewNSDomainServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSRecordRPC() pb.NSRecordServiceClient {
-	return pb.NewNSRecordServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSKeyRPC() pb.NSKeyServiceClient {
-	return pb.NewNSKeyServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSRouteRPC() pb.NSRouteServiceClient {
-	return pb.NewNSRouteServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSAccessLogRPC() pb.NSAccessLogServiceClient {
-	return pb.NewNSAccessLogServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSRPC() pb.NSServiceClient {
-	return pb.NewNSServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) NSQuestionOptionRPC() pb.NSQuestionOptionServiceClient {
-	return pb.NewNSQuestionOptionServiceClient(this.pickConn())
-}
-
 func (this *RPCClient) MetricItemRPC() pb.MetricItemServiceClient {
 	return pb.NewMetricItemServiceClient(this.pickConn())
 }
@@ -484,6 +467,10 @@ func (this *RPCClient) ServerStatBoardRPC() pb.ServerStatBoardServiceClient {
 	return pb.NewServerStatBoardServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) ServerDomainHourlyStatRPC() pb.ServerDomainHourlyStatServiceClient {
+	return pb.NewServerDomainHourlyStatServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) ServerStatBoardChartRPC() pb.ServerStatBoardChartServiceClient {
 	return pb.NewServerStatBoardChartServiceClient(this.pickConn())
 }
@@ -496,10 +483,14 @@ func (this *RPCClient) UserPlanRPC() pb.UserPlanServiceClient {
 	return pb.NewUserPlanServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) TrafficDailyStatRPC() pb.TrafficDailyStatServiceClient {
+	return pb.NewTrafficDailyStatServiceClient(this.pickConn())
+}
+
 // Context 构造Admin上下文
 func (this *RPCClient) Context(adminId int64) context.Context {
-	ctx := context.Background()
-	m := maps.Map{
+	var ctx = context.Background()
+	var m = maps.Map{
 		"timestamp": time.Now().Unix(),
 		"type":      "admin",
 		"userId":    adminId,
@@ -514,15 +505,15 @@ func (this *RPCClient) Context(adminId int64) context.Context {
 		utils.PrintError(err)
 		return context.Background()
 	}
-	token := base64.StdEncoding.EncodeToString(data)
+	var token = base64.StdEncoding.EncodeToString(data)
 	ctx = metadata.AppendToOutgoingContext(ctx, "nodeId", this.apiConfig.NodeId, "token", token)
 	return ctx
 }
 
 // APIContext 构造API上下文
 func (this *RPCClient) APIContext(apiNodeId int64) context.Context {
-	ctx := context.Background()
-	m := maps.Map{
+	var ctx = context.Background()
+	var m = maps.Map{
 		"timestamp": time.Now().Unix(),
 		"type":      "api",
 		"userId":    apiNodeId,
@@ -537,7 +528,7 @@ func (this *RPCClient) APIContext(apiNodeId int64) context.Context {
 		utils.PrintError(err)
 		return context.Background()
 	}
-	token := base64.StdEncoding.EncodeToString(data)
+	var token = base64.StdEncoding.EncodeToString(data)
 	ctx = metadata.AppendToOutgoingContext(ctx, "nodeId", this.apiConfig.NodeId, "token", token)
 	return ctx
 }
@@ -554,20 +545,39 @@ func (this *RPCClient) UpdateConfig(config *configs.APIConfig) error {
 
 // 初始化
 func (this *RPCClient) init() error {
+	// 当前的IP地址
+	var localIPAddrs = this.localIPAddrs()
+
 	// 重新连接
-	conns := []*grpc.ClientConn{}
+	var conns = []*grpc.ClientConn{}
 	for _, endpoint := range this.apiConfig.RPC.Endpoints {
 		u, err := url.Parse(endpoint)
 		if err != nil {
 			return errors.New("parse endpoint failed: " + err.Error())
 		}
+
+		var apiHost = u.Host
+
+		// 如果本机，则将地址修改为回路地址
+		if lists.ContainsString(localIPAddrs, u.Hostname()) {
+			if strings.Contains(apiHost, "[") { // IPv6 [host]:port
+				apiHost = "[::1]"
+			} else {
+				apiHost = "127.0.0.1"
+			}
+			var port = u.Port()
+			if len(port) > 0 {
+				apiHost += ":" + port
+			}
+		}
+
 		var conn *grpc.ClientConn
 		var callOptions = grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(128*1024*1024),
 			grpc.UseCompressor(gzip.Name))
 		if u.Scheme == "http" {
-			conn, err = grpc.Dial(u.Host, grpc.WithTransportCredentials(insecure.NewCredentials()), callOptions)
+			conn, err = grpc.Dial(apiHost, grpc.WithTransportCredentials(insecure.NewCredentials()), callOptions)
 		} else if u.Scheme == "https" {
-			conn, err = grpc.Dial(u.Host, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{
+			conn, err = grpc.Dial(apiHost, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{
 				InsecureSkipVerify: true,
 			})), callOptions)
 		} else {
@@ -594,7 +604,7 @@ func (this *RPCClient) pickConn() *grpc.ClientConn {
 
 	// 检查连接状态
 	if len(this.conns) > 0 {
-		availableConns := []*grpc.ClientConn{}
+		var availableConns = []*grpc.ClientConn{}
 		for _, state := range []connectivity.State{connectivity.Ready, connectivity.Idle, connectivity.Connecting} {
 			for _, conn := range this.conns {
 				if conn.GetState() == state {
@@ -646,3 +656,18 @@ func (this *RPCClient) Close() error {
 
 	return lastErr
 }
+
+func (this *RPCClient) localIPAddrs() []string {
+	localInterfaceAddrs, err := net.InterfaceAddrs()
+	var localIPAddrs = []string{}
+	if err == nil {
+		for _, addr := range localInterfaceAddrs {
+			var addrString = addr.String()
+			var index = strings.Index(addrString, "/")
+			if index > 0 {
+				localIPAddrs = append(localIPAddrs, addrString[:index])
+			}
+		}
+	}
+	return localIPAddrs
+}

internal/rpc/rpc_client_test.go

@@ -35,7 +35,8 @@ func TestRPCClient_NodeRPC(t *testing.T) {
 func TestRPC_Dial_HTTP(t *testing.T) {
 	client, err := NewRPCClient(&configs.APIConfig{
 		RPC: struct {
-			Endpoints []string `yaml:"endpoints"`
+			Endpoints     []string `yaml:"endpoints"`
+			DisableUpdate bool     `yaml:"disableUpdate"`
 		}{
 			Endpoints: []string{"http://127.0.0.1:8004"},
 		},
@@ -56,7 +57,8 @@ func TestRPC_Dial_HTTP(t *testing.T) {
 func TestRPC_Dial_HTTP_2(t *testing.T) {
 	client, err := NewRPCClient(&configs.APIConfig{
 		RPC: struct {
-			Endpoints []string `yaml:"endpoints"`
+			Endpoints     []string `yaml:"endpoints"`
+			DisableUpdate bool     `yaml:"disableUpdate"`
 		}{
 			Endpoints: []string{"https://127.0.0.1:8003"},
 		},
@@ -77,7 +79,8 @@ func TestRPC_Dial_HTTP_2(t *testing.T) {
 func TestRPC_Dial_HTTPS(t *testing.T) {
 	client, err := NewRPCClient(&configs.APIConfig{
 		RPC: struct {
-			Endpoints []string `yaml:"endpoints"`
+			Endpoints     []string `yaml:"endpoints"`
+			DisableUpdate bool     `yaml:"disableUpdate"`
 		}{
 			Endpoints: []string{"https://127.0.0.1:8004"},
 		},
@@ -94,3 +97,53 @@ func TestRPC_Dial_HTTPS(t *testing.T) {
 	}
 	t.Log(resp.Node)
 }
+
+func BenchmarkNewRPCClient(b *testing.B) {
+	config, err := configs.LoadAPIConfig()
+	if err != nil {
+		b.Fatal(err)
+	}
+	rpc, err := NewRPCClient(config, true)
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		resp, err := rpc.AdminRPC().LoginAdmin(rpc.Context(0), &pb.LoginAdminRequest{
+			Username: "admin",
+			Password: stringutil.Md5("123456"),
+		})
+		if err != nil {
+			b.Fatal(err)
+		}
+		_ = resp
+	}
+}
+
+func BenchmarkNewRPCClient_2(b *testing.B) {
+	config, err := configs.LoadAPIConfig()
+	if err != nil {
+		b.Fatal(err)
+	}
+	rpc, err := NewRPCClient(config, true)
+	if err != nil {
+		b.Fatal(err)
+	}
+
+	var conn = rpc.AdminRPC()
+
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		resp, err := conn.LoginAdmin(rpc.Context(0), &pb.LoginAdminRequest{
+			Username: "admin",
+			Password: stringutil.Md5("123456"),
+		})
+		if err != nil {
+			b.Fatal(err)
+		}
+		_ = resp
+	}
+}

internal/tasks/task_check_updates.go

@@ -14,7 +14,7 @@ import (
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
 	stringutil "github.com/iwind/TeaGo/utils/string"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"runtime"
 	"strings"
@@ -95,7 +95,7 @@ func (this *CheckUpdatesTask) Loop() error {
 	defer func() {
 		_ = resp.Body.Close()
 	}()
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return errors.New("read api failed: " + err.Error())
 	}

internal/tasks/task_sync_api_nodes.go

@@ -14,6 +14,7 @@ import (
 	"github.com/iwind/TeaGo/logs"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 	"net/url"
 	"sort"
 	"strings"
@@ -58,6 +59,16 @@ func (this *SyncAPINodesTask) Loop() error {
 		return nil
 	}
 
+	config, err := configs.LoadAPIConfig()
+	if err != nil {
+		return err
+	}
+
+	// 是否禁止自动升级
+	if config.RPC.DisableUpdate {
+		return nil
+	}
+
 	// 获取所有可用的节点
 	rpcClient, err := rpc.SharedRPC()
 	if err != nil {
@@ -68,7 +79,7 @@ func (this *SyncAPINodesTask) Loop() error {
 		return err
 	}
 
-	newEndpoints := []string{}
+	var newEndpoints = []string{}
 	for _, node := range resp.ApiNodes {
 		if !node.IsOn {
 			continue
@@ -77,10 +88,6 @@ func (this *SyncAPINodesTask) Loop() error {
 	}
 
 	// 和现有的对比
-	config, err := configs.LoadAPIConfig()
-	if err != nil {
-		return err
-	}
 	if this.isSame(newEndpoints, config.RPC.Endpoints) {
 		return nil
 	}
@@ -137,8 +144,9 @@ func (this *SyncAPINodesTask) testEndpoints(endpoints []string) bool {
 				cancel()
 			}()
 			var conn *grpc.ClientConn
+
 			if u.Scheme == "http" {
-				conn, err = grpc.DialContext(ctx, u.Host, grpc.WithInsecure(), grpc.WithBlock())
+				conn, err = grpc.DialContext(ctx, u.Host, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock())
 			} else if u.Scheme == "https" {
 				conn, err = grpc.DialContext(ctx, u.Host, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{
 					InsecureSkipVerify: true,

internal/utils/email.go

@@ -0,0 +1,12 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package utils
+
+import "regexp"
+
+var emailReg = regexp.MustCompile(`(?i)^[a-z\d]+([._+-]*[a-z\d]+)*@([a-z\d]+[a-z\d-]*[a-z\d]+\.)+[a-z\d]+$`)
+
+// ValidateEmail 校验电子邮箱格式
+func ValidateEmail(email string) bool {
+	return emailReg.MatchString(email)
+}

internal/utils/email_test.go

@@ -0,0 +1,22 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package utils_test
+
+import (
+	"github.com/TeaOSLab/EdgeAPI/internal/utils"
+	"github.com/iwind/TeaGo/assert"
+	"testing"
+)
+
+func TestValidateEmail(t *testing.T) {
+	var a = assert.NewAssertion(t)
+	a.IsTrue(utils.ValidateEmail("aaaa@gmail.com"))
+	a.IsTrue(utils.ValidateEmail("a.b@gmail.com"))
+	a.IsTrue(utils.ValidateEmail("a.b.c.d@gmail.com"))
+	a.IsTrue(utils.ValidateEmail("aaaa@gmail.com.cn"))
+	a.IsTrue(utils.ValidateEmail("hello.world.123@gmail.123.com"))
+	a.IsTrue(utils.ValidateEmail("10000@qq.com"))
+	a.IsFalse(utils.ValidateEmail("aaaa.@gmail.com"))
+	a.IsFalse(utils.ValidateEmail("aaaa@gmail"))
+	a.IsFalse(utils.ValidateEmail("aaaa@123"))
+}

internal/utils/firewall.go

@@ -0,0 +1,28 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package utils
+
+import (
+	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/types"
+	"os/exec"
+	"runtime"
+)
+
+func AddPortsToFirewall(ports []int) {
+	for _, port := range ports {
+		// Linux
+		if runtime.GOOS == "linux" {
+			// firewalld
+			firewallCmd, _ := exec.LookPath("firewall-cmd")
+			if len(firewallCmd) > 0 {
+				err := exec.Command(firewallCmd, "--add-port="+types.String(port)+"/tcp").Run()
+				if err == nil {
+					logs.Println("ADMIN_NODE", "add port '"+types.String(port)+"' to firewalld")
+
+					_ = exec.Command(firewallCmd, "--add-port="+types.String(port)+"/tcp", "--permanent").Run()
+				}
+			}
+		}
+	}
+}

internal/utils/ip_utils.go

@@ -134,3 +134,23 @@ func NextIP(prevIP net.IP) net.IP {
 	}
 	return ip
 }
+
+// IsLocalIP 判断是否为本地IP
+// ip 是To4()或者To16()的结果
+func IsLocalIP(ip net.IP) bool {
+	if ip == nil {
+		return false
+	}
+
+	if ip[0] == 127 ||
+		ip[0] == 10 ||
+		(ip[0] == 172 && ip[1]&0xf0 == 16) ||
+		(ip[0] == 192 && ip[1] == 168) {
+		return true
+	}
+
+	if ip.String() == "::1" {
+		return true
+	}
+	return false
+}

internal/utils/nodelogutils/utils.go

@@ -1,6 +1,5 @@
 // Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-//go:build community
-// +build community
+//go:build !plus
 
 package nodelogutils
 

internal/utils/numberutils/utils.go

@@ -46,11 +46,31 @@ func FormatCount(count int64) string {
 	if count < 1000 {
 		return types.String(count)
 	}
-	if count < 1000 * 1000 {
+	if count < 1000*1000 {
 		return fmt.Sprintf("%.1fK", float32(count)/1000)
 	}
-	if count < 1000 * 1000 * 1000{
+	if count < 1000*1000*1000 {
 		return fmt.Sprintf("%.1fM", float32(count)/1000/1000)
 	}
 	return fmt.Sprintf("%.1fB", float32(count)/1000/1000/1000)
 }
+
+func FormatFloat(f interface{}, decimal int) string {
+	if f == nil {
+		return ""
+	}
+	switch x := f.(type) {
+	case float32, float64:
+		var s = fmt.Sprintf("%."+types.String(decimal)+"f", x)
+		return s
+	case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64:
+		return types.String(x)
+	case string:
+		return x
+	}
+	return ""
+}
+
+func FormatFloat2(f interface{}) string {
+	return FormatFloat(f, 2)
+}

internal/utils/numberutils/utils_test.go

@@ -1,26 +1,36 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package numberutils
+package numberutils_test
 
-import "testing"
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
+	"testing"
+)
 
 func TestFormatBytes(t *testing.T) {
-	t.Log(FormatBytes(1))
-	t.Log(FormatBytes(1000))
-	t.Log(FormatBytes(1_000_000))
-	t.Log(FormatBytes(1_000_000_000))
-	t.Log(FormatBytes(1_000_000_000_000))
-	t.Log(FormatBytes(1_000_000_000_000_000))
-	t.Log(FormatBytes(1_000_000_000_000_000_000))
-	t.Log(FormatBytes(9_000_000_000_000_000_000))
+	t.Log(numberutils.FormatBytes(1))
+	t.Log(numberutils.FormatBytes(1000))
+	t.Log(numberutils.FormatBytes(1_000_000))
+	t.Log(numberutils.FormatBytes(1_000_000_000))
+	t.Log(numberutils.FormatBytes(1_000_000_000_000))
+	t.Log(numberutils.FormatBytes(1_000_000_000_000_000))
+	t.Log(numberutils.FormatBytes(1_000_000_000_000_000_000))
+	t.Log(numberutils.FormatBytes(9_000_000_000_000_000_000))
 }
 
 func TestFormatCount(t *testing.T) {
-	t.Log(FormatCount(1))
-	t.Log(FormatCount(1000))
-	t.Log(FormatCount(1500))
-	t.Log(FormatCount(1_000_000))
-	t.Log(FormatCount(1_500_000))
-	t.Log(FormatCount(1_000_000_000))
-	t.Log(FormatCount(1_500_000_000))
-}
+	t.Log(numberutils.FormatCount(1))
+	t.Log(numberutils.FormatCount(1000))
+	t.Log(numberutils.FormatCount(1500))
+	t.Log(numberutils.FormatCount(1_000_000))
+	t.Log(numberutils.FormatCount(1_500_000))
+	t.Log(numberutils.FormatCount(1_000_000_000))
+	t.Log(numberutils.FormatCount(1_500_000_000))
+}
+
+func TestFormatFloat(t *testing.T) {
+	t.Log(numberutils.FormatFloat(1, 2))
+	t.Log(numberutils.FormatFloat(100.23456, 2))
+	t.Log(numberutils.FormatFloat(100.000023, 2))
+	t.Log(numberutils.FormatFloat(100.012, 2))
+}

internal/utils/service_linux.go

@@ -1,4 +1,4 @@
-// +build linux
+//go:build linux
 
 package utils
 
@@ -7,7 +7,6 @@ import (
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/files"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"regexp"
@@ -16,7 +15,7 @@ import (
 var systemdServiceFile = "/etc/systemd/system/edge-admin.service"
 var initServiceFile = "/etc/init.d/" + teaconst.SystemdServiceName
 
-// 安装服务
+// Install 安装服务
 func (this *ServiceManager) Install(exePath string, args []string) error {
 	if os.Getgid() != 0 {
 		return errors.New("only root users can install the service")
@@ -30,7 +29,7 @@ func (this *ServiceManager) Install(exePath string, args []string) error {
 	return this.installSystemdService(systemd, exePath, args)
 }
 
-// 启动服务
+// Start 启动服务
 func (this *ServiceManager) Start() error {
 	if os.Getgid() != 0 {
 		return errors.New("only root users can start the service")
@@ -47,7 +46,7 @@ func (this *ServiceManager) Start() error {
 	return exec.Command("service", teaconst.ProcessName, "start").Start()
 }
 
-// 删除服务
+// Uninstall 删除服务
 func (this *ServiceManager) Uninstall() error {
 	if os.Getgid() != 0 {
 		return errors.New("only root users can uninstall the service")
@@ -83,13 +82,13 @@ func (this *ServiceManager) installInitService(exePath string, args []string) er
 		return errors.New("'scripts/" + shortName + "' file not exists")
 	}
 
-	data, err := ioutil.ReadFile(scriptFile)
+	data, err := os.ReadFile(scriptFile)
 	if err != nil {
 		return err
 	}
 
 	data = regexp.MustCompile("INSTALL_DIR=.+").ReplaceAll(data, []byte("INSTALL_DIR="+Tea.Root))
-	err = ioutil.WriteFile(initServiceFile, data, 0777)
+	err = os.WriteFile(initServiceFile, data, 0777)
 	if err != nil {
 		return err
 	}
@@ -112,7 +111,8 @@ func (this *ServiceManager) installSystemdService(systemd, exePath string, args
 	shortName := teaconst.SystemdServiceName
 	longName := "GoEdge Admin" // TODO 将来可以修改
 
-	desc := `# Provides:          ` + shortName + `
+	desc := `### BEGIN INIT INFO
+# Provides:          ` + shortName + `
 # Required-Start:    $all
 # Required-Stop:
 # Default-Start:     2 3 4 5
@@ -137,7 +137,7 @@ ExecReload=` + exePath + ` reload
 WantedBy=multi-user.target`
 
 	// write file
-	err := ioutil.WriteFile(systemdServiceFile, []byte(desc), 0777)
+	err := os.WriteFile(systemdServiceFile, []byte(desc), 0777)
 	if err != nil {
 		return err
 	}

internal/utils/service_others.go

@@ -1,4 +1,4 @@
-// +build !linux,!windows
+//go:build !linux && !windows
 
 package utils
 

internal/utils/service_windows.go

@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package utils
 

internal/utils/sizes/sizes.go

@@ -0,0 +1,10 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package sizes
+
+const (
+	K int64 = 1024
+	M = 1024 * K
+	G = 1024 * M
+	T = 1024 * G
+)

internal/utils/sizes/sizes_test.go

@@ -0,0 +1,17 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package sizes_test
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/sizes"
+	"github.com/iwind/TeaGo/assert"
+	"testing"
+)
+
+func TestSizes(t *testing.T) {
+	var a = assert.NewAssertion(t)
+	a.IsTrue(sizes.K == 1024)
+	a.IsTrue(sizes.M == 1024*1024)
+	a.IsTrue(sizes.G == 1024*1024*1024)
+	a.IsTrue(sizes.T == 1024*1024*1024*1024)
+}

internal/utils/strings.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 )
 
-// format address
+// FormatAddress format address
 func FormatAddress(addr string) string {
 	if strings.HasSuffix(addr, "unix:") {
 		return addr
@@ -17,7 +17,7 @@ func FormatAddress(addr string) string {
 	return addr
 }
 
-// 分割数字
+// SplitNumbers 分割数字
 func SplitNumbers(numbers string) (result []int64) {
 	if len(numbers) == 0 {
 		return

internal/utils/strings_stream.go

@@ -0,0 +1,67 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package utils
+
+import (
+	"github.com/iwind/TeaGo/lists"
+	"strings"
+)
+
+func FilterNotEmpty(item string) bool {
+	return len(item) > 0
+}
+
+func MapAddPrefixFunc(prefix string) func(item string) string {
+	return func(item string) string {
+		if !strings.HasPrefix(item, prefix) {
+			return prefix + item
+		}
+		return item
+	}
+}
+
+type StringsStream struct {
+	s []string
+}
+
+func NewStringsStream(s []string) *StringsStream {
+	return &StringsStream{s: s}
+}
+
+func (this *StringsStream) Map(f ...func(item string) string) *StringsStream {
+	for index, item := range this.s {
+		for _, f1 := range f {
+			item = f1(item)
+		}
+		this.s[index] = item
+	}
+	return this
+}
+
+func (this *StringsStream) Filter(f ...func(item string) bool) *StringsStream {
+	for _, f1 := range f {
+		var newStrings = []string{}
+		for _, item := range this.s {
+			if f1(item) {
+				newStrings = append(newStrings, item)
+			}
+		}
+		this.s = newStrings
+	}
+	return this
+}
+
+func (this *StringsStream) Unique() *StringsStream {
+	var newStrings = []string{}
+	for _, item := range this.s {
+		if !lists.ContainsString(newStrings, item) {
+			newStrings = append(newStrings, item)
+		}
+	}
+	this.s = newStrings
+	return this
+}
+
+func (this *StringsStream) Result() []string {
+	return this.s
+}

internal/utils/strings_stream_test.go

@@ -0,0 +1,25 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package utils_test
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
+	"strings"
+	"testing"
+)
+
+func TestStringsStream_Filter(t *testing.T) {
+	var stream = utils.NewStringsStream([]string{"a", "b", "1", "2", "", "png", "a"})
+	stream.Filter(func(item string) bool {
+		return len(item) > 0
+	})
+	t.Log(stream.Result())
+	stream.Map(func(item string) string {
+		return "." + item
+	})
+	t.Log(stream.Result())
+	stream.Unique()
+	t.Log(stream.Result())
+	stream.Map(strings.ToUpper, strings.ToLower)
+	t.Log(stream.Result())
+}

internal/utils/upgrade_manager.go

@@ -0,0 +1,292 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package utils
+
+import (
+	"bytes"
+	"crypto/tls"
+	"encoding/json"
+	"errors"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
+	stringutil "github.com/iwind/TeaGo/utils/string"
+	"io"
+	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"time"
+)
+
+type UpgradeFileWriter struct {
+	rawWriter io.Writer
+	written   int64
+}
+
+func NewUpgradeFileWriter(rawWriter io.Writer) *UpgradeFileWriter {
+	return &UpgradeFileWriter{rawWriter: rawWriter}
+}
+
+func (this *UpgradeFileWriter) Write(p []byte) (n int, err error) {
+	n, err = this.rawWriter.Write(p)
+	this.written += int64(n)
+	return
+}
+
+func (this *UpgradeFileWriter) TotalWritten() int64 {
+	return this.written
+}
+
+type UpgradeManager struct {
+	client *http.Client
+
+	component string
+
+	newVersion    string
+	contentLength int64
+	isDownloading bool
+	writer        *UpgradeFileWriter
+	body          io.ReadCloser
+	isCancelled   bool
+}
+
+func NewUpgradeManager(component string) *UpgradeManager {
+	return &UpgradeManager{
+		component: component,
+		client: &http.Client{
+			Transport: &http.Transport{
+				TLSClientConfig: &tls.Config{
+					InsecureSkipVerify: true,
+				},
+			},
+			CheckRedirect: nil,
+			Jar:           nil,
+			Timeout:       30 * time.Minute,
+		},
+	}
+}
+
+func (this *UpgradeManager) Start() error {
+	if this.isDownloading {
+		return errors.New("another process is running")
+	}
+
+	this.isDownloading = true
+
+	defer func() {
+		this.client.CloseIdleConnections()
+		this.isDownloading = false
+	}()
+
+	// 检查unzip
+	unzipExe, _ := exec.LookPath("unzip")
+	if len(unzipExe) == 0 {
+		// TODO install unzip automatically or pack with a static 'unzip' file
+		return errors.New("can not find 'unzip' command")
+	}
+
+	// 检查cp
+	cpExe, _ := exec.LookPath("cp")
+	if len(cpExe) == 0 {
+		return errors.New("can not find 'cp' command")
+	}
+
+	// 检查新版本
+	var downloadURL = ""
+	{
+		var url = teaconst.UpdatesURL
+		var osName = runtime.GOOS
+		if Tea.IsTesting() && osName == "darwin" {
+			osName = "linux"
+		}
+		url = strings.ReplaceAll(url, "${os}", osName)
+		url = strings.ReplaceAll(url, "${arch}", runtime.GOARCH)
+		req, err := http.NewRequest(http.MethodGet, url, nil)
+		if err != nil {
+			return errors.New("create url request failed: " + err.Error())
+		}
+
+		resp, err := this.client.Do(req)
+		if err != nil {
+			return errors.New("read latest version failed: " + err.Error())
+		}
+
+		defer func() {
+			_ = resp.Body.Close()
+		}()
+
+		if resp.StatusCode != http.StatusOK {
+			return errors.New("read latest version failed: invalid response code '" + types.String(resp.StatusCode) + "'")
+		}
+
+		data, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return errors.New("read latest version failed: " + err.Error())
+		}
+
+		var m = maps.Map{}
+		err = json.Unmarshal(data, &m)
+		if err != nil {
+			return errors.New("invalid response data: " + err.Error() + ", origin data: " + string(data))
+		}
+
+		var code = m.GetInt("code")
+		if code != 200 {
+			return errors.New(m.GetString("message"))
+		}
+
+		var dataMap = m.GetMap("data")
+		var downloadHost = dataMap.GetString("host")
+		var versions = dataMap.GetSlice("versions")
+		var downloadPath = ""
+		for _, component := range versions {
+			var componentMap = maps.NewMap(component)
+			if componentMap.Has("version") {
+				if componentMap.GetString("code") == this.component {
+					var version = componentMap.GetString("version")
+					if stringutil.VersionCompare(version, teaconst.Version) > 0 {
+						this.newVersion = version
+						downloadPath = componentMap.GetString("url")
+						break
+					}
+				}
+			}
+		}
+
+		if len(downloadPath) == 0 {
+			return errors.New("no latest version to download")
+		}
+
+		downloadURL = downloadHost + downloadPath
+	}
+
+	{
+		req, err := http.NewRequest(http.MethodGet, downloadURL, nil)
+		if err != nil {
+			return errors.New("create download request failed: " + err.Error())
+		}
+
+		resp, err := this.client.Do(req)
+		if err != nil {
+			return errors.New("download failed: " + downloadURL + ": " + err.Error())
+		}
+
+		defer func() {
+			_ = resp.Body.Close()
+		}()
+
+		if resp.StatusCode != http.StatusOK {
+			return errors.New("download failed: " + downloadURL + ": invalid response code '" + types.String(resp.StatusCode) + "'")
+		}
+
+		this.contentLength = resp.ContentLength
+		this.body = resp.Body
+
+		// download to tmp
+		var tmpDir = os.TempDir()
+		var filename = filepath.Base(downloadURL)
+
+		var destFile = tmpDir + "/" + filename
+		_ = os.Remove(destFile)
+
+		fp, err := os.Create(destFile)
+		if err != nil {
+			return errors.New("create file failed: " + err.Error())
+		}
+
+		defer func() {
+			// 删除安装文件
+			_ = os.Remove(destFile)
+		}()
+
+		this.writer = NewUpgradeFileWriter(fp)
+
+		_, err = io.Copy(this.writer, resp.Body)
+		if err != nil {
+			_ = fp.Close()
+			if this.isCancelled {
+				return nil
+			}
+			return errors.New("download failed: " + err.Error())
+		}
+
+		_ = fp.Close()
+
+		// unzip
+		var unzipDir = tmpDir + "/edge-" + this.component + "-tmp"
+		stat, err := os.Stat(unzipDir)
+		if err == nil && stat.IsDir() {
+			err = os.RemoveAll(unzipDir)
+			if err != nil {
+				return errors.New("remove old dir '" + unzipDir + "' failed: " + err.Error())
+			}
+		}
+		var unzipCmd = exec.Command(unzipExe, "-q", "-o", destFile, "-d", unzipDir)
+		var unzipStderr = &bytes.Buffer{}
+		unzipCmd.Stderr = unzipStderr
+		err = unzipCmd.Run()
+		if err != nil {
+			return errors.New("unzip installation file failed: " + err.Error() + ": " + unzipStderr.String())
+		}
+
+		installationFiles, err := filepath.Glob(unzipDir + "/edge-" + this.component + "/*")
+		if err != nil {
+			return errors.New("lookup installation files failed: " + err.Error())
+		}
+
+		// cp to target dir
+		currentExe, err := os.Executable()
+		if err != nil {
+			return errors.New("reveal current executable file path failed: " + err.Error())
+		}
+		var targetDir = filepath.Dir(filepath.Dir(currentExe))
+		if !Tea.IsTesting() {
+			for _, installationFile := range installationFiles {
+				var cpCmd = exec.Command(cpExe, "-R", "-f", installationFile, targetDir)
+				var cpStderr = &bytes.Buffer{}
+				cpCmd.Stderr = cpStderr
+				err = cpCmd.Run()
+				if err != nil {
+					return errors.New("overwrite installation files failed: '" + cpCmd.String() + "': " + cpStderr.String())
+				}
+			}
+		}
+
+		// remove tmp
+		_ = os.RemoveAll(unzipDir)
+	}
+
+	return nil
+}
+
+func (this *UpgradeManager) IsDownloading() bool {
+	return this.isDownloading
+}
+
+func (this *UpgradeManager) Progress() float32 {
+	if this.contentLength <= 0 {
+		return -1
+	}
+	if this.writer == nil {
+		return -1
+	}
+	return float32(this.writer.TotalWritten()) / float32(this.contentLength)
+}
+
+func (this *UpgradeManager) NewVersion() string {
+	return this.newVersion
+}
+
+func (this *UpgradeManager) Cancel() error {
+	this.isCancelled = true
+	this.isDownloading = false
+
+	if this.body != nil {
+		_ = this.body.Close()
+	}
+	return nil
+}

internal/utils/upgrade_manager_test.go

@@ -0,0 +1,35 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package utils_test
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
+	"testing"
+	"time"
+)
+
+func TestNewUpgradeManager(t *testing.T) {
+	var manager = utils.NewUpgradeManager("admin")
+
+	var ticker = time.NewTicker(2 * time.Second)
+	go func() {
+		for range ticker.C {
+			if manager.IsDownloading() {
+				t.Logf("%.2f%%", manager.Progress()*100)
+			}
+		}
+	}()
+
+	/**go func() {
+		time.Sleep(5 * time.Second)
+		if manager.IsDownloading() {
+			t.Log("cancel downloading")
+			_ = manager.Cancel()
+		}
+	}()**/
+
+	err := manager.Start()
+	if err != nil {
+		t.Fatal(err)
+	}
+}

internal/web/actions/actionutils/menu.go

@@ -1,6 +1,6 @@
 package actionutils
 
-// 子菜单定义
+// Menu 子菜单定义
 type Menu struct {
 	Id               string      `json:"id"`
 	Name             string      `json:"name"`
@@ -11,14 +11,14 @@ type Menu struct {
 	CountNormalItems int         `json:"countNormalItems"`
 }
 
-// 获取新对象
+// NewMenu 获取新对象
 func NewMenu() *Menu {
 	return &Menu{
 		Items: []*MenuItem{},
 	}
 }
 
-// 添加菜单项
+// Add 添加菜单项
 func (this *Menu) Add(name string, subName string, url string, isActive bool) *MenuItem {
 	item := &MenuItem{
 		Name:     name,
@@ -36,7 +36,7 @@ func (this *Menu) Add(name string, subName string, url string, isActive bool) *M
 	return item
 }
 
-// 添加特殊菜单项，不计数
+// AddSpecial 添加特殊菜单项，不计数
 func (this *Menu) AddSpecial(name string, subName string, url string, isActive bool) *MenuItem {
 	item := this.Add(name, subName, url, isActive)
 	this.CountNormalItems--

internal/web/actions/actionutils/menu_group.go

@@ -5,20 +5,20 @@ import (
 	"github.com/iwind/TeaGo/lists"
 )
 
-// 菜单分组
+// MenuGroup 菜单分组
 type MenuGroup struct {
 	Menus      []*Menu `json:"menus"`
 	AlwaysMenu *Menu   `json:"alwaysMenu"`
 }
 
-// 获取新菜单分组对象
+// NewMenuGroup 获取新菜单分组对象
 func NewMenuGroup() *MenuGroup {
 	return &MenuGroup{
 		Menus: []*Menu{},
 	}
 }
 
-// 查找菜单，如果找不到则自动创建
+// FindMenu 查找菜单，如果找不到则自动创建
 func (this *MenuGroup) FindMenu(menuId string, menuName string) *Menu {
 	for _, m := range this.Menus {
 		if m.Id == menuId {
@@ -33,7 +33,7 @@ func (this *MenuGroup) FindMenu(menuId string, menuName string) *Menu {
 	return menu
 }
 
-// 排序
+// Sort 排序
 func (this *MenuGroup) Sort() {
 	lists.Sort(this.Menus, func(i int, j int) bool {
 		menu1 := this.Menus[i]
@@ -42,7 +42,7 @@ func (this *MenuGroup) Sort() {
 	})
 }
 
-// 设置子菜单
+// SetSubMenu 设置子菜单
 func SetSubMenu(action actions.ActionWrapper, menu *MenuGroup) {
 	action.Object().Data["teaSubMenus"] = menu
 }

internal/web/actions/actionutils/menu_item.go

@@ -1,6 +1,6 @@
 package actionutils
 
-// 菜单项
+// MenuItem 菜单项
 type MenuItem struct {
 	Id         string `json:"id"`
 	Name       string `json:"name"`

internal/web/actions/actionutils/page.go

@@ -111,7 +111,7 @@ func (this *Page) AsHTML() string {
 	}
 
 	// 每页数
-	result = append(result, `<select class="ui dropdown" style="height:34px;padding-top:0;padding-bottom:0;margin-left:1em;color:#666" onchange="ChangePageSize(this.value)">
+	result = append(result, `<select class="ui dropdown" style="padding-top:0;padding-bottom:0;margin-left:1em;color:#666" onchange="ChangePageSize(this.value)">
 	<option value="10">[每页]</option>`+this.renderSizeOption(10)+
 		this.renderSizeOption(20)+
 		this.renderSizeOption(30)+
@@ -127,7 +127,7 @@ func (this *Page) AsHTML() string {
 	return `<div class="page">` + strings.Join(result, "") + `</div>`
 }
 
-// 判断是否为最后一页
+// IsLastPage 判断是否为最后一页
 func (this *Page) IsLastPage() bool {
 	return this.Current == this.Max
 }

internal/web/actions/actionutils/tabbar.go

@@ -5,19 +5,19 @@ import (
 	"github.com/iwind/TeaGo/maps"
 )
 
-// Tabbar定义
+// Tabbar Tabbar定义
 type Tabbar struct {
 	items []maps.Map
 }
 
-// 获取新对象
+// NewTabbar 获取新对象
 func NewTabbar() *Tabbar {
 	return &Tabbar{
 		items: []maps.Map{},
 	}
 }
 
-// 添加菜单项
+// Add 添加菜单项
 func (this *Tabbar) Add(name string, subName string, url string, icon string, active bool) maps.Map {
 	m := maps.Map{
 		"name":    name,
@@ -31,12 +31,12 @@ func (this *Tabbar) Add(name string, subName string, url string, icon string, ac
 	return m
 }
 
-// 取得所有的Items
+// Items 取得所有的Items
 func (this *Tabbar) Items() []maps.Map {
 	return this.items
 }
 
-// 设置子菜单
+// SetTabbar 设置子菜单
 func SetTabbar(action actions.ActionWrapper, tabbar *Tabbar) {
 	action.Object().Data["teaTabbar"] = tabbar.Items()
 }

internal/web/actions/actionutils/utils.go

@@ -1,17 +1,25 @@
 package actionutils
 
 import (
+	"encoding/json"
+	"errors"
 	"fmt"
+	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	rpcerrors "github.com/TeaOSLab/EdgeCommon/pkg/rpc/errors"
+	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/gosock/pkg/gosock"
+	"net"
 	"net/http"
 	"os"
 	"path/filepath"
 	"reflect"
 	"runtime"
 	"strings"
+	"time"
 )
 
 // Fail 提示服务器错误信息
@@ -24,24 +32,108 @@ func Fail(action actions.ActionWrapper, err error) {
 
 // FailPage 提示页面错误信息
 func FailPage(action actions.ActionWrapper, err error) {
-	if err != nil {
-		logs.Println("[" + reflect.TypeOf(action).String() + "]" + findStack(err.Error()))
+	if err == nil {
+		err = errors.New("unknown error")
 	}
-	err = rpcerrors.HumanError(err)
+
+	logs.Println("[" + reflect.TypeOf(action).String() + "]" + findStack(err.Error()))
+
+	// 当前API终端地址
+	var apiEndpoints = []string{}
+	apiConfig, apiConfigErr := configs.LoadAPIConfig()
+	if apiConfigErr == nil && apiConfig != nil {
+		apiEndpoints = append(apiEndpoints, apiConfig.RPC.Endpoints...)
+	}
+
+	var isRPCConnError bool
+	err, isRPCConnError = rpcerrors.HumanError(err, apiEndpoints, Tea.ConfigFile("api.yaml"))
+	var apiNodeIsStarting = false
+	var apiNodeProgress = ""
+	if isRPCConnError {
+		// API节点是否正在启动
+		var sock = gosock.NewTmpSock("edge-api")
+		reply, err := sock.SendTimeout(&gosock.Command{
+			Code:   "starting",
+			Params: nil,
+		}, 1*time.Second)
+		if err == nil && reply != nil {
+			var params = maps.NewMap(reply.Params)
+			if params.GetBool("isStarting") {
+				apiNodeIsStarting = true
+
+				var progressMap = params.GetMap("progress")
+				apiNodeProgress = progressMap.GetString("description")
+			}
+		}
+	}
+
 	action.Object().ResponseWriter.WriteHeader(http.StatusInternalServerError)
 	if len(action.Object().Request.Header.Get("X-Requested-With")) > 0 {
 		action.Object().WriteString(teaconst.ErrServer)
 	} else {
-		action.Object().WriteString(`<!DOCTYPE html>
+		// 本地的一些错误提示
+		var isLocalAPI = false
+		if isRPCConnError {
+			host, _, hostErr := net.SplitHostPort(action.Object().Request.Host)
+			if hostErr == nil {
+				for _, endpoint := range apiEndpoints {
+					if strings.HasPrefix(endpoint, "http://"+host) || strings.HasPrefix(endpoint, "https://"+host) || strings.HasPrefix(endpoint, host) {
+						isLocalAPI = true
+						break
+					}
+				}
+			}
+		}
+
+		var issuesHTML = ""
+		if isLocalAPI {
+			// 读取本地API节点的issues
+			issuesData, issuesErr := os.ReadFile(Tea.Root + "/edge-api/logs/issues.log")
+			if issuesErr == nil {
+				var issueMaps = []maps.Map{}
+				issuesErr = json.Unmarshal(issuesData, &issueMaps)
+				if issuesErr == nil && len(issueMaps) > 0 {
+					var issueMap = issueMaps[0]
+					issuesHTML = "本地API节点启动错误：" + issueMap.GetString("message") + "，处理建议：" + issueMap.GetString("suggestion")
+				}
+			}
+		}
+
+		var html = `<!DOCTYPE html>
 <html>
-	<head></head>
+	<head>
+		<title>有系统错误需要处理</title>
+		<meta charset="UTF-8"/>
+		<style type="text/css">
+		hr { border-top: 1px #ccc solid; }
+		.red { color: red; }
+		</style>
+	</head>
 	<body>
 	<div style="background: #eee; border: 1px #ccc solid; padding: 10px; font-size: 12px; line-height: 1.8">
-	` + teaconst.ErrServer + `
-	<div>可以通过查看 <strong><em>$安装目录/logs/run.log</em></strong> 日志文件查看具体的错误提示。</div>
-	<hr style="border-top: 1px #ccc solid"/>
-	<div style="color: red">Error: ` + err.Error() + `</pre>
-	</div>
+	`
+		if apiNodeIsStarting { // API节点正在启动
+			html += "<div class=\"red\">API节点正在启动，请耐心等待完成"
+
+			if len(apiNodeProgress) > 0 {
+				html += "：" + apiNodeProgress
+			}
+
+			html += "</div>"
+		} else {
+			html += teaconst.ErrServer + `
+		<div>可以通过查看 <strong><em>$安装目录/logs/run.log</em></strong> 日志文件查看具体的错误提示。</div>
+		<hr/>
+		<div class="red">Error: ` + err.Error() + `</div>`
+
+			if len(issuesHTML) > 0 {
+				html += `        <hr/>
+        <div class="red">` + issuesHTML + `</div>`
+			}
+		}
+
+		action.Object().WriteString(html + `
+		</div>
 	</body>
 </html>`)
 	}

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

@@ -27,14 +27,14 @@ func (this *UpdateAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	admin := adminResp.Admin
+	var admin = adminResp.Admin
 	if admin == nil {
 		this.NotFound("admin", params.AdminId)
 		return
 	}
 
 	// OTP认证
-	otpLoginIsOn := false
+	var otpLoginIsOn = false
 	if admin.OtpLogin != nil {
 		otpLoginIsOn = admin.OtpLogin.IsOn
 	}
@@ -45,7 +45,7 @@ func (this *UpdateAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	countAccessKeys := countAccessKeyResp.Count
+	var countAccessKeys = countAccessKeyResp.Count
 
 	this.Data["admin"] = maps.Map{
 		"id":              admin.Id,
@@ -59,7 +59,7 @@ func (this *UpdateAction) RunGet(params struct {
 	}
 
 	// 权限
-	moduleMaps := configloaders.AllModuleMaps()
+	var moduleMaps = configloaders.AllModuleMaps()
 	for _, m := range moduleMaps {
 		code := m.GetString("code")
 		isChecked := false

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

@@ -25,6 +25,7 @@ func (this *DeleteAction) RunPost(params struct {
 	var apiNode = nodeResp.ApiNode
 	if apiNode == nil {
 		this.Success()
+		return
 	}
 	if apiNode.IsOn {
 		countResp, err := this.RPC().APINodeRPC().CountAllEnabledAndOnAPINodes(this.AdminContext(), &pb.CountAllEnabledAndOnAPINodesRequest{})

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

@@ -92,6 +92,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 				"name":            node.Name,
 				"accessAddrs":     node.AccessAddrs,
 				"restAccessAddrs": restAccessAddrs,
+				"isPrimary":       node.IsPrimary,
 				"status": maps.Map{
 					"isActive":     status.IsActive,
 					"updatedAt":    status.UpdatedAt,

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

@@ -5,9 +5,12 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"net"
+	"net/url"
+	"regexp"
+	"strings"
 )
 
-// 添加地址
+// CreateAddrPopupAction 添加地址
 type CreateAddrPopupAction struct {
 	actionutils.ParentAction
 }
@@ -30,12 +33,31 @@ func (this *CreateAddrPopupAction) RunPost(params struct {
 		Field("addr", params.Addr).
 		Require("请输入访问地址")
 
+	// 兼容URL
+	if regexp.MustCompile(`^(?i)(http|https)://`).MatchString(params.Addr) {
+		u, err := url.Parse(params.Addr)
+		if err != nil {
+			this.FailField("addr", "错误的访问地址，不需要添加http://或https://")
+		}
+		params.Addr = u.Host
+	}
+
+	// 自动添加端口
+	if !strings.Contains(params.Addr, ":") {
+		switch params.Protocol {
+		case "http":
+			params.Addr += ":80"
+		case "https":
+			params.Addr += ":443"
+		}
+	}
+
 	host, port, err := net.SplitHostPort(params.Addr)
 	if err != nil {
 		this.FailField("addr", "错误的访问地址")
 	}
 
-	addrConfig := &serverconfigs.NetworkAddressConfig{
+	var addrConfig = &serverconfigs.NetworkAddressConfig{
 		Protocol:  serverconfigs.Protocol(params.Protocol),
 		Host:      host,
 		PortRange: port,

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

@@ -2,11 +2,17 @@ package node
 
 import (
 	"encoding/json"
+	"fmt"
+	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/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
 	"github.com/iwind/TeaGo/maps"
+	stringutil "github.com/iwind/TeaGo/utils/string"
+	"time"
 )
 
 type IndexAction struct {
@@ -25,7 +31,7 @@ func (this *IndexAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	node := nodeResp.ApiNode
+	var node = nodeResp.ApiNode
 	if node == nil {
 		this.NotFound("apiNode", params.NodeId)
 		return
@@ -33,7 +39,7 @@ func (this *IndexAction) RunGet(params struct {
 
 	// 监听地址
 	var hasHTTPS = false
-	httpConfig := &serverconfigs.HTTPProtocolConfig{}
+	var httpConfig = &serverconfigs.HTTPProtocolConfig{}
 	if len(node.HttpJSON) > 0 {
 		err = json.Unmarshal(node.HttpJSON, httpConfig)
 		if err != nil {
@@ -41,7 +47,7 @@ func (this *IndexAction) RunGet(params struct {
 			return
 		}
 	}
-	httpsConfig := &serverconfigs.HTTPSProtocolConfig{}
+	var httpsConfig = &serverconfigs.HTTPSProtocolConfig{}
 	if len(node.HttpsJSON) > 0 {
 		err = json.Unmarshal(node.HttpsJSON, httpsConfig)
 		if err != nil {
@@ -52,21 +58,21 @@ func (this *IndexAction) RunGet(params struct {
 	}
 
 	// 监听地址
-	listens := []*serverconfigs.NetworkAddressConfig{}
+	var listens = []*serverconfigs.NetworkAddressConfig{}
 	listens = append(listens, httpConfig.Listen...)
 	listens = append(listens, httpsConfig.Listen...)
 
 	// 证书信息
-	certs := []*sslconfigs.SSLCertConfig{}
+	var certs = []*sslconfigs.SSLCertConfig{}
 	if httpsConfig.SSLPolicyRef != nil && httpsConfig.SSLPolicyRef.SSLPolicyId > 0 {
 		sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{SslPolicyId: httpsConfig.SSLPolicyRef.SSLPolicyId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		sslPolicyConfigJSON := sslPolicyConfigResp.SslPolicyJSON
+		var sslPolicyConfigJSON = sslPolicyConfigResp.SslPolicyJSON
 		if len(sslPolicyConfigJSON) > 0 {
-			sslPolicy := &sslconfigs.SSLPolicy{}
+			var sslPolicy = &sslconfigs.SSLPolicy{}
 			err = json.Unmarshal(sslPolicyConfigJSON, sslPolicy)
 			if err != nil {
 				this.ErrorPage(err)
@@ -77,7 +83,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 
 	// 访问地址
-	accessAddrs := []*serverconfigs.NetworkAddressConfig{}
+	var accessAddrs = []*serverconfigs.NetworkAddressConfig{}
 	if len(node.AccessAddrsJSON) > 0 {
 		err = json.Unmarshal(node.AccessAddrsJSON, &accessAddrs)
 		if err != nil {
@@ -87,10 +93,10 @@ func (this *IndexAction) RunGet(params struct {
 	}
 
 	// Rest地址
-	restAccessAddrs := []*serverconfigs.NetworkAddressConfig{}
+	var restAccessAddrs = []*serverconfigs.NetworkAddressConfig{}
 	if node.RestIsOn {
 		if len(node.RestHTTPJSON) > 0 {
-			httpConfig := &serverconfigs.HTTPProtocolConfig{}
+			var httpConfig = &serverconfigs.HTTPProtocolConfig{}
 			err = json.Unmarshal(node.RestHTTPJSON, httpConfig)
 			if err != nil {
 				this.ErrorPage(err)
@@ -102,7 +108,7 @@ func (this *IndexAction) RunGet(params struct {
 		}
 
 		if len(node.RestHTTPSJSON) > 0 {
-			httpsConfig := &serverconfigs.HTTPSProtocolConfig{}
+			var httpsConfig = &serverconfigs.HTTPSProtocolConfig{}
 			err = json.Unmarshal(node.RestHTTPSJSON, httpsConfig)
 			if err != nil {
 				this.ErrorPage(err)
@@ -118,6 +124,27 @@ func (this *IndexAction) RunGet(params struct {
 		}
 	}
 
+	// 状态
+	var status = &nodeconfigs.NodeStatus{}
+	var statusIsValid = false
+	this.Data["newVersion"] = ""
+	if len(node.StatusJSON) > 0 {
+		err = json.Unmarshal(node.StatusJSON, &status)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		if status.UpdatedAt >= time.Now().Unix()-300 {
+			statusIsValid = true
+
+			// 是否为新版本
+			if stringutil.VersionCompare(status.BuildVersion, teaconst.APINodeVersion) < 0 {
+				this.Data["newVersion"] = teaconst.APINodeVersion
+			}
+		}
+	}
+
 	this.Data["node"] = maps.Map{
 		"id":              node.Id,
 		"name":            node.Name,
@@ -129,6 +156,27 @@ func (this *IndexAction) RunGet(params struct {
 		"restAccessAddrs": restAccessAddrs,
 		"hasHTTPS":        hasHTTPS,
 		"certs":           certs,
+		"isPrimary":       node.IsPrimary,
+		"statusIsValid":   statusIsValid,
+		"status": maps.Map{
+			"isActive":             status.IsActive,
+			"updatedAt":            status.UpdatedAt,
+			"hostname":             status.Hostname,
+			"cpuUsage":             status.CPUUsage,
+			"cpuUsageText":         fmt.Sprintf("%.2f%%", status.CPUUsage*100),
+			"memUsage":             status.MemoryUsage,
+			"memUsageText":         fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
+			"connectionCount":      status.ConnectionCount,
+			"buildVersion":         status.BuildVersion,
+			"cpuPhysicalCount":     status.CPUPhysicalCount,
+			"cpuLogicalCount":      status.CPULogicalCount,
+			"load1m":               numberutils.FormatFloat2(status.Load1m),
+			"load5m":               numberutils.FormatFloat2(status.Load5m),
+			"load15m":              numberutils.FormatFloat2(status.Load15m),
+			"cacheTotalDiskSize":   numberutils.FormatBytes(status.CacheTotalDiskSize),
+			"cacheTotalMemorySize": numberutils.FormatBytes(status.CacheTotalMemorySize),
+			"exePath":              status.ExePath,
+		},
 	}
 
 	this.Show()

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

@@ -5,7 +5,6 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/maps"
-	"io/ioutil"
 	"os"
 )
 
@@ -46,7 +45,7 @@ func (this *InstallAction) RunGet(params struct {
 		"isNotFound": false,
 	}
 	dbConfigFile := Tea.ConfigFile("api_db.yaml")
-	data, err := ioutil.ReadFile(dbConfigFile)
+	data, err := os.ReadFile(dbConfigFile)
 	dbConfigMap["config"] = string(data)
 	if err != nil {
 		dbConfigMap["error"] = err.Error()

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

@@ -29,13 +29,13 @@ func (this *UpdateAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	node := nodeResp.ApiNode
+	var node = nodeResp.ApiNode
 	if node == nil {
 		this.WriteString("要操作的节点不存在")
 		return
 	}
 
-	httpConfig := &serverconfigs.HTTPProtocolConfig{}
+	var httpConfig = &serverconfigs.HTTPProtocolConfig{}
 	if len(node.HttpJSON) > 0 {
 		err = json.Unmarshal(node.HttpJSON, httpConfig)
 		if err != nil {
@@ -43,7 +43,7 @@ func (this *UpdateAction) RunGet(params struct {
 			return
 		}
 	}
-	httpsConfig := &serverconfigs.HTTPSProtocolConfig{}
+	var httpsConfig = &serverconfigs.HTTPSProtocolConfig{}
 	if len(node.HttpsJSON) > 0 {
 		err = json.Unmarshal(node.HttpsJSON, httpsConfig)
 		if err != nil {
@@ -53,11 +53,11 @@ func (this *UpdateAction) RunGet(params struct {
 	}
 
 	// 监听地址
-	listens := []*serverconfigs.NetworkAddressConfig{}
+	var listens = []*serverconfigs.NetworkAddressConfig{}
 	listens = append(listens, httpConfig.Listen...)
 	listens = append(listens, httpsConfig.Listen...)
 
-	restHTTPConfig := &serverconfigs.HTTPProtocolConfig{}
+	var restHTTPConfig = &serverconfigs.HTTPProtocolConfig{}
 	if len(node.RestHTTPJSON) > 0 {
 		err = json.Unmarshal(node.RestHTTPJSON, restHTTPConfig)
 		if err != nil {
@@ -65,7 +65,7 @@ func (this *UpdateAction) RunGet(params struct {
 			return
 		}
 	}
-	restHTTPSConfig := &serverconfigs.HTTPSProtocolConfig{}
+	var restHTTPSConfig = &serverconfigs.HTTPSProtocolConfig{}
 	if len(node.RestHTTPSJSON) > 0 {
 		err = json.Unmarshal(node.RestHTTPSJSON, restHTTPSConfig)
 		if err != nil {
@@ -75,20 +75,20 @@ func (this *UpdateAction) RunGet(params struct {
 	}
 
 	// 监听地址
-	restListens := []*serverconfigs.NetworkAddressConfig{}
+	var restListens = []*serverconfigs.NetworkAddressConfig{}
 	restListens = append(restListens, restHTTPConfig.Listen...)
 	restListens = append(restListens, restHTTPSConfig.Listen...)
 
 	// 证书信息
-	certs := []*sslconfigs.SSLCertConfig{}
-	sslPolicyId := int64(0)
+	var certs = []*sslconfigs.SSLCertConfig{}
+	var sslPolicyId = int64(0)
 	if httpsConfig.SSLPolicyRef != nil && httpsConfig.SSLPolicyRef.SSLPolicyId > 0 {
 		sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{SslPolicyId: httpsConfig.SSLPolicyRef.SSLPolicyId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		sslPolicyConfigJSON := sslPolicyConfigResp.SslPolicyJSON
+		var sslPolicyConfigJSON = sslPolicyConfigResp.SslPolicyJSON
 		if len(sslPolicyConfigJSON) > 0 {
 			sslPolicyId = httpsConfig.SSLPolicyRef.SSLPolicyId
 
@@ -102,7 +102,7 @@ func (this *UpdateAction) RunGet(params struct {
 		}
 	}
 
-	accessAddrs := []*serverconfigs.NetworkAddressConfig{}
+	var accessAddrs = []*serverconfigs.NetworkAddressConfig{}
 	if len(node.AccessAddrsJSON) > 0 {
 		err = json.Unmarshal(node.AccessAddrsJSON, &accessAddrs)
 		if err != nil {
@@ -122,6 +122,7 @@ func (this *UpdateAction) RunGet(params struct {
 		"certs":       certs,
 		"sslPolicyId": sslPolicyId,
 		"accessAddrs": accessAddrs,
+		"isPrimary":   node.IsPrimary,
 	}
 
 	this.Show()
@@ -139,6 +140,7 @@ func (this *UpdateAction) RunPost(params struct {
 	AccessAddrsJSON []byte
 	Description     string
 	IsOn            bool
+	IsPrimary       bool
 
 	Must *actions.Must
 }) {
@@ -146,11 +148,11 @@ func (this *UpdateAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入API节点名称")
 
-	httpConfig := &serverconfigs.HTTPProtocolConfig{}
-	httpsConfig := &serverconfigs.HTTPSProtocolConfig{}
+	var httpConfig = &serverconfigs.HTTPProtocolConfig{}
+	var httpsConfig = &serverconfigs.HTTPSProtocolConfig{}
 
 	// 监听地址
-	listens := []*serverconfigs.NetworkAddressConfig{}
+	var listens = []*serverconfigs.NetworkAddressConfig{}
 	err := json.Unmarshal(params.ListensJSON, &listens)
 	if err != nil {
 		this.ErrorPage(err)
@@ -170,8 +172,8 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	// Rest监听地址
-	restHTTPConfig := &serverconfigs.HTTPProtocolConfig{}
-	restHTTPSConfig := &serverconfigs.HTTPSProtocolConfig{}
+	var restHTTPConfig = &serverconfigs.HTTPProtocolConfig{}
+	var restHTTPSConfig = &serverconfigs.HTTPSProtocolConfig{}
 	if params.RestIsOn {
 		restListens := []*serverconfigs.NetworkAddressConfig{}
 		err = json.Unmarshal(params.RestListensJSON, &restListens)
@@ -191,7 +193,7 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	// 证书
-	certIds := []int64{}
+	var certIds = []int64{}
 	if len(params.CertIdsJSON) > 0 {
 		err = json.Unmarshal(params.CertIdsJSON, &certIds)
 		if err != nil {
@@ -203,7 +205,7 @@ func (this *UpdateAction) RunPost(params struct {
 		this.Fail("请添加至少一个证书")
 	}
 
-	certRefs := []*sslconfigs.SSLCertRef{}
+	var certRefs = []*sslconfigs.SSLCertRef{}
 	for _, certId := range certIds {
 		certRefs = append(certRefs, &sslconfigs.SSLCertRef{
 			IsOn:   true,
@@ -217,7 +219,7 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	// 创建策略
-	sslPolicyId := params.SslPolicyId
+	var sslPolicyId = params.SslPolicyId
 	if sslPolicyId == 0 {
 		if len(certIds) > 0 {
 			sslPolicyCreateResp, err := this.RPC().SSLPolicyRPC().CreateSSLPolicy(this.AdminContext(), &pb.CreateSSLPolicyRequest{
@@ -249,7 +251,7 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	// 访问地址
-	accessAddrs := []*serverconfigs.NetworkAddressConfig{}
+	var accessAddrs = []*serverconfigs.NetworkAddressConfig{}
 	err = json.Unmarshal(params.AccessAddrsJSON, &accessAddrs)
 	if err != nil {
 		this.ErrorPage(err)
@@ -291,6 +293,7 @@ func (this *UpdateAction) RunPost(params struct {
 		RestHTTPSJSON:   restHTTPSJSON,
 		AccessAddrsJSON: params.AccessAddrsJSON,
 		IsOn:            params.IsOn,
+		IsPrimary:       params.IsPrimary,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -5,6 +5,9 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"net"
+	"net/url"
+	"regexp"
+	"strings"
 )
 
 type UpdateAddrPopupAction struct {
@@ -27,6 +30,26 @@ func (this *UpdateAddrPopupAction) RunPost(params struct {
 	params.Must.
 		Field("addr", params.Addr).
 		Require("请输入访问地址")
+
+	// 兼容URL
+	if regexp.MustCompile(`^(?i)(http|https)://`).MatchString(params.Addr) {
+		u, err := url.Parse(params.Addr)
+		if err != nil {
+			this.FailField("addr", "错误的访问地址，不需要添加http://或https://")
+		}
+		params.Addr = u.Host
+	}
+
+	// 自动添加端口
+	if !strings.Contains(params.Addr, ":") {
+		switch params.Protocol {
+		case "http":
+			params.Addr += ":80"
+		case "https":
+			params.Addr += ":443"
+		}
+	}
+
 	host, port, err := net.SplitHostPort(params.Addr)
 	if err != nil {
 		this.FailField("addr", "错误的访问地址")

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

@@ -5,11 +5,14 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils"
 	"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"
+	"net"
+	"regexp"
 	"strconv"
 	"strings"
 )
@@ -27,7 +30,7 @@ func (this *CreateNodeAction) Init() {
 func (this *CreateNodeAction) RunGet(params struct {
 	ClusterId int64
 }) {
-	leftMenuItems := []maps.Map{
+	var leftMenuItems = []maps.Map{
 		{
 			"name":     "单个创建",
 			"url":      "/clusters/cluster/createNode?clusterId=" + strconv.FormatInt(params.ClusterId, 10),
@@ -47,7 +50,7 @@ func (this *CreateNodeAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	dnsRouteMaps := []maps.Map{}
+	var dnsRouteMaps = []maps.Map{}
 	this.Data["dnsDomainId"] = 0
 	if clusterDNSResp.Domain != nil {
 		domainId := clusterDNSResp.Domain.Id
@@ -76,8 +79,8 @@ func (this *CreateNodeAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	apiNodes := apiNodesResp.ApiNodes
-	apiEndpoints := []string{}
+	var apiNodes = apiNodesResp.ApiNodes
+	var apiEndpoints = []string{}
 	for _, apiNode := range apiNodes {
 		if !apiNode.IsOn {
 			continue
@@ -86,6 +89,9 @@ func (this *CreateNodeAction) RunGet(params struct {
 	}
 	this.Data["apiEndpoints"] = "\"" + strings.Join(apiEndpoints, "\", \"") + "\""
 
+	// 安装文件下载
+	this.Data["installerFiles"] = clusterutils.ListInstallerFiles()
+
 	this.Show()
 }
 
@@ -118,7 +124,7 @@ func (this *CreateNodeAction) RunPost(params struct {
 	}
 
 	// IP地址
-	ipAddresses := []maps.Map{}
+	var ipAddresses = []maps.Map{}
 	if len(params.IpAddressesJSON) > 0 {
 		err := json.Unmarshal(params.IpAddressesJSON, &ipAddresses)
 		if err != nil {
@@ -127,10 +133,29 @@ func (this *CreateNodeAction) RunPost(params struct {
 		}
 	}
 	if len(ipAddresses) == 0 {
-		this.Fail("请至少输入一个IP地址")
+		// 检查Name中是否包含IP
+		var ipv4Reg = regexp.MustCompile(`\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}`)
+		var ipMatches = ipv4Reg.FindStringSubmatch(params.Name)
+		if len(ipMatches) > 0 {
+			var nodeIP = ipMatches[0]
+			if net.ParseIP(nodeIP) != nil {
+				ipAddresses = []maps.Map{
+					{
+						"ip":        nodeIP,
+						"canAccess": true,
+						"isOn":      true,
+						"isUp":      true,
+					},
+				}
+			}
+		}
+
+		if len(ipAddresses) == 0 {
+			this.Fail("请至少输入一个IP地址")
+		}
 	}
 
-	dnsRouteCodes := []string{}
+	var dnsRouteCodes = []string{}
 	if len(params.DnsRoutesJSON) > 0 {
 		err := json.Unmarshal(params.DnsRoutesJSON, &dnsRouteCodes)
 		if err != nil {
@@ -140,7 +165,7 @@ func (this *CreateNodeAction) RunPost(params struct {
 	}
 
 	// TODO 检查登录授权
-	loginInfo := &pb.NodeLogin{
+	var loginInfo = &pb.NodeLogin{
 		Id:   0,
 		Name: "SSH",
 		Type: "ssh",
@@ -165,7 +190,7 @@ func (this *CreateNodeAction) RunPost(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	nodeId := createResp.NodeId
+	var nodeId = createResp.NodeId
 
 	// IP地址
 	var resultIPAddresses = []string{}

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

@@ -0,0 +1,70 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package cluster
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/types"
+	"io"
+	"net/http"
+	"os"
+	"regexp"
+)
+
+type DownloadInstallerAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DownloadInstallerAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *DownloadInstallerAction) RunGet(params struct {
+	Name string
+}) {
+	if len(params.Name) == 0 {
+		this.ResponseWriter.WriteHeader(http.StatusNotFound)
+		this.WriteString("file not found")
+		return
+	}
+
+	// 检查文件名
+	// 以防止路径穿越等风险
+	if !regexp.MustCompile(`^[a-zA-Z0-9.-]+$`).MatchString(params.Name) {
+		this.ResponseWriter.WriteHeader(http.StatusNotFound)
+		this.WriteString("file not found")
+		return
+	}
+
+	var zipFile = Tea.Root + "/edge-api/deploy/" + params.Name
+	fp, err := os.OpenFile(zipFile, os.O_RDWR, 0444)
+	if err != nil {
+		if os.IsNotExist(err) {
+			this.ResponseWriter.WriteHeader(http.StatusNotFound)
+			this.WriteString("file not found")
+			return
+		}
+
+		this.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+		this.WriteString("file can not be opened")
+
+		return
+	}
+
+	defer func() {
+		_ = fp.Close()
+	}()
+
+	stat, err := fp.Stat()
+	if err != nil {
+		this.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+		this.WriteString("file can not be opened")
+		return
+	}
+
+	this.AddHeader("Content-Disposition", "attachment; filename=\""+params.Name+"\";")
+	this.AddHeader("Content-Type", "application/zip")
+	this.AddHeader("Content-Length", types.String(stat.Size()))
+	_, _ = io.Copy(this.ResponseWriter, fp)
+}

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

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

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

@@ -5,10 +5,10 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/groups"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/settings/cache"
+	ddosProtection "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/settings/ddos-protection"
 	"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"
@@ -35,6 +35,7 @@ func init() {
 			GetPost("/updateNodeSSH", new(UpdateNodeSSHAction)).
 			GetPost("/installManual", new(InstallManualAction)).
 			Post("/suggestLoginPorts", new(SuggestLoginPortsAction)).
+			Get("/downloadInstaller", new(DownloadInstallerAction)).
 
 			// 节点相关
 			Prefix("/clusters/cluster/node").
@@ -54,7 +55,9 @@ func init() {
 			GetPost("/settings/dns", new(dns.IndexAction)).
 			GetPost("/settings/system", new(system.IndexAction)).
 			GetPost("/settings/ssh", new(ssh.IndexAction)).
-			GetPost("/settings/thresholds", new(thresholds.IndexAction)).
+			GetPost("/settings/ssh/test", new(ssh.TestAction)).
+			GetPost("/settings/ddos-protection", new(ddosProtection.IndexAction)).
+			Post("/settings/ddos-protection/status", new(ddosProtection.StatusAction)).
 
 			// 分组相关
 			Prefix("/clusters/cluster/groups").

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

@@ -11,6 +11,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
 	"time"
 )
 
@@ -24,7 +25,8 @@ func (this *DetailAction) Init() {
 }
 
 func (this *DetailAction) RunGet(params struct {
-	NodeId int64
+	NodeId    int64
+	ClusterId int64
 }) {
 	this.Data["nodeId"] = params.NodeId
 
@@ -33,7 +35,7 @@ func (this *DetailAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	node := nodeResp.Node
+	var node = nodeResp.Node
 	if node == nil {
 		this.WriteString("找不到要操作的节点")
 		return
@@ -42,13 +44,13 @@ func (this *DetailAction) RunGet(params struct {
 	// 主集群
 	var clusterMap maps.Map = nil
 	if node.NodeCluster != nil {
-		clusterId := node.NodeCluster.Id
+		var clusterId = node.NodeCluster.Id
 		clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: clusterId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		cluster := clusterResp.NodeCluster
+		var cluster = clusterResp.NodeCluster
 		if cluster != nil {
 			clusterMap = maps.Map{
 				"id":         cluster.Id,
@@ -68,6 +70,14 @@ func (this *DetailAction) RunGet(params struct {
 		})
 	}
 
+	// 当前访问集群的DNS设置
+	clusterDNSInfo, err := this.RPC().NodeClusterRPC().FindEnabledNodeClusterDNS(this.AdminContext(), &pb.FindEnabledNodeClusterDNSRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["dnsIsExcludingLnNode"] = clusterDNSInfo != nil && !clusterDNSInfo.IncludingLnNodes && node.Level > 1
+
 	// IP地址
 	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
 		NodeId: params.NodeId,
@@ -197,7 +207,9 @@ func (this *DetailAction) RunGet(params struct {
 	}
 
 	// 运行状态
-	status := &nodeconfigs.NodeStatus{}
+	var status = &nodeconfigs.NodeStatus{}
+	this.Data["nodeDatetime"] = ""
+	this.Data["nodeTimeDiff"] = 0
 	if len(node.StatusJSON) > 0 {
 		err = json.Unmarshal(node.StatusJSON, &status)
 		if err != nil {
@@ -205,6 +217,19 @@ func (this *DetailAction) RunGet(params struct {
 			return
 		}
 		status.IsActive = status.IsActive && time.Now().Unix()-status.UpdatedAt <= 60 // N秒之内认为活跃
+
+		if status.Timestamp > 0 {
+			this.Data["nodeDatetime"] = timeutil.FormatTime("Y-m-d H:i:s", status.Timestamp)
+			if status.UpdatedAt > 0 {
+				var diff = status.UpdatedAt - status.Timestamp
+				if diff < 0 {
+					diff = -diff
+				}
+				this.Data["nodeTimeDiff"] = diff
+			}
+		} else if status.UpdatedAt > 0 {
+			this.Data["nodeDatetime"] = timeutil.FormatTime("Y-m-d H:i:s", status.UpdatedAt)
+		}
 	}
 
 	// 检查是否有新版本
@@ -270,6 +295,11 @@ func (this *DetailAction) RunGet(params struct {
 		}
 	}
 
+	var lnAddrs = node.LnAddrs
+	if lnAddrs == nil {
+		lnAddrs = []string{}
+	}
+
 	this.Data["node"] = maps.Map{
 		"id":                node.Id,
 		"name":              node.Name,
@@ -285,6 +315,9 @@ func (this *DetailAction) RunGet(params struct {
 		"isOn":              node.IsOn,
 		"records":           recordMaps,
 		"routes":            routeMaps,
+		"level":             node.Level,
+		"levelInfo":         nodeconfigs.FindNodeLevel(int(node.Level)),
+		"lnAddrs":           lnAddrs,
 
 		"status": maps.Map{
 			"isActive":             status.IsActive,
@@ -298,11 +331,12 @@ func (this *DetailAction) RunGet(params struct {
 			"buildVersion":         status.BuildVersion,
 			"cpuPhysicalCount":     status.CPUPhysicalCount,
 			"cpuLogicalCount":      status.CPULogicalCount,
-			"load1m":               fmt.Sprintf("%.2f", status.Load1m),
-			"load5m":               fmt.Sprintf("%.2f", status.Load5m),
-			"load15m":              fmt.Sprintf("%.2f", status.Load15m),
+			"load1m":               numberutils.FormatFloat2(status.Load1m),
+			"load5m":               numberutils.FormatFloat2(status.Load5m),
+			"load15m":              numberutils.FormatFloat2(status.Load15m),
 			"cacheTotalDiskSize":   numberutils.FormatBytes(status.CacheTotalDiskSize),
 			"cacheTotalMemorySize": numberutils.FormatBytes(status.CacheTotalMemorySize),
+			"exePath":              status.ExePath,
 		},
 
 		"group":  groupMap,

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

@@ -1,12 +1,16 @@
 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/clusters/cluster/node/nodeutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"path/filepath"
 	"strings"
 )
 
@@ -32,6 +36,20 @@ func (this *InstallAction) RunGet(params struct {
 		return
 	}
 
+	// 最近运行目录
+	var exeRoot = ""
+	if len(node.StatusJSON) > 0 {
+		var nodeStatus = &nodeconfigs.NodeStatus{}
+		err = json.Unmarshal(node.StatusJSON, nodeStatus)
+		if err == nil {
+			var exePath = nodeStatus.ExePath
+			if len(exePath) > 0 {
+				exeRoot = filepath.Dir(filepath.Dir(exePath))
+			}
+		}
+	}
+	this.Data["exeRoot"] = exeRoot
+
 	// 安装信息
 	if node.InstallStatus != nil {
 		this.Data["installStatus"] = maps.Map{
@@ -70,7 +88,7 @@ func (this *InstallAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	apiNodes := apiNodesResp.ApiNodes
+	var apiNodes = apiNodesResp.ApiNodes
 	apiEndpoints := []string{}
 	for _, apiNode := range apiNodes {
 		if !apiNode.IsOn {
@@ -87,6 +105,10 @@ func (this *InstallAction) RunGet(params struct {
 	nodeMap["secret"] = node.Secret
 	nodeMap["cluster"] = clusterMap
 
+	// 安装文件
+	var installerFiles = clusterutils.ListInstallerFiles()
+	this.Data["installerFiles"] = installerFiles
+
 	this.Show()
 }
 

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

@@ -4,6 +4,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/nodelogutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
@@ -43,7 +44,7 @@ func (this *LogsAction) RunGet(params struct {
 	this.Data["tag"] = params.Tag
 
 	countResp, err := this.RPC().NodeLogRPC().CountNodeLogs(this.AdminContext(), &pb.CountNodeLogsRequest{
-		Role:    "node",
+		Role:    nodeconfigs.NodeRoleNode,
 		NodeId:  params.NodeId,
 		DayFrom: params.DayFrom,
 		DayTo:   params.DayTo,

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

@@ -4,7 +4,6 @@ package nodeutils
 
 import (
 	"errors"
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
@@ -24,6 +23,11 @@ func InitNodeInfo(parentAction *actionutils.ParentAction, nodeId int64) (*pb.Nod
 	}
 	var node = nodeResp.Node
 
+	info, err := parentAction.RPC().NodeRPC().FindEnabledNodeConfigInfo(parentAction.AdminContext(), &pb.FindEnabledNodeConfigInfoRequest{NodeId: nodeId})
+	if err != nil {
+		return nil, err
+	}
+
 	var groupMap maps.Map
 	if node.NodeGroup != nil {
 		groupMap = maps.Map{
@@ -38,6 +42,7 @@ func InitNodeInfo(parentAction *actionutils.ParentAction, nodeId int64) (*pb.Nod
 		"isOn":  node.IsOn,
 		"isUp":  node.IsUp,
 		"group": groupMap,
+		"level": node.Level,
 	}
 	var clusterId int64 = 0
 	if node.NodeCluster != nil {
@@ -60,38 +65,38 @@ func InitNodeInfo(parentAction *actionutils.ParentAction, nodeId int64) (*pb.Nod
 			"name":     "DNS设置",
 			"url":      prefix + "/settings/dns?" + query,
 			"isActive": menuItem == "dns",
-			"isOn":     len(node.DnsRoutes) > 0,
+			"isOn":     info.HasDNSInfo,
 		},
 		{
 			"name":     "缓存设置",
 			"url":      prefix + "/settings/cache?" + query,
 			"isActive": menuItem == "cache",
-			"isOn": len(node.CacheDiskDir) > 0 ||
-				(node.MaxCacheDiskCapacity != nil && node.MaxCacheDiskCapacity.Count > 0) ||
-				(node.MaxCacheMemoryCapacity != nil && node.MaxCacheMemoryCapacity.Count > 0),
+			"isOn":     info.HasCacheInfo,
+		},
+		{
+			"name":     "DDoS防护",
+			"url":      prefix + "/settings/ddos-protection?" + query,
+			"isActive": menuItem == "ddosProtection",
+			"isOn":     info.HasDDoSProtection,
+		},
+		{
+			"name": "-",
+			"url":  "",
 		},
 	}
-	if teaconst.IsPlus {
-		menuItems = append(menuItems, []maps.Map{
-			{
-				"name":     "阈值设置",
-				"url":      prefix + "/settings/thresholds?" + query,
-				"isActive": menuItem == "threshold",
-			},
-		}...)
-	}
+	menuItems = filterMenuItems(menuItems, menuItem, prefix, query, info)
 	menuItems = append(menuItems, []maps.Map{
 		{
 			"name":     "SSH设置",
 			"url":      prefix + "/settings/ssh?" + query,
 			"isActive": menuItem == "ssh",
-			"isOn":     node.NodeLogin != nil,
+			"isOn":     info.HasSSH,
 		},
 		{
 			"name":     "系统设置",
 			"url":      prefix + "/settings/system?" + query,
 			"isActive": menuItem == "system",
-			"isOn":     node.MaxCPU > 0,
+			"isOn":     info.HasSystemSettings,
 		},
 	}...)
 	parentAction.Data["leftMenuItems"] = menuItems

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

@@ -0,0 +1,13 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+//go:build !plus
+
+package nodeutils
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+func filterMenuItems(menuItems []maps.Map, menuItem string, prefix string, query string, info *pb.FindEnabledNodeConfigInfoResponse) []maps.Map {
+	return menuItems
+}

internal/web/actions/default/clusters/cluster/node/settings/ddos-protection/index.go

@@ -0,0 +1,137 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ddosProtection
+
+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/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ddosconfigs"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/types"
+	"net"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "node", "update")
+	this.SecondMenu("ddosProtection")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ClusterId int64
+	NodeId    int64
+}) {
+	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["nodeId"] = params.NodeId
+
+	// 集群设置
+	clusterProtectionResp, err := this.RPC().NodeClusterRPC().FindNodeClusterDDoSProtection(this.AdminContext(), &pb.FindNodeClusterDDoSProtectionRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var clusterDDoSProtectionIsOn = false
+	if len(clusterProtectionResp.DdosProtectionJSON) > 0 {
+		var clusterDDoSProtection = &ddosconfigs.ProtectionConfig{}
+		err = json.Unmarshal(clusterProtectionResp.DdosProtectionJSON, clusterDDoSProtection)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		clusterDDoSProtectionIsOn = clusterDDoSProtection.IsOn()
+	}
+
+	this.Data["clusterDDoSProtectionIsOn"] = clusterDDoSProtectionIsOn
+
+	// 节点设置
+	ddosProtectionResp, err := this.RPC().NodeRPC().FindNodeDDoSProtection(this.AdminContext(), &pb.FindNodeDDoSProtectionRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var ddosProtectionConfig = ddosconfigs.DefaultProtectionConfig()
+	if len(ddosProtectionResp.DdosProtectionJSON) > 0 {
+		err = json.Unmarshal(ddosProtectionResp.DdosProtectionJSON, ddosProtectionConfig)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+	this.Data["config"] = ddosProtectionConfig
+	this.Data["defaultConfigs"] = nodeconfigs.DefaultConfigs
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	NodeId             int64
+	DdosProtectionJSON []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改节点 %d 的DDOS防护设置", params.NodeId)
+
+	var ddosProtectionConfig = &ddosconfigs.ProtectionConfig{}
+	err := json.Unmarshal(params.DdosProtectionJSON, ddosProtectionConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	err = ddosProtectionConfig.Init()
+	if err != nil {
+		this.Fail("配置校验失败：" + err.Error())
+	}
+
+	// 校验参数
+	if ddosProtectionConfig.TCP != nil {
+		var tcpConfig = ddosProtectionConfig.TCP
+		if tcpConfig.MaxConnectionsPerIP > 0 && tcpConfig.MaxConnectionsPerIP < nodeconfigs.DefaultTCPMinConnectionsPerIP {
+			this.FailField("tcpMaxConnectionsPerIP", "TCP: 单IP TCP最大连接数不能小于"+types.String(nodeconfigs.DefaultTCPMinConnectionsPerIP))
+		}
+
+		if tcpConfig.NewConnectionsMinutelyRate > 0 && tcpConfig.NewConnectionsMinutelyRate < nodeconfigs.DefaultTCPNewConnectionsMinMinutelyRate {
+			this.FailField("tcpNewConnectionsMinutelyRate", "TCP: 单IP连接速率不能小于"+types.String(nodeconfigs.DefaultTCPNewConnectionsMinMinutelyRate))
+		}
+
+		if tcpConfig.NewConnectionsSecondlyRate > 0 && tcpConfig.NewConnectionsSecondlyRate < nodeconfigs.DefaultTCPNewConnectionsMinSecondlyRate {
+			this.FailField("tcpNewConnectionsSecondlyRate", "TCP: 单IP连接速率不能小于"+types.String(nodeconfigs.DefaultTCPNewConnectionsMinSecondlyRate))
+		}
+
+		// Port
+		for _, portConfig := range tcpConfig.Ports {
+			if portConfig.Port > 65535 {
+				this.Fail("端口号" + types.String(portConfig.Port) + "不能大于65535")
+			}
+		}
+
+		// IP
+		for _, ipConfig := range tcpConfig.AllowIPList {
+			if net.ParseIP(ipConfig.IP) == nil {
+				this.Fail("白名单IP '" + ipConfig.IP + "' 格式错误")
+			}
+		}
+	}
+
+	_, err = this.RPC().NodeRPC().UpdateNodeDDoSProtection(this.AdminContext(), &pb.UpdateNodeDDoSProtectionRequest{
+		NodeId:             params.NodeId,
+		DdosProtectionJSON: params.DdosProtectionJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/node/settings/ddos-protection/status.go

@@ -0,0 +1,27 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ddosProtection
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs"
+)
+
+type StatusAction struct {
+	actionutils.ParentAction
+}
+
+func (this *StatusAction) RunPost(params struct {
+	NodeId int64
+}) {
+	results, err := nodeutils.SendMessageToNodeIds(this.AdminContext(), []int64{params.NodeId}, messageconfigs.MessageCodeCheckLocalFirewall, &messageconfigs.CheckLocalFirewallMessage{
+		Name: "nftables",
+	}, 10)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["results"] = results
+	this.Success()
+}

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

@@ -10,6 +10,8 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"net"
+	"regexp"
 )
 
 type IndexAction struct {
@@ -30,10 +32,12 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 
+	this.Data["hostIsAutoFilled"] = false
+
 	// 登录信息
 	var loginMap maps.Map = nil
 	if node.NodeLogin != nil {
-		loginParams := maps.Map{}
+		var loginParams = maps.Map{}
 		if len(node.NodeLogin.Params) > 0 {
 			err = json.Unmarshal(node.NodeLogin.Params, &loginParams)
 			if err != nil {
@@ -42,7 +46,7 @@ func (this *IndexAction) RunGet(params struct {
 			}
 		}
 
-		grantMap := maps.Map{}
+		var grantMap = maps.Map{}
 		grantId := loginParams.GetInt64("grantId")
 		if grantId > 0 {
 			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
@@ -70,6 +74,47 @@ func (this *IndexAction) RunGet(params struct {
 		}
 	}
 
+	if loginMap == nil {
+		addressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{NodeId: node.Id})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if len(addressesResp.NodeIPAddresses) > 0 {
+			this.Data["hostIsAutoFilled"] = true
+			loginMap = maps.Map{
+				"id":   0,
+				"name": "",
+				"type": "ssh",
+				"params": maps.Map{
+					"host":    addressesResp.NodeIPAddresses[0].Ip,
+					"port":    22,
+					"grantId": 0,
+				},
+				"grant": nil,
+			}
+		}
+	} else {
+		var loginParams = loginMap.GetMap("params")
+		if len(loginParams.GetString("host")) == 0 {
+			addressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{NodeId: node.Id})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			if len(addressesResp.NodeIPAddresses) > 0 {
+				this.Data["hostIsAutoFilled"] = true
+				loginParams["host"] = addressesResp.NodeIPAddresses[0].Ip
+			}
+		}
+
+		if loginParams.GetInt("port") == 0 {
+			loginParams["port"] = 22
+		}
+
+		loginMap["params"] = loginParams
+	}
+
 	var nodeMap = this.Data["node"].(maps.Map)
 	nodeMap["login"] = loginMap
 
@@ -89,8 +134,13 @@ func (this *IndexAction) RunPost(params struct {
 }) {
 	defer this.CreateLogInfo("修改节点 %d SSH登录信息", params.NodeId)
 
+	// 检查IP地址
+	if regexp.MustCompile(`^\d+\.\d+\.\d+\.\d+$`).MatchString(params.SshHost) && net.ParseIP(params.SshHost) == nil {
+		this.Fail("SSH主机地址 '" + params.SshHost + "' IP格式错误")
+	}
+
 	// TODO 检查登录授权
-	loginInfo := &pb.NodeLogin{
+	var loginInfo = &pb.NodeLogin{
 		Id:   params.LoginId,
 		Name: "SSH",
 		Type: "ssh",

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

@@ -0,0 +1,31 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ssh
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type TestAction struct {
+	actionutils.ParentAction
+}
+
+func (this *TestAction) RunPost(params struct {
+	GrantId int64
+	Host    string
+	Port    int32
+}) {
+	resp, err := this.RPC().NodeGrantRPC().TestNodeGrant(this.AdminContext(), &pb.TestNodeGrantRequest{
+		NodeGrantId: params.GrantId,
+		Host:        params.Host,
+		Port:        params.Port,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["isOk"] = resp.IsOk
+	this.Data["error"] = resp.Error
+	this.Success()
+}

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

@@ -3,8 +3,10 @@
 package system
 
 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/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
@@ -32,6 +34,22 @@ func (this *IndexAction) RunGet(params struct {
 	var nodeMap = this.Data["node"].(maps.Map)
 	nodeMap["maxCPU"] = node.MaxCPU
 
+	// DNS
+	dnsResolverResp, err := this.RPC().NodeRPC().FindNodeDNSResolver(this.AdminContext(), &pb.FindNodeDNSResolverRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var dnsResolverConfig = nodeconfigs.DefaultDNSResolverConfig()
+	if len(dnsResolverResp.DnsResolverJSON) > 0 {
+		err = json.Unmarshal(dnsResolverResp.DnsResolverJSON, dnsResolverConfig)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+	this.Data["dnsResolverConfig"] = dnsResolverConfig
+
 	this.Show()
 }
 
@@ -39,6 +57,8 @@ func (this *IndexAction) RunPost(params struct {
 	NodeId int64
 	MaxCPU int32
 
+	DnsResolverJSON []byte
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
@@ -57,5 +77,26 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}
 
+	var dnsResolverConfig = nodeconfigs.DefaultDNSResolverConfig()
+	err = json.Unmarshal(params.DnsResolverJSON, dnsResolverConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	err = dnsResolverConfig.Init()
+	if err != nil {
+		this.Fail("校验DNS解析配置失败：" + err.Error())
+	}
+
+	_, err = this.RPC().NodeRPC().UpdateNodeDNSResolver(this.AdminContext(), &pb.UpdateNodeDNSResolverRequest{
+		NodeId:          params.NodeId,
+		DnsResolverJSON: params.DnsResolverJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Success()
 }

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

@@ -10,6 +10,8 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
+	"net"
 )
 
 type UpdateAction struct {
@@ -37,7 +39,7 @@ func (this *UpdateAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	node := nodeResp.Node
+	var node = nodeResp.Node
 	if node == nil {
 		this.WriteString("找不到要操作的节点")
 		return
@@ -60,7 +62,7 @@ func (this *UpdateAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	ipAddressMaps := []maps.Map{}
+	var ipAddressMaps = []maps.Map{}
 	for _, addr := range ipAddressesResp.NodeIPAddresses {
 		thresholds, err := ipaddressutils.InitNodeIPAddressThresholds(this.Parent(), addr.Id)
 		if err != nil {
@@ -97,7 +99,7 @@ func (this *UpdateAction) RunGet(params struct {
 		}
 	}
 
-	var m = maps.Map{
+	var nodeMap = maps.Map{
 		"id":          node.Id,
 		"name":        node.Name,
 		"ipAddresses": ipAddressMaps,
@@ -105,15 +107,22 @@ func (this *UpdateAction) RunGet(params struct {
 		"isOn":        node.IsOn,
 		"group":       groupMap,
 		"region":      regionMap,
+		"level":       node.Level,
+	}
+
+	if node.LnAddrs == nil {
+		nodeMap["lnAddrs"] = []string{}
+	} else {
+		nodeMap["lnAddrs"] = node.LnAddrs
 	}
 
 	if node.NodeCluster != nil {
-		m["primaryCluster"] = maps.Map{
+		nodeMap["primaryCluster"] = maps.Map{
 			"id":   node.NodeCluster.Id,
 			"name": node.NodeCluster.Name,
 		}
 	} else {
-		m["primaryCluster"] = nil
+		nodeMap["primaryCluster"] = nil
 	}
 
 	if len(node.SecondaryNodeClusters) > 0 {
@@ -124,12 +133,14 @@ func (this *UpdateAction) RunGet(params struct {
 				"name": cluster.Name,
 			})
 		}
-		m["secondaryClusters"] = secondaryClusterMaps
+		nodeMap["secondaryClusters"] = secondaryClusterMaps
 	} else {
-		m["secondaryClusters"] = []interface{}{}
+		nodeMap["secondaryClusters"] = []interface{}{}
 	}
 
-	this.Data["node"] = m
+	this.Data["node"] = nodeMap
+
+	this.Data["canUpdateLevel"] = this.CanUpdateLevel(2)
 
 	this.Show()
 }
@@ -144,11 +155,13 @@ func (this *UpdateAction) RunPost(params struct {
 	PrimaryClusterId    int64
 	SecondaryClusterIds []byte
 	IsOn                bool
+	Level               int32
+	LnAddrs             []string
 
 	Must *actions.Must
 }) {
 	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d", params.NodeId)
+	defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 基本信息", params.NodeId)
 
 	if params.NodeId <= 0 {
 		this.Fail("要操作的节点不存在")
@@ -173,7 +186,7 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	// IP地址
-	ipAddresses := []maps.Map{}
+	var ipAddresses = []maps.Map{}
 	if len(params.IPAddressesJSON) > 0 {
 		err := json.Unmarshal(params.IPAddressesJSON, &ipAddresses)
 		if err != nil {
@@ -186,6 +199,31 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	// 保存
+	if !this.CanUpdateLevel(params.Level) {
+		this.Fail("没有权限修改节点级别：" + types.String(params.Level))
+	}
+
+	// 检查Ln节点地址
+	var lnAddrs = []string{}
+	if params.Level > 1 {
+		for _, lnAddr := range params.LnAddrs {
+			if len(lnAddr) == 0 {
+				continue
+			}
+
+			// 处理 host:port
+			host, _, err := net.SplitHostPort(lnAddr)
+			if err == nil {
+				lnAddr = host
+			}
+
+			if net.ParseIP(lnAddr) == nil {
+				this.Fail("L2级别访问地址 '" + lnAddr + "' 格式错误，请纠正后再提交")
+			}
+			lnAddrs = append(lnAddrs, lnAddr)
+		}
+	}
+
 	_, err := this.RPC().NodeRPC().UpdateNode(this.AdminContext(), &pb.UpdateNodeRequest{
 		NodeId:                  params.NodeId,
 		NodeGroupId:             params.GroupId,
@@ -194,6 +232,8 @@ func (this *UpdateAction) RunPost(params struct {
 		NodeClusterId:           params.PrimaryClusterId,
 		SecondaryNodeClusterIds: secondaryClusterIds,
 		IsOn:                    params.IsOn,
+		Level:                   params.Level,
+		LnAddrs:                 lnAddrs,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -0,0 +1,8 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+//go:build !plus
+
+package node
+
+func (this *UpdateAction) CanUpdateLevel(level int32) bool {
+	return level <= 1
+}

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

@@ -3,13 +3,14 @@ package cluster
 import (
 	"encoding/json"
 	"fmt"
+	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/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/types"
-	"strconv"
 	"time"
 )
 
@@ -29,17 +30,21 @@ func (this *NodesAction) RunGet(params struct {
 	InstalledState int
 	ActiveState    int
 	Keyword        string
+	Level          int32
 
 	CpuOrder        string
 	MemoryOrder     string
 	TrafficInOrder  string
 	TrafficOutOrder string
+	LoadOrder       string
 }) {
 	this.Data["groupId"] = params.GroupId
 	this.Data["regionId"] = params.RegionId
 	this.Data["installState"] = params.InstalledState
 	this.Data["activeState"] = params.ActiveState
 	this.Data["keyword"] = params.Keyword
+	this.Data["level"] = params.Level
+	this.Data["hasOrder"] = len(params.CpuOrder) > 0 || len(params.MemoryOrder) > 0 || len(params.TrafficInOrder) > 0 || len(params.TrafficOutOrder) > 0 || len(params.LoadOrder) > 0
 
 	// 集群是否已经设置了线路
 	clusterDNSResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeClusterDNS(this.AdminContext(), &pb.FindEnabledNodeClusterDNSRequest{NodeClusterId: params.ClusterId})
@@ -63,6 +68,7 @@ func (this *NodesAction) RunGet(params struct {
 		NodeClusterId: params.ClusterId,
 		NodeGroupId:   params.GroupId,
 		NodeRegionId:  params.RegionId,
+		Level:         params.Level,
 		InstallState:  types.Int32(params.InstalledState),
 		ActiveState:   types.Int32(params.ActiveState),
 		Keyword:       params.Keyword,
@@ -72,7 +78,7 @@ func (this *NodesAction) RunGet(params struct {
 		return
 	}
 
-	page := this.NewPage(countResp.Count)
+	var page = this.NewPage(countResp.Count)
 	this.Data["page"] = page.AsHTML()
 
 	var req = &pb.ListEnabledNodesMatchRequest{
@@ -81,6 +87,7 @@ func (this *NodesAction) RunGet(params struct {
 		NodeClusterId: params.ClusterId,
 		NodeGroupId:   params.GroupId,
 		NodeRegionId:  params.RegionId,
+		Level:         params.Level,
 		InstallState:  types.Int32(params.InstalledState),
 		ActiveState:   types.Int32(params.ActiveState),
 		Keyword:       params.Keyword,
@@ -101,13 +108,17 @@ func (this *NodesAction) RunGet(params struct {
 		req.TrafficOutAsc = true
 	} else if params.TrafficOutOrder == "desc" {
 		req.TrafficOutDesc = true
+	} else if params.LoadOrder == "asc" {
+		req.LoadAsc = true
+	} else if params.LoadOrder == "desc" {
+		req.LoadDesc = true
 	}
 	nodesResp, err := this.RPC().NodeRPC().ListEnabledNodesMatch(this.AdminContext(), req)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	nodeMaps := []maps.Map{}
+	var nodeMaps = []maps.Map{}
 	for _, node := range nodesResp.Nodes {
 		// 状态
 		isSynced := false
@@ -199,6 +210,7 @@ func (this *NodesAction) RunGet(params struct {
 				"memUsageText":    fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
 				"trafficInBytes":  status.TrafficInBytes,
 				"trafficOutBytes": status.TrafficOutBytes,
+				"load1m":          numberutils.FormatFloat2(status.Load1m),
 			},
 			"cluster": maps.Map{
 				"id":   node.NodeCluster.Id,
@@ -210,12 +222,13 @@ func (this *NodesAction) RunGet(params struct {
 			"group":             groupMap,
 			"region":            regionMap,
 			"dnsRouteNames":     dnsRouteNames,
+			"level":             node.Level,
 		})
 	}
 	this.Data["nodes"] = nodeMaps
 
 	// 所有分组
-	groupMaps := []maps.Map{}
+	var groupMaps = []maps.Map{}
 	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithNodeClusterIdRequest{
 		NodeClusterId: params.ClusterId,
 	})
@@ -224,15 +237,18 @@ func (this *NodesAction) RunGet(params struct {
 		return
 	}
 	for _, group := range groupsResp.NodeGroups {
-		countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGroupId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGroupIdRequest{NodeGroupId: group.Id})
+		countNodesInGroupResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
+			NodeClusterId: params.ClusterId,
+			NodeGroupId:   group.Id,
+		})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		countNodes := countResp.Count
+		countNodes := countNodesInGroupResp.Count
 		groupName := group.Name
 		if countNodes > 0 {
-			groupName += "(" + strconv.FormatInt(countNodes, 10) + ")"
+			groupName += "(" + types.String(countNodes) + ")"
 		}
 		groupMaps = append(groupMaps, maps.Map{
 			"id":         group.Id,
@@ -240,15 +256,38 @@ func (this *NodesAction) RunGet(params struct {
 			"countNodes": countNodes,
 		})
 	}
+
+	// 是否有未分组
+	if len(groupMaps) > 0 {
+		countNodesInGroupResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
+			NodeClusterId: params.ClusterId,
+			NodeGroupId:   -1,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		var countUngroupNodes = countNodesInGroupResp.Count
+		if countUngroupNodes > 0 {
+			groupMaps = append([]maps.Map{
+				{
+					"id":         -1,
+					"name":       "[未分组](" + types.String(countUngroupNodes) + ")",
+					"countNodes": countUngroupNodes,
+				},
+			}, groupMaps...)
+		}
+	}
+
 	this.Data["groups"] = groupMaps
 
 	// 所有区域
-	regionsResp, err := this.RPC().NodeRegionRPC().FindAllEnabledAndOnNodeRegions(this.AdminContext(), &pb.FindAllEnabledAndOnNodeRegionsRequest{})
+	regionsResp, err := this.RPC().NodeRegionRPC().FindAllAvailableNodeRegions(this.AdminContext(), &pb.FindAllAvailableNodeRegionsRequest{})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	regionMaps := []maps.Map{}
+	var regionMaps = []maps.Map{}
 	for _, region := range regionsResp.NodeRegions {
 		regionMaps = append(regionMaps, maps.Map{
 			"id":   region.Id,
@@ -257,6 +296,12 @@ func (this *NodesAction) RunGet(params struct {
 	}
 	this.Data["regions"] = regionMaps
 
+	// 级别
+	this.Data["levels"] = []maps.Map{}
+	if teaconst.IsPlus {
+		this.Data["levels"] = nodeconfigs.FindAllNodeLevels()
+	}
+
 	// 记录最近访问
 	_, err = this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{
 		ItemType: "cluster",

internal/web/actions/default/clusters/cluster/settings/ddos-protection/index.go

@@ -0,0 +1,110 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ddosProtection
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ddosconfigs"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/types"
+	"net"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "")
+	this.SecondMenu("ddosProtection")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	this.Data["clusterId"] = params.ClusterId
+
+	protectionResp, err := this.RPC().NodeClusterRPC().FindNodeClusterDDoSProtection(this.AdminContext(), &pb.FindNodeClusterDDoSProtectionRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var ddosProtectionConfig = ddosconfigs.DefaultProtectionConfig()
+	if len(protectionResp.DdosProtectionJSON) > 0 {
+		err = json.Unmarshal(protectionResp.DdosProtectionJSON, ddosProtectionConfig)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+	this.Data["config"] = ddosProtectionConfig
+	this.Data["defaultConfigs"] = nodeconfigs.DefaultConfigs
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	ClusterId          int64
+	DdosProtectionJSON []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改集群 %d 的DDOS防护设置", params.ClusterId)
+
+	var ddosProtectionConfig = &ddosconfigs.ProtectionConfig{}
+	err := json.Unmarshal(params.DdosProtectionJSON, ddosProtectionConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	err = ddosProtectionConfig.Init()
+	if err != nil {
+		this.Fail("配置校验失败：" + err.Error())
+	}
+
+	// 校验参数
+	if ddosProtectionConfig.TCP != nil {
+		var tcpConfig = ddosProtectionConfig.TCP
+		if tcpConfig.MaxConnectionsPerIP > 0 && tcpConfig.MaxConnectionsPerIP < nodeconfigs.DefaultTCPMinConnectionsPerIP {
+			this.FailField("tcpMaxConnectionsPerIP", "TCP: 单IP TCP最大连接数不能小于"+types.String(nodeconfigs.DefaultTCPMinConnectionsPerIP))
+		}
+
+		if tcpConfig.NewConnectionsMinutelyRate > 0 && tcpConfig.NewConnectionsMinutelyRate < nodeconfigs.DefaultTCPNewConnectionsMinMinutelyRate {
+			this.FailField("tcpNewConnectionsMinutelyRate", "TCP: 单IP连接速率不能小于"+types.String(nodeconfigs.DefaultTCPNewConnectionsMinMinutelyRate))
+		}
+
+		if tcpConfig.NewConnectionsSecondlyRate > 0 && tcpConfig.NewConnectionsSecondlyRate < nodeconfigs.DefaultTCPNewConnectionsMinSecondlyRate {
+			this.FailField("tcpNewConnectionsSecondlyRate", "TCP: 单IP连接速率不能小于"+types.String(nodeconfigs.DefaultTCPNewConnectionsMinSecondlyRate))
+		}
+
+		// Port
+		for _, portConfig := range tcpConfig.Ports {
+			if portConfig.Port > 65535 {
+				this.Fail("端口号" + types.String(portConfig.Port) + "不能大于65535")
+			}
+		}
+
+		// IP
+		for _, ipConfig := range tcpConfig.AllowIPList {
+			if net.ParseIP(ipConfig.IP) == nil {
+				this.Fail("白名单IP '" + ipConfig.IP + "' 格式错误")
+			}
+		}
+	}
+
+	_, err = this.RPC().NodeClusterRPC().UpdateNodeClusterDDoSProtection(this.AdminContext(), &pb.UpdateNodeClusterDDoSProtectionRequest{
+		NodeClusterId:      params.ClusterId,
+		DdosProtectionJSON: params.DdosProtectionJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/settings/ddos-protection/status.go

@@ -0,0 +1,71 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ddosProtection
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ddosconfigs"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type StatusAction struct {
+	actionutils.ParentAction
+}
+
+func (this *StatusAction) Init() {
+	this.Nav("", "setting", "")
+	this.SecondMenu("ddosProtection")
+}
+
+func (this *StatusAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	this.Data["clusterId"] = params.ClusterId
+
+	this.Show()
+}
+
+func (this *StatusAction) RunPost(params struct {
+	ClusterId int64
+}) {
+	results, err := nodeutils.SendMessageToCluster(this.AdminContext(), params.ClusterId, messageconfigs.MessageCodeCheckLocalFirewall, &messageconfigs.CheckLocalFirewallMessage{
+		Name: "nftables",
+	}, 10)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var resultMaps = []maps.Map{}
+	for _, result := range results {
+		var resultMap = maps.Map{
+			"isOk":     result.IsOK,
+			"message":  result.Message,
+			"nodeId":   result.NodeId,
+			"nodeName": result.NodeName,
+		}
+
+		nodeResp, err := this.RPC().NodeRPC().FindNodeDDoSProtection(this.AdminContext(), &pb.FindNodeDDoSProtectionRequest{NodeId: result.NodeId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if len(nodeResp.DdosProtectionJSON) > 0 {
+			var ddosProtection = ddosconfigs.DefaultProtectionConfig()
+			err = json.Unmarshal(nodeResp.DdosProtectionJSON, ddosProtection)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			resultMap["isPrior"] = !ddosProtection.IsPriorEmpty()
+		}
+		resultMaps = append(resultMaps, resultMap)
+	}
+
+	this.Data["results"] = resultMaps
+	this.Success()
+}

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

@@ -6,6 +6,7 @@ import (
 	"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"
 )
 
 type IndexAction struct {
@@ -41,10 +42,23 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["dnsName"] = dnsInfoResp.Name
 	this.Data["nodesAutoSync"] = dnsInfoResp.NodesAutoSync
 	this.Data["serversAutoSync"] = dnsInfoResp.ServersAutoSync
+
+	var domainProviderMap = maps.Map{
+		"id":   0,
+		"name": "",
+	}
 	if dnsInfoResp.Domain != nil {
 		this.Data["domainId"] = dnsInfoResp.Domain.Id
 		this.Data["domainName"] = dnsInfoResp.Domain.Name
+
+		if dnsInfoResp.Provider != nil {
+			domainProviderMap = maps.Map{
+				"id":   dnsInfoResp.Provider.Id,
+				"name": dnsInfoResp.Provider.Name,
+			}
+		}
 	}
+	this.Data["domainProvider"] = domainProviderMap
 
 	if len(dnsInfoResp.CnameRecords) == 0 {
 		this.Data["cnameRecords"] = []string{}
@@ -52,6 +66,8 @@ func (this *IndexAction) RunGet(params struct {
 		this.Data["cnameRecords"] = dnsInfoResp.CnameRecords
 	}
 	this.Data["ttl"] = dnsInfoResp.Ttl
+	this.Data["cnameAsDomain"] = dnsInfoResp.CnameAsDomain
+	this.Data["includingLnNodes"] = dnsInfoResp.IncludingLnNodes
 
 	this.Show()
 }
@@ -59,12 +75,16 @@ func (this *IndexAction) RunGet(params struct {
 func (this *IndexAction) RunPost(params struct {
 	ClusterId int64
 
-	DnsDomainId     int64
-	DnsName         string
-	NodesAutoSync   bool
-	ServersAutoSync bool
-	CnameRecords    []string
-	Ttl             int32
+	DnsDomainId      int64
+	DnsName          string
+	NodesAutoSync    bool
+	ServersAutoSync  bool
+	CnameRecords     []string
+	Ttl              int32
+	CnameAsDomain    bool
+	IncludingLnNodes bool
+
+	ConfirmResetDomain bool // 是否确认重置域名
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -72,13 +92,15 @@ func (this *IndexAction) RunPost(params struct {
 	// 创建日志
 	defer this.CreateLog(oplogs.LevelInfo, "修改集群 %d DNS设置", params.ClusterId)
 
-	if params.DnsDomainId <= 0 {
-		this.Fail("请选择集群的主域名")
-	}
+	if !params.ConfirmResetDomain {
+		if params.DnsDomainId <= 0 {
+			this.Fail("请选择集群的主域名")
+		}
 
-	params.Must.
-		Field("dnsName", params.DnsName).
-		Require("请输入DNS子域名")
+		params.Must.
+			Field("dnsName", params.DnsName).
+			Require("请输入DNS子域名")
+	}
 
 	// 检查DNS名称
 	if len(params.DnsName) > 0 {
@@ -101,13 +123,15 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err := this.RPC().NodeClusterRPC().UpdateNodeClusterDNS(this.AdminContext(), &pb.UpdateNodeClusterDNSRequest{
-		NodeClusterId:   params.ClusterId,
-		DnsName:         params.DnsName,
-		DnsDomainId:     params.DnsDomainId,
-		NodesAutoSync:   params.NodesAutoSync,
-		ServersAutoSync: params.ServersAutoSync,
-		CnameRecords:    params.CnameRecords,
-		Ttl:             params.Ttl,
+		NodeClusterId:    params.ClusterId,
+		DnsName:          params.DnsName,
+		DnsDomainId:      params.DnsDomainId,
+		NodesAutoSync:    params.NodesAutoSync,
+		ServersAutoSync:  params.ServersAutoSync,
+		CnameRecords:     params.CnameRecords,
+		Ttl:              params.Ttl,
+		CnameAsDomain:    params.CnameAsDomain,
+		IncludingLnNodes: params.IncludingLnNodes,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/clusters/cluster/settings/dns/randomName.go

@@ -0,0 +1,18 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package dns
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/rands"
+)
+
+type RandomNameAction struct {
+	actionutils.ParentAction
+}
+
+func (this *RandomNameAction) RunPost(params struct{}) {
+	this.Data["name"] = "cluster" + rands.HexString(8)
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go

@@ -0,0 +1,150 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package globalServerConfig
+
+import (
+	"encoding/json"
+	"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/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "")
+	this.SecondMenu("globalServerConfig")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	configResp, err := this.RPC().NodeClusterRPC().FindNodeClusterGlobalServerConfig(this.AdminContext(), &pb.FindNodeClusterGlobalServerConfigRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var configJSON = configResp.GlobalServerConfigJSON
+	var config = serverconfigs.DefaultGlobalServerConfig()
+	if len(configJSON) > 0 {
+		err = json.Unmarshal(configJSON, config)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+	this.Data["config"] = config
+
+	var httpAllDomainMismatchActionContentHTML = ""
+	if config.HTTPAll.DomainMismatchAction != nil {
+		httpAllDomainMismatchActionContentHTML = config.HTTPAll.DomainMismatchAction.Options.GetString("contentHTML")
+	} else {
+		httpAllDomainMismatchActionContentHTML = `<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8"/>
+<title>404 not found</title>
+<style>
+	* { font-family: Roboto, system-ui, sans-serif; }
+h3, p { text-align: center; }
+p { color: grey; }
+</style>
+</head>
+<body>
+<h3>Error: 404 Page Not Found</h3>
+<h3>找不到您要访问的页面。</h3>
+
+<p>原因：找不到当前访问域名对应的网站，请联系网站管理员。</p>
+
+</body>
+</html>`
+	}
+	this.Data["httpAllDomainMismatchActionContentHTML"] = httpAllDomainMismatchActionContentHTML
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	ClusterId int64
+
+	HttpAllMatchDomainStrictly             bool
+	HttpAllDomainMismatchActionContentHTML string
+	HttpAllAllowMismatchDomainsJSON        []byte
+	HttpAllAllowNodeIP                     bool
+	HttpAllDefaultDomain                   string
+
+	LogRecordServerError bool
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改集群 %d 全局配置", params.ClusterId)
+
+	configResp, err := this.RPC().NodeClusterRPC().FindNodeClusterGlobalServerConfig(this.AdminContext(), &pb.FindNodeClusterGlobalServerConfigRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var configJSON = configResp.GlobalServerConfigJSON
+	var config = serverconfigs.DefaultGlobalServerConfig()
+	if len(configJSON) > 0 {
+		err = json.Unmarshal(configJSON, config)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	config.HTTPAll.MatchDomainStrictly = params.HttpAllMatchDomainStrictly
+	config.HTTPAll.DomainMismatchAction = &serverconfigs.DomainMismatchAction{
+		Code: serverconfigs.DomainMismatchActionPage,
+		Options: maps.Map{
+			"statusCode":  404,
+			"contentHTML": params.HttpAllDomainMismatchActionContentHTML,
+		},
+	}
+
+	var allowMismatchDomains = []string{}
+	if len(params.HttpAllAllowMismatchDomainsJSON) > 0 {
+		err = json.Unmarshal(params.HttpAllAllowMismatchDomainsJSON, &allowMismatchDomains)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	config.HTTPAll.AllowMismatchDomains = allowMismatchDomains
+	config.HTTPAll.AllowNodeIP = params.HttpAllAllowNodeIP
+	config.HTTPAll.DefaultDomain = params.HttpAllDefaultDomain
+
+	config.Log.RecordServerError = params.LogRecordServerError
+
+	err = config.Init()
+	if err != nil {
+		this.Fail("配置校验失败：" + err.Error())
+		return
+	}
+
+	configJSON, err = json.Marshal(config)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	_, err = this.RPC().NodeClusterRPC().UpdateNodeClusterGlobalServerConfig(this.AdminContext(), &pb.UpdateNodeClusterGlobalServerConfigRequest{
+		NodeClusterId:          params.ClusterId,
+		GlobalServerConfigJSON: configJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/settings/health/checkDomain.go

@@ -0,0 +1,52 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package health
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"net"
+	"strings"
+)
+
+type CheckDomainAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CheckDomainAction) RunPost(params struct {
+	Host      string
+	ClusterId int64
+}) {
+	this.Data["isOk"] = true // 默认为TRUE
+
+	var host = params.Host
+	if len(host) > 0 &&
+		!strings.Contains(host, "{") /** 包含变量 **/ {
+		h, _, err := net.SplitHostPort(host)
+		if err == nil && len(h) > 0 {
+			host = h
+		}
+
+		// 是否为IP
+		if net.ParseIP(host) != nil {
+			this.Success()
+			return
+		}
+
+		host = strings.ToLower(host)
+		resp, err := this.RPC().ServerRPC().CheckServerNameDuplicationInNodeCluster(this.AdminContext(), &pb.CheckServerNameDuplicationInNodeClusterRequest{
+			NodeClusterId:   params.ClusterId,
+			ServerNames:     []string{host},
+			SupportWildcard: true,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if len(resp.DuplicatedServerNames) == 0 {
+			this.Data["isOk"] = false
+		}
+	}
+
+	this.Success()
+}

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

@@ -1,6 +1,7 @@
 package settings
 
 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"
@@ -65,35 +66,52 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["timeZoneLocation"] = nodeconfigs.FindTimeZoneLocation(cluster.TimeZone)
 
+	// 时钟
+	var clockConfig = nodeconfigs.DefaultClockConfig()
+	if len(cluster.ClockJSON) > 0 {
+		err = json.Unmarshal(cluster.ClockJSON, clockConfig)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if clockConfig == nil {
+			clockConfig = nodeconfigs.DefaultClockConfig()
+		}
+	}
+
 	this.Data["cluster"] = maps.Map{
-		"id":                    cluster.Id,
-		"name":                  cluster.Name,
-		"installDir":            cluster.InstallDir,
-		"timeZone":              cluster.TimeZone,
-		"nodeMaxThreads":        cluster.NodeMaxThreads,
-		"nodeTCPMaxConnections": cluster.NodeTCPMaxConnections,
-		"autoOpenPorts":         cluster.AutoOpenPorts,
+		"id":                  cluster.Id,
+		"name":                cluster.Name,
+		"installDir":          cluster.InstallDir,
+		"timeZone":            cluster.TimeZone,
+		"nodeMaxThreads":      cluster.NodeMaxThreads,
+		"autoOpenPorts":       cluster.AutoOpenPorts,
+		"clock":               clockConfig,
+		"autoRemoteStart":     cluster.AutoRemoteStart,
+		"autoInstallNftables": cluster.AutoInstallNftables,
 	}
 
 	// 默认值
 	this.Data["defaultNodeMaxThreads"] = nodeconfigs.DefaultMaxThreads
 	this.Data["defaultNodeMaxThreadsMin"] = nodeconfigs.DefaultMaxThreadsMin
 	this.Data["defaultNodeMaxThreadsMax"] = nodeconfigs.DefaultMaxThreadsMax
-	this.Data["defaultNodeTCPMaxConnections"] = nodeconfigs.DefaultTCPMaxConnections
 
 	this.Show()
 }
 
 // RunPost 保存设置
 func (this *IndexAction) RunPost(params struct {
-	ClusterId             int64
-	Name                  string
-	GrantId               int64
-	InstallDir            string
-	TimeZone              string
-	NodeMaxThreads        int32
-	NodeTCPMaxConnections int32
-	AutoOpenPorts         bool
+	ClusterId           int64
+	Name                string
+	GrantId             int64
+	InstallDir          string
+	TimeZone            string
+	NodeMaxThreads      int32
+	AutoOpenPorts       bool
+	ClockAutoSync       bool
+	ClockServer         string
+	AutoRemoteStart     bool
+	AutoInstallNftables bool
 
 	Must *actions.Must
 }) {
@@ -111,15 +129,32 @@ func (this *IndexAction) RunPost(params struct {
 			Lte(int64(nodeconfigs.DefaultMaxThreadsMax), "单节点最大线程数最大值不能大于"+types.String(nodeconfigs.DefaultMaxThreadsMax))
 	}
 
-	_, err := this.RPC().NodeClusterRPC().UpdateNodeCluster(this.AdminContext(), &pb.UpdateNodeClusterRequest{
-		NodeClusterId:         params.ClusterId,
-		Name:                  params.Name,
-		NodeGrantId:           params.GrantId,
-		InstallDir:            params.InstallDir,
-		TimeZone:              params.TimeZone,
-		NodeMaxThreads:        params.NodeMaxThreads,
-		NodeTCPMaxConnections: params.NodeTCPMaxConnections,
-		AutoOpenPorts:         params.AutoOpenPorts,
+	var clockConfig = nodeconfigs.DefaultClockConfig()
+	clockConfig.AutoSync = params.ClockAutoSync
+	clockConfig.Server = params.ClockServer
+	clockConfigJSON, err := json.Marshal(clockConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	err = clockConfig.Init()
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	_, err = this.RPC().NodeClusterRPC().UpdateNodeCluster(this.AdminContext(), &pb.UpdateNodeClusterRequest{
+		NodeClusterId:       params.ClusterId,
+		Name:                params.Name,
+		NodeGrantId:         params.GrantId,
+		InstallDir:          params.InstallDir,
+		TimeZone:            params.TimeZone,
+		NodeMaxThreads:      params.NodeMaxThreads,
+		AutoOpenPorts:       params.AutoOpenPorts,
+		ClockJSON:           clockConfigJSON,
+		AutoRemoteStart:     params.AutoRemoteStart,
+		AutoInstallNftables: params.AutoInstallNftables,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -3,15 +3,16 @@ package settings
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/cache"
+	ddosProtection "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/ddos-protection"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/dns"
 	firewallActions "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/firewall-actions"
+	globalServerConfig "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/global-server-config"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/health"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/message"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/metrics"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/services"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/thresholds"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/toa"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/waf"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/webp"
 	clusters "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
@@ -28,6 +29,7 @@ func init() {
 			// 健康检查
 			GetPost("/health", new(health.IndexAction)).
 			GetPost("/health/runPopup", new(health.RunPopupAction)).
+			Post("/health/checkDomain", new(health.CheckDomainAction)).
 
 			// 缓存
 			GetPost("/cache", new(cache.IndexAction)).
@@ -38,12 +40,7 @@ func init() {
 			// DNS
 			Prefix("/clusters/cluster/settings/dns").
 			GetPost("", new(dns.IndexAction)).
-
-			// 消息
-			Prefix("/clusters/cluster/settings/message").
-			GetPost("", new(message.IndexAction)).
-			Get("/selectReceiverPopup", new(message.SelectReceiverPopupAction)).
-			Post("/selectedReceivers", new(message.SelectedReceiversAction)).
+			Post("/randomName", new(dns.RandomNameAction)).
 
 			// TOA
 			Prefix("/clusters/cluster/settings/toa").
@@ -61,19 +58,26 @@ func init() {
 			GetPost("/updatePopup", new(firewallActions.UpdatePopupAction)).
 			Post("/delete", new(firewallActions.DeleteAction)).
 
-			// 阈值
-			Prefix("/clusters/cluster/settings/thresholds").
-			Get("", new(thresholds.IndexAction)).
-			GetPost("/createPopup", new(thresholds.CreatePopupAction)).
-			GetPost("/updatePopup", new(thresholds.UpdatePopupAction)).
-			Post("/delete", new(thresholds.DeleteAction)).
-
 			// 指标
 			Prefix("/clusters/cluster/settings/metrics").
 			Get("", new(metrics.IndexAction)).
 			GetPost("/createPopup", new(metrics.CreatePopupAction)).
 			Post("/delete", new(metrics.DeleteAction)).
 
+			// WebP
+			Prefix("/clusters/cluster/settings/webp").
+			GetPost("", new(webp.IndexAction)).
+
+			// DDOS Protection
+			Prefix("/clusters/cluster/settings/ddos-protection").
+			GetPost("", new(ddosProtection.IndexAction)).
+			GetPost("/status", new(ddosProtection.StatusAction)).
+
+			// 全局服务配置
+			Prefix("/clusters/cluster/settings/global-server-config").
+			GetPost("", new(globalServerConfig.IndexAction)).
+
+			//
 			EndAll()
 	})
 }

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

@@ -1,75 +0,0 @@
-package message
-
-import (
-	"encoding/json"
-	"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 IndexAction struct {
-	actionutils.ParentAction
-}
-
-func (this *IndexAction) Init() {
-	this.Nav("", "setting", "")
-	this.SecondMenu("message")
-}
-
-func (this *IndexAction) RunGet(params struct{}) {
-	this.Show()
-}
-
-func (this *IndexAction) RunPost(params struct {
-	ClusterId     int64
-	ReceiversJSON []byte
-
-	Must *actions.Must
-	CSRF *actionutils.CSRF
-}) {
-	defer this.CreateLogInfo("修改集群 %d 消息接收人", params.ClusterId)
-
-	receiverMaps := []maps.Map{}
-	if len(params.ReceiversJSON) > 0 {
-		err := json.Unmarshal(params.ReceiversJSON, &receiverMaps)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-	}
-	pbReceiverOptions := &pb.UpdateMessageReceiversRequest_RecipientOptions{}
-	for _, receiverMap := range receiverMaps {
-		recipientId := int64(0)
-		groupId := int64(0)
-		receiverType := receiverMap.GetString("type")
-		switch receiverType {
-		case "recipient":
-			recipientId = receiverMap.GetInt64("id")
-		case "group":
-			groupId = receiverMap.GetInt64("id")
-		default:
-			continue
-		}
-		pbReceiverOptions.RecipientOptions = append(pbReceiverOptions.RecipientOptions, &pb.UpdateMessageReceiversRequest_RecipientOption{
-			MessageRecipientId:      recipientId,
-			MessageRecipientGroupId: groupId,
-		})
-	}
-
-	_, err := this.RPC().MessageReceiverRPC().UpdateMessageReceivers(this.AdminContext(), &pb.UpdateMessageReceiversRequest{
-		NodeClusterId: params.ClusterId,
-		NodeId:        0,
-		ServerId:      0,
-		ParamsJSON:    nil,
-		RecipientOptions: map[string]*pb.UpdateMessageReceiversRequest_RecipientOptions{
-			"*": pbReceiverOptions,
-		},
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Success()
-}

internal/web/actions/default/clusters/cluster/settings/message/selectReceiverPopup.go

@@ -1,77 +0,0 @@
-package message
-
-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 SelectReceiverPopupAction struct {
-	actionutils.ParentAction
-}
-
-func (this *SelectReceiverPopupAction) Init() {
-	this.Nav("", "", "")
-}
-
-func (this *SelectReceiverPopupAction) RunGet(params struct {
-	RecipientIds string
-	GroupIds     string
-}) {
-	recipientIds := utils.SplitNumbers(params.RecipientIds)
-	groupIds := utils.SplitNumbers(params.GroupIds)
-
-	// 所有接收人
-	recipientsResp, err := this.RPC().MessageRecipientRPC().ListEnabledMessageRecipients(this.AdminContext(), &pb.ListEnabledMessageRecipientsRequest{
-		AdminId:                 0,
-		MediaType:               "",
-		MessageRecipientGroupId: 0,
-		Keyword:                 "",
-		Offset:                  0,
-		Size:                    1000, // TODO 支持搜索
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	recipientMaps := []maps.Map{}
-	for _, recipient := range recipientsResp.MessageRecipients {
-		if !recipient.IsOn {
-			continue
-		}
-		if lists.ContainsInt64(recipientIds, recipient.Id) {
-			continue
-		}
-		recipientMaps = append(recipientMaps, maps.Map{
-			"id":           recipient.Id,
-			"name":         recipient.Admin.Fullname,
-			"instanceName": recipient.MessageMediaInstance.Name,
-		})
-	}
-	this.Data["recipients"] = recipientMaps
-
-	// 所有分组
-	groupsResp, err := this.RPC().MessageRecipientGroupRPC().FindAllEnabledMessageRecipientGroups(this.AdminContext(), &pb.FindAllEnabledMessageRecipientGroupsRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	groupMaps := []maps.Map{}
-	for _, group := range groupsResp.MessageRecipientGroups {
-		if !group.IsOn {
-			continue
-		}
-		if lists.ContainsInt64(groupIds, group.Id) {
-			continue
-		}
-		groupMaps = append(groupMaps, maps.Map{
-			"id":   group.Id,
-			"name": group.Name,
-		})
-	}
-	this.Data["groups"] = groupMaps
-
-	this.Show()
-}

internal/web/actions/default/clusters/cluster/settings/message/selectedReceivers.go

@@ -1,61 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package message
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-)
-
-type SelectedReceiversAction struct {
-	actionutils.ParentAction
-}
-
-func (this *SelectedReceiversAction) Init() {
-	this.Nav("", "", "")
-}
-
-func (this *SelectedReceiversAction) RunPost(params struct {
-	ClusterId int64
-	NodeId    int64
-	ServerId  int64
-}) {
-	receiversResp, err := this.RPC().MessageReceiverRPC().FindAllEnabledMessageReceivers(this.AdminContext(), &pb.FindAllEnabledMessageReceiversRequest{
-		NodeClusterId: params.ClusterId,
-		NodeId:        params.NodeId,
-		ServerId:      params.ServerId,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	receiverMaps := []maps.Map{}
-	for _, receiver := range receiversResp.MessageReceivers {
-		id := int64(0)
-		name := ""
-		receiverType := ""
-		subName := ""
-		if receiver.MessageRecipient != nil {
-			id = receiver.MessageRecipient.Id
-			name = receiver.MessageRecipient.Admin.Fullname
-			subName = receiver.MessageRecipient.MessageMediaInstance.Name
-			receiverType = "recipient"
-		} else if receiver.MessageRecipientGroup != nil {
-			id = receiver.MessageRecipientGroup.Id
-			name = receiver.MessageRecipientGroup.Name
-			receiverType = "group"
-		} else {
-			continue
-		}
-		receiverMaps = append(receiverMaps, maps.Map{
-			"id":      id,
-			"name":    name,
-			"subName": subName,
-			"type":    receiverType,
-		})
-	}
-	this.Data["receivers"] = receiverMaps
-
-	this.Success()
-}

internal/web/actions/default/clusters/cluster/settings/thresholds/createPopup.go

@@ -1,79 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package thresholds
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/actions"
-)
-
-type CreatePopupAction struct {
-	actionutils.ParentAction
-}
-
-func (this *CreatePopupAction) Init() {
-	this.Nav("", "", "")
-}
-
-func (this *CreatePopupAction) RunGet(params struct {
-	ClusterId int64
-	NodeId    int64
-}) {
-	this.Data["clusterId"] = params.ClusterId
-	this.Data["nodeId"] = params.NodeId
-	this.Data["items"] = nodeconfigs.FindAllNodeValueItemDefinitions()
-	this.Data["operators"] = nodeconfigs.FindAllNodeValueOperatorDefinitions()
-
-	this.Show()
-}
-
-func (this *CreatePopupAction) RunPost(params struct {
-	ClusterId      int64
-	NodeId         int64
-	Item           string
-	Param          string
-	SumMethod      string
-	Operator       string
-	Value          string
-	Duration       int32
-	DurationUnit   string
-	Message        string
-	NotifyDuration int32
-
-	Must *actions.Must
-	CSRF *actionutils.CSRF
-}) {
-	if params.ClusterId <= 0 && params.NodeId >= 0 {
-		this.Fail("集群或者节点至少需要填写其中一个参数")
-	}
-
-	valueJSON, err := json.Marshal(params.Value)
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	resp, err := this.RPC().NodeThresholdRPC().CreateNodeThreshold(this.AdminContext(), &pb.CreateNodeThresholdRequest{
-		Role:           "node",
-		NodeClusterId:  params.ClusterId,
-		NodeId:         params.NodeId,
-		Item:           params.Item,
-		Param:          params.Param,
-		Operator:       params.Operator,
-		ValueJSON:      valueJSON,
-		Message:        params.Message,
-		Duration:       params.Duration,
-		DurationUnit:   params.DurationUnit,
-		SumMethod:      params.SumMethod,
-		NotifyDuration: params.NotifyDuration,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	defer this.CreateLogInfo("创建节点阈值 %d", resp.NodeThresholdId)
-
-	this.Success()
-}

internal/web/actions/default/clusters/cluster/settings/thresholds/delete.go

@@ -1,27 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package thresholds
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-)
-
-// DeleteAction 删除阈值
-type DeleteAction struct {
-	actionutils.ParentAction
-}
-
-func (this *DeleteAction) RunPost(params struct {
-	ThresholdId int64
-}) {
-	defer this.CreateLogInfo("删除阈值 %d", params.ThresholdId)
-
-	_, err := this.RPC().NodeThresholdRPC().DeleteNodeThreshold(this.AdminContext(), &pb.DeleteNodeThresholdRequest{NodeThresholdId: params.ThresholdId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Success()
-}

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

@@ -1,61 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package thresholds
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-)
-
-type IndexAction struct {
-	actionutils.ParentAction
-}
-
-func (this *IndexAction) Init() {
-	this.Nav("", "setting", "setting")
-	this.SecondMenu("threshold")
-}
-
-func (this *IndexAction) RunGet(params struct {
-	ClusterId int64
-}) {
-	// 列出所有阈值
-	thresholdsResp, err := this.RPC().NodeThresholdRPC().FindAllEnabledNodeThresholds(this.AdminContext(), &pb.FindAllEnabledNodeThresholdsRequest{
-		Role:          "node",
-		NodeClusterId: params.ClusterId,
-		NodeId:        0,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	thresholdMaps := []maps.Map{}
-	for _, threshold := range thresholdsResp.NodeThresholds {
-		var nodeMap maps.Map = nil
-		if threshold.Node != nil {
-			nodeMap = maps.Map{
-				"id":   threshold.Node.Id,
-				"name": threshold.Node.Name,
-			}
-		}
-
-		thresholdMaps = append(thresholdMaps, maps.Map{
-			"id":               threshold.Id,
-			"itemName":         nodeconfigs.FindNodeValueItemName(threshold.Item),
-			"paramName":        nodeconfigs.FindNodeValueItemParamName(threshold.Item, threshold.Param),
-			"operatorName":     nodeconfigs.FindNodeValueOperatorName(threshold.Operator),
-			"value":            nodeconfigs.UnmarshalNodeValue(threshold.ValueJSON),
-			"sumMethodName":    nodeconfigs.FindNodeValueSumMethodName(threshold.SumMethod),
-			"duration":         threshold.Duration,
-			"durationUnitName": nodeconfigs.FindNodeValueDurationUnitName(threshold.DurationUnit),
-			"isOn":             threshold.IsOn,
-			"node":             nodeMap,
-		})
-	}
-	this.Data["thresholds"] = thresholdMaps
-
-	this.Show()
-}

internal/web/actions/default/clusters/cluster/settings/thresholds/updatePopup.go

@@ -1,106 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package thresholds
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/actions"
-	"github.com/iwind/TeaGo/maps"
-)
-
-type UpdatePopupAction struct {
-	actionutils.ParentAction
-}
-
-func (this *UpdatePopupAction) Init() {
-	this.Nav("", "", "")
-}
-
-func (this *UpdatePopupAction) RunGet(params struct {
-	ThresholdId int64
-}) {
-	// 通用参数
-	this.Data["items"] = nodeconfigs.FindAllNodeValueItemDefinitions()
-	this.Data["operators"] = nodeconfigs.FindAllNodeValueOperatorDefinitions()
-
-	// 阈值详情
-	thresholdResp, err := this.RPC().NodeThresholdRPC().FindEnabledNodeThreshold(this.AdminContext(), &pb.FindEnabledNodeThresholdRequest{NodeThresholdId: params.ThresholdId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	threshold := thresholdResp.NodeThreshold
-	if threshold == nil {
-		this.NotFound("nodeThreshold", params.ThresholdId)
-		return
-	}
-
-	valueInterface := new(interface{})
-	err = json.Unmarshal(threshold.ValueJSON, valueInterface)
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Data["threshold"] = maps.Map{
-		"id":             threshold.Id,
-		"item":           threshold.Item,
-		"param":          threshold.Param,
-		"message":        threshold.Message,
-		"notifyDuration": threshold.NotifyDuration,
-		"value":          nodeconfigs.UnmarshalNodeValue(threshold.ValueJSON),
-		"operator":       threshold.Operator,
-		"duration":       threshold.Duration,
-		"durationUnit":   threshold.DurationUnit,
-		"isOn":           threshold.IsOn,
-	}
-
-	this.Show()
-}
-
-func (this *UpdatePopupAction) RunPost(params struct {
-	ThresholdId    int64
-	Item           string
-	Param          string
-	SumMethod      string
-	Operator       string
-	Value          string
-	Duration       int32
-	DurationUnit   string
-	Message        string
-	NotifyDuration int32
-	IsOn           bool
-
-	Must *actions.Must
-	CSRF *actionutils.CSRF
-}) {
-	defer this.CreateLogInfo("修改节点阈值 %d", params.ThresholdId)
-
-	valueJSON, err := json.Marshal(params.Value)
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	_, err = this.RPC().NodeThresholdRPC().UpdateNodeThreshold(this.AdminContext(), &pb.UpdateNodeThresholdRequest{
-		NodeThresholdId: params.ThresholdId,
-		Item:            params.Item,
-		Param:           params.Param,
-		Operator:        params.Operator,
-		ValueJSON:       valueJSON,
-		Message:         params.Message,
-		NotifyDuration:  params.NotifyDuration,
-		Duration:        params.Duration,
-		DurationUnit:    params.DurationUnit,
-		SumMethod:       params.SumMethod,
-		IsOn:            params.IsOn,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Success()
-}

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

@@ -0,0 +1,98 @@
+package webp
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"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"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "")
+	this.SecondMenu("webp")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	webpResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeClusterWebPPolicy(this.AdminContext(), &pb.FindEnabledNodeClusterWebPPolicyRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if len(webpResp.WebpPolicyJSON) == 0 {
+		this.Data["webpPolicy"] = nodeconfigs.DefaultWebPImagePolicy
+	} else {
+		var config = &nodeconfigs.WebPImagePolicy{}
+		err = json.Unmarshal(webpResp.WebpPolicyJSON, config)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		this.Data["webpPolicy"] = config
+	}
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	ClusterId     int64
+	IsOn          bool
+	RequireCache  bool
+	MinLengthJSON []byte
+	MaxLengthJSON []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改集群 %d 的WebP设置", params.ClusterId)
+
+	var config = &nodeconfigs.WebPImagePolicy{
+		IsOn:         params.IsOn,
+		RequireCache: params.RequireCache,
+	}
+
+	if len(params.MinLengthJSON) > 0 {
+		var minLength = &shared.SizeCapacity{}
+		err := json.Unmarshal(params.MinLengthJSON, minLength)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		config.MinLength = minLength
+	}
+
+	if len(params.MaxLengthJSON) > 0 {
+		var maxLength = &shared.SizeCapacity{}
+		err := json.Unmarshal(params.MaxLengthJSON, maxLength)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		config.MaxLength = maxLength
+	}
+
+	configJSON, err := json.Marshal(config)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	_, err = this.RPC().NodeClusterRPC().UpdateNodeClusterWebPPolicy(this.AdminContext(), &pb.UpdateNodeClusterWebPPolicyRequest{
+		NodeClusterId:  params.ClusterId,
+		WebpPolicyJSON: configJSON,
+	})
+
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -8,6 +8,8 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"net"
+	"regexp"
 )
 
 type UpdateNodeSSHAction struct {
@@ -31,7 +33,7 @@ func (this *UpdateNodeSSHAction) RunGet(params struct {
 		return
 	}
 
-	node := nodeResp.Node
+	var node = nodeResp.Node
 	this.Data["node"] = maps.Map{
 		"id":   node.Id,
 		"name": node.Name,
@@ -43,7 +45,7 @@ func (this *UpdateNodeSSHAction) RunGet(params struct {
 	}
 
 	// SSH
-	loginParams := maps.Map{
+	var loginParams = maps.Map{
 		"host":    "",
 		"port":    "",
 		"grantId": 0,
@@ -59,10 +61,22 @@ func (this *UpdateNodeSSHAction) RunGet(params struct {
 			}
 		}
 	}
+
+	if len(loginParams.GetString("host")) == 0 {
+		addressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{NodeId: node.Id})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if len(addressesResp.NodeIPAddresses) > 0 {
+			loginParams["host"] = addressesResp.NodeIPAddresses[0].Ip
+		}
+	}
+
 	this.Data["params"] = loginParams
 
 	// 认证信息
-	grantId := loginParams.GetInt64("grantId")
+	var grantId = loginParams.GetInt64("grantId")
 	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
 	if err != nil {
 		this.ErrorPage(err)
@@ -101,7 +115,12 @@ func (this *UpdateNodeSSHAction) RunPost(params struct {
 		this.Fail("需要选择或填写至少一个认证信息")
 	}
 
-	login := &pb.NodeLogin{
+	// 检查IP地址
+	if regexp.MustCompile(`^\d+\.\d+\.\d+\.\d+$`).MatchString(params.SshHost) && net.ParseIP(params.SshHost) == nil {
+		this.Fail("SSH主机地址 '" + params.SshHost + "' IP格式错误")
+	}
+
+	var login = &pb.NodeLogin{
 		Id:   params.LoginId,
 		Name: "SSH",
 		Type: "ssh",

internal/web/actions/default/clusters/clusterutils/cluster_helper.go

@@ -13,7 +13,7 @@ import (
 	"strconv"
 )
 
-// 单个集群的帮助
+// ClusterHelper 单个集群的帮助
 type ClusterHelper struct {
 }
 
@@ -22,7 +22,7 @@ func NewClusterHelper() *ClusterHelper {
 }
 
 func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool) {
-	action := actionPtr.Object()
+	var action = actionPtr.Object()
 	if action.Request.Method != http.MethodGet {
 		return true
 	}
@@ -57,7 +57,7 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext
 			return
 		}
 
-		tabbar := actionutils.NewTabbar()
+		var tabbar = actionutils.NewTabbar()
 		tabbar.Add("集群列表", "", "/clusters", "", false)
 		if teaconst.IsPlus {
 			tabbar.Add("集群看板", "", "/clusters/cluster/boards?clusterId="+clusterIdString, "board", selectedTabbar == "board")
@@ -65,18 +65,23 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext
 		tabbar.Add("集群节点", "", "/clusters/cluster/nodes?clusterId="+clusterIdString, "server", selectedTabbar == "node")
 		tabbar.Add("集群设置", "", "/clusters/cluster/settings?clusterId="+clusterIdString, "setting", selectedTabbar == "setting")
 		tabbar.Add("删除集群", "", "/clusters/cluster/delete?clusterId="+clusterIdString, "trash", selectedTabbar == "delete")
-
-		{
-			m := tabbar.Add("当前集群："+cluster.Name, "", "/clusters/cluster?clusterId="+clusterIdString, "", false)
-			m["right"] = true
-		}
 		actionutils.SetTabbar(action, tabbar)
 
 		// 左侧菜单
 		secondMenuItem := action.Data.GetString("secondMenuItem")
 		switch selectedTabbar {
 		case "setting":
-			action.Data["leftMenuItems"] = this.createSettingMenu(cluster, clusterInfo, secondMenuItem)
+			var menuItems = this.createSettingMenu(cluster, clusterInfo, secondMenuItem)
+			action.Data["leftMenuItems"] = menuItems
+
+			// 当前菜单
+			action.Data["leftMenuActiveItem"] = nil
+			for _, item := range menuItems {
+				if item.GetBool("isActive") {
+					action.Data["leftMenuActiveItem"] = item
+					break
+				}
+			}
 		}
 	}
 
@@ -90,6 +95,7 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F
 		"name":     "基础设置",
 		"url":      "/clusters/cluster/settings?clusterId=" + clusterId,
 		"isActive": selectedItem == "basic",
+		"isOn":     true,
 	})
 	items = append(items, maps.Map{
 		"name":     "缓存设置",
@@ -112,10 +118,18 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F
 	})
 
 	items = append(items, maps.Map{
-		"name":     "健康检查",
-		"url":      "/clusters/cluster/settings/health?clusterId=" + clusterId,
-		"isActive": selectedItem == "health",
-		"isOn":     info != nil && info.HealthCheckIsOn,
+		"name":     "WebP",
+		"url":      "/clusters/cluster/settings/webp?clusterId=" + clusterId,
+		"isActive": selectedItem == "webp",
+		"isOn":     info != nil && info.WebpIsOn,
+	})
+
+	items = filterMenuItems1(items, info, clusterId, selectedItem)
+
+	items = append(items, maps.Map{
+		"name":     "-",
+		"url":      "",
+		"isActive": false,
 	})
 
 	items = append(items, maps.Map{
@@ -124,6 +138,31 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F
 		"isActive": selectedItem == "dns",
 		"isOn":     cluster.DnsDomainId > 0 || len(cluster.DnsName) > 0,
 	})
+
+	items = append(items, maps.Map{
+		"name":     "健康检查",
+		"url":      "/clusters/cluster/settings/health?clusterId=" + clusterId,
+		"isActive": selectedItem == "health",
+		"isOn":     info != nil && info.HealthCheckIsOn,
+	})
+
+	items = append(items, maps.Map{
+		"name":     "DDoS防护",
+		"url":      "/clusters/cluster/settings/ddos-protection?clusterId=" + clusterId,
+		"isActive": selectedItem == "ddosProtection",
+		"isOn":     info != nil && info.HasDDoSProtection,
+	})
+
+	items = append(items, maps.Map{
+		"name":     "服务设置",
+		"url":      "/clusters/cluster/settings/global-server-config?clusterId=" + clusterId,
+		"isActive": selectedItem == "globalServerConfig",
+	})
+
+	items = append(items, maps.Map{
+		"name": "-",
+	})
+
 	items = append(items, maps.Map{
 		"name":     "统计指标",
 		"url":      "/clusters/cluster/settings/metrics?clusterId=" + clusterId,
@@ -131,21 +170,7 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F
 		"isOn":     info != nil && info.HasMetricItems,
 	})
 
-	if teaconst.IsPlus {
-		items = append(items, maps.Map{
-			"name":     "阈值设置",
-			"url":      "/clusters/cluster/settings/thresholds?clusterId=" + clusterId,
-			"isActive": selectedItem == "threshold",
-			"isOn":     info != nil && info.HasThresholds,
-		})
-
-		items = append(items, maps.Map{
-			"name":     "消息通知",
-			"url":      "/clusters/cluster/settings/message?clusterId=" + clusterId,
-			"isActive": selectedItem == "message",
-			"isOn":     info != nil && info.HasMessageReceivers,
-		})
-	}
+	items = filterMenuItems2(items, info, clusterId, selectedItem)
 
 	items = append(items, maps.Map{
 		"name":     "-",
@@ -157,6 +182,7 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, info *pb.F
 		"name":     "系统服务",
 		"url":      "/clusters/cluster/settings/services?clusterId=" + clusterId,
 		"isActive": selectedItem == "service",
+		"isOn":     info != nil && info.HasSystemServices,
 	})
 	{
 		items = append(items, maps.Map{

internal/web/actions/default/clusters/clusterutils/cluster_helper_ext.go

@@ -0,0 +1,17 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+//go:build !plus
+
+package clusterutils
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+func filterMenuItems1(items []maps.Map, info *pb.FindEnabledNodeClusterConfigInfoResponse, clusterIdString string, selectedItem string) []maps.Map {
+	return items
+}
+
+func filterMenuItems2(items []maps.Map, info *pb.FindEnabledNodeClusterConfigInfoResponse, clusterIdString string, selectedItem string) []maps.Map {
+	return items
+}

internal/web/actions/default/clusters/clusterutils/installer.go

@@ -0,0 +1,66 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package clusterutils
+
+import (
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/iwind/TeaGo/Tea"
+	"path/filepath"
+	"regexp"
+	"sort"
+	"strings"
+)
+
+type installerFile struct {
+	Name    string `json:"name"`
+	OS      string `json:"os"`
+	Arch    string `json:"arch"`
+	Version string `json:"version"`
+}
+
+func ListInstallerFiles() []*installerFile {
+	var dir = Tea.Root + "/edge-api/deploy"
+	matches, err := filepath.Glob(dir + "/edge-node-*.zip")
+	if err != nil {
+		return nil
+	}
+
+	var result = []*installerFile{}
+	var reg = regexp.MustCompile(`^edge-node-(\w+)-(\w+)-v([\w.]+)\.zip$`)
+	for _, match := range matches {
+		var baseName = filepath.Base(match)
+		var subMatches = reg.FindStringSubmatch(baseName)
+		if len(subMatches) >= 4 {
+			var osName = subMatches[1]
+			if len(osName) > 0 {
+				osName = strings.ToUpper(osName[:1]) + osName[1:]
+			}
+
+			var arch = subMatches[2]
+			if arch == "amd64" {
+				arch = "x86_64"
+			}
+
+			var version = subMatches[3]
+			if version != teaconst.Version { // 只能下载当前版本
+				continue
+			}
+
+			result = append(result, &installerFile{
+				Name:    subMatches[0],
+				OS:      osName,
+				Arch:    arch,
+				Version: version,
+			})
+		}
+	}
+
+	// 排序，将x86_64排在最上面
+	if len(result) > 0 {
+		sort.Slice(result, func(i, j int) bool {
+			return result[i].Arch == "x86_64"
+		})
+	}
+
+	return result
+}

internal/web/actions/default/clusters/create.go

@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
 )
 
@@ -27,7 +28,7 @@ func (this *CreateAction) RunGet(params struct{}) {
 	}
 	this.Data["hasDomains"] = hasDomainsResp.Exist
 
-	// 集群总数
+	// 菜单：集群总数
 	totalResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{})
 	if err != nil {
 		this.ErrorPage(err)
@@ -35,6 +36,14 @@ func (this *CreateAction) RunGet(params struct{}) {
 	}
 	this.Data["totalNodeClusters"] = totalResp.Count
 
+	// 菜单：节点总数
+	totalNodesResp, err := this.RPC().NodeRPC().CountAllEnabledNodes(this.AdminContext(), &pb.CountAllEnabledNodesRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["totalNodes"] = totalNodesResp.Count
+
 	this.Show()
 }
 
@@ -47,14 +56,19 @@ func (this *CreateAction) RunPost(params struct {
 	// WAF策略
 	HttpFirewallPolicyId int64
 
+	// 服务配置
+	MatchDomainStrictly bool
+
 	// SSH相关
-	GrantId            int64
-	InstallDir         string
-	SystemdServiceIsOn bool
+	GrantId             int64
+	InstallDir          string
+	SystemdServiceIsOn  bool
+	AutoInstallNftables bool
 
 	// DNS相关
 	DnsDomainId int64
 	DnsName     string
+	DnsTTL      int32
 
 	Must *actions.Must
 }) {
@@ -84,8 +98,17 @@ func (this *CreateAction) RunPost(params struct {
 
 	// TODO 检查DnsDomainId的有效性
 
+	// 全局服务配置
+	var globalServerConfig = serverconfigs.DefaultGlobalServerConfig()
+	globalServerConfig.HTTPAll.MatchDomainStrictly = params.MatchDomainStrictly
+	globalServerConfigJSON, err := json.Marshal(globalServerConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	// 系统服务
-	systemServices := map[string]interface{}{}
+	var systemServices = map[string]any{}
 	if params.SystemdServiceIsOn {
 		systemServices[nodeconfigs.SystemServiceTypeSystemd] = &nodeconfigs.SystemdServiceConfig{
 			IsOn: true,
@@ -98,14 +121,17 @@ func (this *CreateAction) RunPost(params struct {
 	}
 
 	createResp, err := this.RPC().NodeClusterRPC().CreateNodeCluster(this.AdminContext(), &pb.CreateNodeClusterRequest{
-		Name:                 params.Name,
-		NodeGrantId:          params.GrantId,
-		InstallDir:           params.InstallDir,
-		DnsDomainId:          params.DnsDomainId,
-		DnsName:              params.DnsName,
-		HttpCachePolicyId:    params.CachePolicyId,
-		HttpFirewallPolicyId: params.HttpFirewallPolicyId,
-		SystemServicesJSON:   systemServicesJSON,
+		Name:                   params.Name,
+		NodeGrantId:            params.GrantId,
+		InstallDir:             params.InstallDir,
+		DnsDomainId:            params.DnsDomainId,
+		DnsName:                params.DnsName,
+		DnsTTL:                 params.DnsTTL,
+		HttpCachePolicyId:      params.CachePolicyId,
+		HttpFirewallPolicyId:   params.HttpFirewallPolicyId,
+		SystemServicesJSON:     systemServicesJSON,
+		GlobalServerConfigJSON: globalServerConfigJSON,
+		AutoInstallNftables:    params.AutoInstallNftables,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -1,15 +1,12 @@
 package clusters
 
 import (
-	"encoding/json"
-	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/types"
-	"time"
 )
 
 type IndexAction struct {
@@ -24,18 +21,26 @@ func (this *IndexAction) RunGet(params struct {
 	Keyword    string
 	SearchType string
 }) {
-	isSearching := len(params.Keyword) > 0
+	var isSearching = len(params.Keyword) > 0
 	this.Data["keyword"] = params.Keyword
 	this.Data["searchType"] = params.SearchType
 	this.Data["isSearching"] = isSearching
 
 	// 集群总数
-	totalResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{})
+	totalClustersResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	this.Data["totalNodeClusters"] = totalResp.Count
+	this.Data["totalNodeClusters"] = totalClustersResp.Count
+
+	// 节点总数
+	totalNodesResp, err := this.RPC().NodeRPC().CountAllEnabledNodes(this.AdminContext(), &pb.CountAllEnabledNodesRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["totalNodes"] = totalNodesResp.Count
 
 	// 常用的集群
 	latestClusterMaps := []maps.Map{}
@@ -54,12 +59,6 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["latestClusters"] = latestClusterMaps
 
-	// 搜索节点
-	if params.SearchType == "node" && len(params.Keyword) > 0 {
-		this.searchNodes(params.Keyword)
-		return
-	}
-
 	// 搜索集群
 	countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{
 		Keyword: params.Keyword,
@@ -166,149 +165,3 @@ func (this *IndexAction) RunGet(params struct {
 
 	this.Show()
 }
-
-func (this *IndexAction) searchNodes(keyword string) {
-	// 搜索节点
-	countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
-		Keyword: keyword,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	count := countResp.Count
-	page := this.NewPage(count)
-	this.Data["page"] = page.AsHTML()
-	this.Data["countNodes"] = count
-
-	nodesResp, err := this.RPC().NodeRPC().ListEnabledNodesMatch(this.AdminContext(), &pb.ListEnabledNodesMatchRequest{
-		Offset:  page.Offset,
-		Size:    page.Size,
-		Keyword: keyword,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	nodeMaps := []maps.Map{}
-	for _, node := range nodesResp.Nodes {
-		// 状态
-		isSynced := false
-		status := &nodeconfigs.NodeStatus{}
-		if len(node.StatusJSON) > 0 {
-			err = json.Unmarshal(node.StatusJSON, &status)
-			if err != nil {
-				this.ErrorPage(err)
-				return
-			}
-			status.IsActive = status.IsActive && time.Now().Unix()-status.UpdatedAt <= 60 // N秒之内认为活跃
-			isSynced = status.ConfigVersion == node.Version
-		}
-
-		// IP
-		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
-			NodeId: node.Id,
-			Role:   nodeconfigs.NodeRoleNode,
-		})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		ipAddresses := []maps.Map{}
-		for _, addr := range ipAddressesResp.NodeIPAddresses {
-			ipAddresses = append(ipAddresses, maps.Map{
-				"id":        addr.Id,
-				"name":      addr.Name,
-				"ip":        addr.Ip,
-				"canAccess": addr.CanAccess,
-				"isOn":      addr.IsOn,
-				"isUp":      addr.IsUp,
-			})
-		}
-
-		// 分组
-		var groupMap maps.Map = nil
-		if node.NodeGroup != nil {
-			groupMap = maps.Map{
-				"id":   node.NodeGroup.Id,
-				"name": node.NodeGroup.Name,
-			}
-		}
-
-		// 区域
-		var regionMap maps.Map = nil
-		if node.NodeRegion != nil {
-			regionMap = maps.Map{
-				"id":   node.NodeRegion.Id,
-				"name": node.NodeRegion.Name,
-			}
-		}
-
-		// DNS
-		dnsRouteNames := []string{}
-		for _, route := range node.DnsRoutes {
-			dnsRouteNames = append(dnsRouteNames, route.Name)
-		}
-
-		// 从集群
-		var secondaryClusterMaps []maps.Map
-		for _, secondaryCluster := range node.SecondaryNodeClusters {
-			secondaryClusterMaps = append(secondaryClusterMaps, maps.Map{
-				"id":   secondaryCluster.Id,
-				"name": secondaryCluster.Name,
-				"isOn": secondaryCluster.IsOn,
-			})
-		}
-
-		nodeMaps = append(nodeMaps, maps.Map{
-			"id":          node.Id,
-			"name":        node.Name,
-			"isInstalled": node.IsInstalled,
-			"isOn":        node.IsOn,
-			"isUp":        node.IsUp,
-			"installStatus": maps.Map{
-				"isRunning":  node.InstallStatus.IsRunning,
-				"isFinished": node.InstallStatus.IsFinished,
-				"isOk":       node.InstallStatus.IsOk,
-				"error":      node.InstallStatus.Error,
-			},
-			"status": maps.Map{
-				"isActive":     status.IsActive,
-				"updatedAt":    status.UpdatedAt,
-				"hostname":     status.Hostname,
-				"cpuUsage":     status.CPUUsage,
-				"cpuUsageText": fmt.Sprintf("%.2f%%", status.CPUUsage*100),
-				"memUsage":     status.MemoryUsage,
-				"memUsageText": fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
-			},
-			"cluster": maps.Map{
-				"id":   node.NodeCluster.Id,
-				"name": node.NodeCluster.Name,
-			},
-			"secondaryClusters": secondaryClusterMaps,
-			"isSynced":          isSynced,
-			"ipAddresses":       ipAddresses,
-			"group":             groupMap,
-			"region":            regionMap,
-			"dnsRouteNames":     dnsRouteNames,
-		})
-	}
-	this.Data["nodes"] = nodeMaps
-
-	this.Data["clusters"] = []maps.Map{}
-
-	// 搜索集群
-	{
-		countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{
-			Keyword: keyword,
-		})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		this.Data["countClusters"] = countResp.Count
-	}
-
-	this.Show()
-}

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

@@ -17,6 +17,7 @@ func init() {
 			Get("", new(IndexAction)).
 			GetPost("/create", new(CreateAction)).
 			Post("/pin", new(PinAction)).
+			Get("/nodes", new(NodesAction)).
 
 			// 只要登录即可访问的Action
 			EndHelpers().