检查版本更新时增加当前版本参数

自动安装的MySQL binlog过期时间改成7天
重启edge-admin时确保同目录下的edge-api也能重启
2023-03-12 21:24:08 +08:00 · 2023-03-12 20:58:13 +08:00 · 2023-03-11 22:02:29 +08:00 · 2023-03-11 18:52:40 +08:00 · 2023-03-11 14:44:19 +08:00 · 2023-03-10 17:00:53 +08:00
354 changed files with 10143 additions and 3395 deletions
--- a/cmd/edge-admin/main.go
+++ b/cmd/edge-admin/main.go
@@ -1,6 +1,8 @@
 package main

 import (
+	"bytes"
+	"flag"
 	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/apps"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
@@ -9,10 +11,13 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/nodes"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web"
+	"github.com/iwind/TeaGo/Tea"
 	_ "github.com/iwind/TeaGo/bootstrap"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/gosock/pkg/gosock"
 	"log"
+	"os"
+	"os/exec"
 	"time"
 )

@@ -20,7 +25,7 @@ func main() {
 	var app = apps.NewAppCmd().
 		Version(teaconst.Version).
 		Product(teaconst.ProductName).
-		Usage(teaconst.ProcessName+" [-v|start|stop|restart|service|daemon|reset|recover|demo|upgrade]").
+		Usage(teaconst.ProcessName+" [-h|-v|start|stop|restart|service|daemon|reset|recover|demo|upgrade]").
 		Usage(teaconst.ProcessName+" [dev|prod]").
 		Option("-h", "show this help").
 		Option("-v", "show version").
@@ -34,7 +39,7 @@ func main() {
 		Option("demo", "switch to demo mode").
 		Option("dev", "switch to 'dev' mode").
 		Option("prod", "switch to 'prod' mode").
-		Option("upgrade", "upgrade from official site")
+		Option("upgrade [--url=URL]", "upgrade from official site or an url")

 	app.On("daemon", func() {
 		nodes.NewAdminNode().Daemon()
@@ -53,6 +58,20 @@ func main() {
 			fmt.Println("[ERROR]reset failed: " + err.Error())
 			return
 		}
+
+		// reset local api
+		var apiNodeExe = Tea.Root + "/edge-api/bin/edge-api"
+		_, err = os.Stat(apiNodeExe)
+		if err == nil {
+			var cmd = exec.Command(apiNodeExe, "reset")
+			var stderr = &bytes.Buffer{}
+			cmd.Stderr = stderr
+			err = cmd.Run()
+			if err != nil {
+				fmt.Println("reset api node failed: " + stderr.String())
+			}
+		}
+
 		fmt.Println("done")
 	})
 	app.On("recover", func() {
@@ -120,7 +139,12 @@ func main() {
 		}
 	})
 	app.On("upgrade", func() {
-		var manager = utils.NewUpgradeManager("admin")
+		var downloadURL = ""
+		var flagSet = flag.NewFlagSet("", flag.ContinueOnError)
+		flagSet.StringVar(&downloadURL, "url", "", "new version download url")
+		_ = flagSet.Parse(os.Args[2:])
+
+		var manager = utils.NewUpgradeManager("admin", downloadURL)
 		log.Println("checking latest version ...")
 		var ticker = time.NewTicker(1 * time.Second)
 		go func() {
--- a/docker/.gitignore
+++ b/docker/.gitignore
@@ -0,0 +1 @@
+*.zip
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -0,0 +1,37 @@
+FROM alpine:latest
+LABEL maintainer="iwind.liu@gmail.com"
+ENV TZ "Asia/Shanghai"
+ENV VERSION 0.6.3
+ENV ROOT_DIR /usr/local/goedge
+ENV TAR_FILE edge-admin-linux-amd64-plus-v${VERSION}.zip
+ENV TAR_URL "https://dl.goedge.cn/edge/v${VERSION}/edge-admin-linux-amd64-plus-v${VERSION}.zip"
+#ENV TAR_URL "http://192.168.2.60:8080/edge-admin-linux-amd64-plus-v${VERSION}.zip" # your local repository
+
+RUN apk add --no-cache tzdata
+
+RUN apk add wget
+RUN mkdir ${ROOT_DIR}; \
+	cd ${ROOT_DIR}; \
+	wget ${TAR_URL} -O ${TAR_FILE}; \
+	apk add unzip; \
+	unzip ${TAR_FILE}; \
+	rm -f ${TAR_FILE}
+
+RUN apk add mysql mysql-client; \
+	sed -e "s/\[mysqld\]/\[mysqld\]\n\ndatadir=\/var\/lib\/mysql\nport=3306\ninnodb_flush_log_at_trx_commit=2\nmax_connections=256\nmax_prepared_stmt_count=65535\nbinlog_cache_size=1M\nbinlog_stmt_cache_size=1M\nthread_cache_size=32\nbinlog_expire_logs_seconds=1209600\n\n/" /etc/my.cnf > /tmp/my.cnf; \
+    cp /tmp/my.cnf /etc/my.cnf; \
+    sed -e "s/skip-networking/#skip-networking/" /etc/my.cnf.d/mariadb-server.cnf > /tmp/mariadb-server.cnf; \
+    cp /tmp/mariadb-server.cnf /etc/my.cnf.d/mariadb-server.cnf; \
+    mysql_install_db --user=mysql
+RUN mysqld_safe --user=mysql & \
+    sleep 5; \
+    mysql -uroot -hlocalhost --execute="ALTER USER 'root'@'localhost' IDENTIFIED BY '123456';"
+
+RUN echo -e "#!/usr/bin/env sh\n\nmysqld_safe --user=mysql &\n/usr/local/goedge/edge-admin/bin/edge-admin\n" > ${ROOT_DIR}/run.sh; \
+    chmod u+x ${ROOT_DIR}/run.sh
+
+EXPOSE 7788
+EXPOSE 8001
+EXPOSE 3306
+
+ENTRYPOINT [ "/usr/local/goedge/run.sh" ]
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+VERSION=latest
+
+docker build --no-cache -t goedge/edge-admin:${VERSION} .
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+VERSION=latest
+
+docker run -d -p 7788:7788 -p 8001:8001 -p 3306:3306 --name edge-admin goedge/edge-admin:${VERSION}
--- a/go.mod
+++ b/go.mod
@@ -8,16 +8,16 @@ 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/iwind/TeaGo v0.0.0-20220304043459-0dd944a5b475
+	github.com/iwind/TeaGo v0.0.0-20230304012706-c1f4a4e27470
 	github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4
 	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/sys v0.0.0-20220412211240-33da011f77ad
+	golang.org/x/sys v0.5.0
 	google.golang.org/grpc v1.45.0
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	gopkg.in/yaml.v3 v3.0.1
 )

 require (
@@ -26,18 +26,15 @@ require (
 	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
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/text v0.7.0 // 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
--- a/go.sum
+++ b/go.sum
@@ -21,7 +21,6 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH
 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=
 github.com/dgryski/go-rendezvous v0.0.0-20200624174652-8d2f3be8b2d9/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -74,13 +73,16 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 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-20220304043459-0dd944a5b475 h1:EseyfFaQOjWanGiby9KMw7PjDBMg/95tLDgIw/ns0Cw=
-github.com/iwind/TeaGo v0.0.0-20220304043459-0dd944a5b475/go.mod h1:HRHK0zoC/og3c9/hKosD9yYVMTnnzm3PgXUdhRYHaLc=
+github.com/iwind/TeaGo v0.0.0-20210411134150-ddf57e240c2f/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/iwind/TeaGo v0.0.0-20230207032553-d6dcde0cd518 h1:zuWjQ57zc67ZSTHpxNK95JYoa9Ph/JRSnapsTY/hlhQ=
+github.com/iwind/TeaGo v0.0.0-20230207032553-d6dcde0cd518/go.mod h1:fi/Pq+/5m2HZoseM+39dMF57ANXRt6w4PkGu3NXPc5s=
+github.com/iwind/TeaGo v0.0.0-20230303070415-9d0689db6456 h1:xv3AVaxuwjThkBDptAfsFSmuHQIrRrvt8BRaekWnsvs=
+github.com/iwind/TeaGo v0.0.0-20230303070415-9d0689db6456/go.mod h1:fi/Pq+/5m2HZoseM+39dMF57ANXRt6w4PkGu3NXPc5s=
+github.com/iwind/TeaGo v0.0.0-20230304012706-c1f4a4e27470 h1:TuRxvKRv9PxKVijWOkUnZm5TeanQqWGUJyPx9u6cra4=
+github.com/iwind/TeaGo v0.0.0-20230304012706-c1f4a4e27470/go.mod h1:fi/Pq+/5m2HZoseM+39dMF57ANXRt6w4PkGu3NXPc5s=
 github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4 h1:VWGsCqTzObdlbf7UUE3oceIpcEKi4C/YBUszQXk118A=
 github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA=
 github.com/json-iterator/go v1.1.10/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/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=
@@ -92,11 +94,7 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2
 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/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,7 +109,6 @@ github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+v
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 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=
@@ -131,7 +128,6 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-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=
@@ -170,8 +166,8 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
 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=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -198,20 +194,16 @@ golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7w
 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-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/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.0/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=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -266,7 +258,7 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.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=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/internal/apps/app_cmd.go
+++ b/internal/apps/app_cmd.go
@@ -209,7 +209,7 @@ func (this *AppCmd) runStop() {
 	fmt.Println(this.product+" stopped ok, pid:", types.String(pid))
 }

-// 重启
+// RunRestart 重启
 func (this *AppCmd) RunRestart() {
 	this.runStop()
 	time.Sleep(1 * time.Second)
--- a/internal/configloaders/user_ui_config.go
+++ b/internal/configloaders/user_ui_config.go
@@ -1,96 +0,0 @@
-package configloaders
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
-	"github.com/iwind/TeaGo/logs"
-	"reflect"
-)
-
-var sharedUserUIConfig *systemconfigs.UserUIConfig = nil
-
-const (
-	UserUISettingName = "userUIConfig"
-)
-
-func LoadUserUIConfig() (*systemconfigs.UserUIConfig, error) {
-	locker.Lock()
-	defer locker.Unlock()
-
-	config, err := loadUserUIConfig()
-	if err != nil {
-		return nil, err
-	}
-
-	v := reflect.Indirect(reflect.ValueOf(config)).Interface().(systemconfigs.UserUIConfig)
-	return &v, nil
-}
-
-func UpdateUserUIConfig(uiConfig *systemconfigs.UserUIConfig) error {
-	locker.Lock()
-	defer locker.Unlock()
-
-	var rpcClient, err = rpc.SharedRPC()
-	if err != nil {
-		return err
-	}
-	valueJSON, err := json.Marshal(uiConfig)
-	if err != nil {
-		return err
-	}
-	_, err = rpcClient.SysSettingRPC().UpdateSysSetting(rpcClient.Context(0), &pb.UpdateSysSettingRequest{
-		Code:      UserUISettingName,
-		ValueJSON: valueJSON,
-	})
-	if err != nil {
-		return err
-	}
-	sharedUserUIConfig = uiConfig
-
-	return nil
-}
-
-func loadUserUIConfig() (*systemconfigs.UserUIConfig, error) {
-	if sharedUserUIConfig != nil {
-		return sharedUserUIConfig, nil
-	}
-	var rpcClient, err = rpc.SharedRPC()
-	if err != nil {
-		return nil, err
-	}
-	resp, err := rpcClient.SysSettingRPC().ReadSysSetting(rpcClient.Context(0), &pb.ReadSysSettingRequest{
-		Code: UserUISettingName,
-	})
-	if err != nil {
-		return nil, err
-	}
-	if len(resp.ValueJSON) == 0 {
-		sharedUserUIConfig = defaultUserUIConfig()
-		return sharedUserUIConfig, nil
-	}
-
-	config := &systemconfigs.UserUIConfig{}
-	err = json.Unmarshal(resp.ValueJSON, config)
-	if err != nil {
-		logs.Println("[UI_MANAGER]" + err.Error())
-		sharedUserUIConfig = defaultUserUIConfig()
-		return sharedUserUIConfig, nil
-	}
-	sharedUserUIConfig = config
-	return sharedUserUIConfig, nil
-}
-
-func defaultUserUIConfig() *systemconfigs.UserUIConfig {
-	return &systemconfigs.UserUIConfig{
-		ProductName:         "GoEdge",
-		UserSystemName:      "GoEdge用户系统",
-		ShowOpenSourceInfo:  true,
-		ShowVersion:         true,
-		ShowFinance:         true,
-		BandwidthUnit:       systemconfigs.BandwidthUnitBit,
-		ShowBandwidthCharts: true,
-		ShowTrafficCharts:   true,
-	}
-}
--- a/internal/configs/api_config.go
+++ b/internal/configs/api_config.go
@@ -61,10 +61,11 @@ func LoadAPIConfig() (*APIConfig, error) {

 // ResetAPIConfig 重置配置
 func ResetAPIConfig() error {
-	filename := "api.yaml"
+	var filename = "api.yaml"

+	// 重置 configs/api.yaml
 	{
-		configFile := Tea.ConfigFile(filename)
+		var configFile = Tea.ConfigFile(filename)
 		stat, err := os.Stat(configFile)
 		if err == nil && !stat.IsDir() {
 			err = os.Remove(configFile)
@@ -77,7 +78,7 @@ func ResetAPIConfig() error {
 	// 重置 ~/.edge-admin/api.yaml
 	homeDir, homeErr := os.UserHomeDir()
 	if homeErr == nil {
-		configFile := homeDir + "/." + teaconst.ProcessName + "/" + filename
+		var configFile = homeDir + "/." + teaconst.ProcessName + "/" + filename
 		stat, err := os.Stat(configFile)
 		if err == nil && !stat.IsDir() {
 			err = os.Remove(configFile)
@@ -89,7 +90,7 @@ func ResetAPIConfig() error {

 	// 重置 /etc/edge-admin/api.yaml
 	{
-		configFile := "/etc/" + teaconst.ProcessName + "/" + filename
+		var configFile = "/etc/" + teaconst.ProcessName + "/" + filename
 		stat, err := os.Stat(configFile)
 		if err == nil && !stat.IsDir() {
 			err = os.Remove(configFile)
@@ -154,3 +155,15 @@ func (this *APIConfig) WriteFile(path string) error {

 	return nil
 }
+
+// Clone 克隆当前配置
+func (this *APIConfig) Clone() *APIConfig {
+	return &APIConfig{
+		RPC: struct {
+			Endpoints     []string `yaml:"endpoints"`
+			DisableUpdate bool     `yaml:"disableUpdate"`
+		}{},
+		NodeId: this.NodeId,
+		Secret: this.Secret,
+	}
+}
--- a/internal/configs/plus_config.go
+++ b/internal/configs/plus_config.go
@@ -1,42 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package configs
-
-import (
-	"encoding/json"
-	"github.com/iwind/TeaGo/Tea"
-	"os"
-)
-
-var plusConfigFile = "plus.cache.json"
-
-type PlusConfig struct {
-	IsPlus     bool     `json:"isPlus"`
-	Components []string `json:"components"`
-	DayTo      string   `json:"dayTo"`
-}
-
-func ReadPlusConfig() *PlusConfig {
-	data, err := os.ReadFile(Tea.ConfigFile(plusConfigFile))
-	if err != nil {
-		return &PlusConfig{IsPlus: false}
-	}
-	var config = &PlusConfig{IsPlus: false}
-	err = json.Unmarshal(data, config)
-	if err != nil {
-		return config
-	}
-	return config
-}
-
-func WritePlusConfig(config *PlusConfig) error {
-	configJSON, err := json.Marshal(config)
-	if err != nil {
-		return err
-	}
-	err = os.WriteFile(Tea.ConfigFile(plusConfigFile), configJSON, 0777)
-	if err != nil {
-		return err
-	}
-	return nil
-}
--- a/internal/const/const.go
+++ b/internal/const/const.go
@@ -1,9 +1,9 @@
 package teaconst

 const (
-	Version = "0.5.4"
+	Version = "0.6.4"

-	APINodeVersion = "0.5.4"
+	APINodeVersion = "0.6.4"

 	ProductName   = "Edge Admin"
 	ProcessName   = "edge-admin"
@@ -18,5 +18,5 @@ const (
 	CookieSID = "edgesid"

 	SystemdServiceName = "edge-admin"
-	UpdatesURL         = "https://goedge.cn/api/boot/versions?os=${os}&arch=${arch}"
+	UpdatesURL         = "https://goedge.cn/api/boot/versions?os=${os}&arch=${arch}&version=${version}"
 )
--- a/internal/gen/generate.go
+++ b/internal/gen/generate.go
@@ -9,6 +9,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/conds/condutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/files"
@@ -115,6 +116,16 @@ func generateComponentsJSFile() error {
 		buffer.Write([]byte{'\n', '\n'})
 	}

+	// WAF操作符
+	wafOperatorsJSON, err := json.Marshal(firewallconfigs.AllRuleOperators)
+	if err != nil {
+		logs.Println("ComponentsAction marshal waf rule operators failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.WAF_RULE_OPERATORS = ")
+		buffer.Write(wafOperatorsJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
 	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
--- a/internal/nodes/admin_node.go
+++ b/internal/nodes/admin_node.go
@@ -12,7 +12,6 @@ import (
 	"github.com/iwind/TeaGo/logs"
 	"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"
 	"gopkg.in/yaml.v3"
@@ -21,6 +20,8 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"path/filepath"
+	"strings"
 	"syscall"
 	"time"
 )
@@ -85,10 +86,15 @@ func (this *AdminNode) Run() {
 	this.startAPINode()

 	// 启动Web服务
+	sessionManager, err := NewSessionManager()
+	if err != nil {
+		log.Fatal("start session failed: " + err.Error())
+		return
+	}
 	TeaGo.NewServer(false).
 		AccessLog(false).
 		EndAll().
-		Session(sessions.NewFileSessionManager(86400, secret), teaconst.CookieSID).
+		Session(sessionManager, teaconst.CookieSID).
 		ReadHeaderTimeout(3 * time.Second).
 		ReadTimeout(1200 * time.Second).
 		Start()
@@ -360,6 +366,16 @@ func (this *AdminNode) listenSock() error {
 					}
 				}

+				// 停止当前目录下的API节点
+				var apiSock = gosock.NewTmpSock("edge-api")
+				apiReply, err := apiSock.Send(&gosock.Command{Code: "info"})
+				if err == nil {
+					adminExe, _ := os.Executable()
+					if len(adminExe) > 0 && apiReply != nil && strings.HasPrefix(maps.NewMap(apiReply.Params).GetString("path"), filepath.Dir(filepath.Dir(adminExe))) {
+						_, _ = apiSock.Send(&gosock.Command{Code: "stop"})
+					}
+				}
+
 				// 退出主进程
 				events.Notify(events.EventQuit)
 				os.Exit(0)
--- a/internal/nodes/session_manager.go
+++ b/internal/nodes/session_manager.go
@@ -0,0 +1,96 @@
+// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package nodes
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/logs"
+	"strings"
+)
+
+type SessionManager struct {
+	life uint
+}
+
+func NewSessionManager() (*SessionManager, error) {
+	return &SessionManager{}, nil
+}
+
+func (this *SessionManager) Init(config *actions.SessionConfig) {
+	this.life = config.Life
+}
+
+func (this *SessionManager) Read(sid string) map[string]string {
+	// 忽略OTP
+	if strings.HasSuffix(sid, "_otp") {
+		return map[string]string{}
+	}
+
+	var result = map[string]string{}
+
+	rpcClient, err := rpc.SharedRPC()
+	if err != nil {
+		return map[string]string{}
+	}
+
+	resp, err := rpcClient.LoginSessionRPC().FindLoginSession(rpcClient.Context(0), &pb.FindLoginSessionRequest{Sid: sid})
+	if err != nil {
+		logs.Println("SESSION", "read '"+sid+"' failed: "+err.Error())
+		return result
+	}
+
+	var session = resp.LoginSession
+	if session == nil || len(session.ValuesJSON) == 0 {
+		return result
+	}
+
+	err = json.Unmarshal(session.ValuesJSON, &result)
+	if err != nil {
+		logs.Println("SESSION", "decode '"+sid+"' values failed: "+err.Error())
+	}
+
+	return result
+}
+
+func (this *SessionManager) WriteItem(sid string, key string, value string) bool {
+	// 忽略OTP
+	if strings.HasSuffix(sid, "_otp") {
+		return false
+	}
+
+	rpcClient, err := rpc.SharedRPC()
+	if err != nil {
+		return false
+	}
+
+	_, err = rpcClient.LoginSessionRPC().WriteLoginSessionValue(rpcClient.Context(0), &pb.WriteLoginSessionValueRequest{
+		Sid:   sid,
+		Key:   key,
+		Value: value,
+	})
+	if err != nil {
+		logs.Println("SESSION", "write sid:'"+sid+"' key:'"+key+"' failed: "+err.Error())
+	}
+
+	return true
+}
+
+func (this *SessionManager) Delete(sid string) bool {
+	// 忽略OTP
+	if strings.HasSuffix(sid, "_otp") {
+		return false
+	}
+
+	rpcClient, err := rpc.SharedRPC()
+	if err != nil {
+		return false
+	}
+	_, err = rpcClient.LoginSessionRPC().DeleteLoginSession(rpcClient.Context(0), &pb.DeleteLoginSessionRequest{Sid: sid})
+	if err != nil {
+		logs.Println("SESSION", "delete '"+sid+"' failed: "+err.Error())
+	}
+	return true
+}
--- a/internal/rpc/rpc_client.go
+++ b/internal/rpc/rpc_client.go
@@ -98,10 +98,6 @@ func (this *RPCClient) NodeRegionRPC() pb.NodeRegionServiceClient {
 	return pb.NewNodeRegionServiceClient(this.pickConn())
 }

-func (this *RPCClient) NodePriceItemRPC() pb.NodePriceItemServiceClient {
-	return pb.NewNodePriceItemServiceClient(this.pickConn())
-}
-
 func (this *RPCClient) NodeIPAddressRPC() pb.NodeIPAddressServiceClient {
 	return pb.NewNodeIPAddressServiceClient(this.pickConn())
 }
@@ -399,26 +395,6 @@ func (this *RPCClient) UserRPC() pb.UserServiceClient {
 	return pb.NewUserServiceClient(this.pickConn())
 }

-func (this *RPCClient) UserBillRPC() pb.UserBillServiceClient {
-	return pb.NewUserBillServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) ServerBillRPC() pb.ServerBillServiceClient {
-	return pb.NewServerBillServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) UserAccountRPC() pb.UserAccountServiceClient {
-	return pb.NewUserAccountServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) UserAccountLogRPC() pb.UserAccountLogServiceClient {
-	return pb.NewUserAccountLogServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) UserAccountDailyStatRPC() pb.UserAccountDailyStatServiceClient {
-	return pb.NewUserAccountDailyStatServiceClient(this.pickConn())
-}
-
 func (this *RPCClient) UserAccessKeyRPC() pb.UserAccessKeyServiceClient {
 	return pb.NewUserAccessKeyServiceClient(this.pickConn())
 }
@@ -431,6 +407,10 @@ func (this *RPCClient) LoginRPC() pb.LoginServiceClient {
 	return pb.NewLoginServiceClient(this.pickConn())
 }

+func (this *RPCClient) LoginSessionRPC() pb.LoginSessionServiceClient {
+	return pb.NewLoginSessionServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) NodeTaskRPC() pb.NodeTaskServiceClient {
 	return pb.NewNodeTaskServiceClient(this.pickConn())
 }
@@ -475,14 +455,6 @@ func (this *RPCClient) ServerStatBoardChartRPC() pb.ServerStatBoardChartServiceC
 	return pb.NewServerStatBoardChartServiceClient(this.pickConn())
 }

-func (this *RPCClient) PlanRPC() pb.PlanServiceClient {
-	return pb.NewPlanServiceClient(this.pickConn())
-}
-
-func (this *RPCClient) UserPlanRPC() pb.UserPlanServiceClient {
-	return pb.NewUserPlanServiceClient(this.pickConn())
-}
-
 func (this *RPCClient) TrafficDailyStatRPC() pb.TrafficDailyStatServiceClient {
 	return pb.NewTrafficDailyStatServiceClient(this.pickConn())
 }
@@ -603,41 +575,30 @@ func (this *RPCClient) pickConn() *grpc.ClientConn {
 	defer this.locker.Unlock()

 	// 检查连接状态
-	if len(this.conns) > 0 {
-		var availableConns = []*grpc.ClientConn{}
-		for _, state := range []connectivity.State{connectivity.Ready, connectivity.Idle, connectivity.Connecting} {
+	var countConns = len(this.conns)
+	if countConns > 0 {
+		if countConns == 1 {
+			return this.conns[0]
+		}
+		for _, state := range []connectivity.State{
+			connectivity.Ready,
+			connectivity.Idle,
+			connectivity.Connecting,
+			connectivity.TransientFailure,
+		} {
+			var availableConns = []*grpc.ClientConn{}
 			for _, conn := range this.conns {
 				if conn.GetState() == state {
 					availableConns = append(availableConns, conn)
 				}
 			}
 			if len(availableConns) > 0 {
-				break
+				return this.randConn(availableConns)
 			}
 		}
-
-		if len(availableConns) > 0 {
-			return availableConns[rands.Int(0, len(availableConns)-1)]
-		}
-
-		// 关闭
-		for _, conn := range this.conns {
-			_ = conn.Close()
-		}
 	}

-	// 重新初始化
-	err := this.init()
-	if err != nil {
-		// 错误提示已经在构造对象时打印过，所以这里不再重复打印
-		return nil
-	}
-
-	if len(this.conns) == 0 {
-		return nil
-	}
-
-	return this.conns[rands.Int(0, len(this.conns)-1)]
+	return this.randConn(this.conns)
 }

 // Close 关闭
@@ -671,3 +632,14 @@ func (this *RPCClient) localIPAddrs() []string {
 	}
 	return localIPAddrs
 }
+
+func (this *RPCClient) randConn(conns []*grpc.ClientConn) *grpc.ClientConn {
+	var l = len(conns)
+	if l == 0 {
+		return nil
+	}
+	if l == 1 {
+		return conns[0]
+	}
+	return conns[rands.Int(0, l-1)]
+}
--- a/internal/tasks/task_check_updates.go
+++ b/internal/tasks/task_check_updates.go
@@ -87,6 +87,7 @@ func (this *CheckUpdatesTask) Loop() error {
 	var apiURL = teaconst.UpdatesURL
 	apiURL = strings.ReplaceAll(apiURL, "${os}", runtime.GOOS)
 	apiURL = strings.ReplaceAll(apiURL, "${arch}", runtime.GOARCH)
+	apiURL = strings.ReplaceAll(apiURL, "${version}", teaconst.Version)
 	resp, err := http.Get(apiURL)
 	if err != nil {
 		return errors.New("read api failed: " + err.Error())
--- a/internal/utils/apinodeutils/manager.go
+++ b/internal/utils/apinodeutils/manager.go
@@ -0,0 +1,30 @@
+// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package apinodeutils
+
+var SharedManager = NewManager()
+
+type Manager struct {
+	upgraderMap map[int64]*Upgrader
+}
+
+func NewManager() *Manager {
+	return &Manager{
+		upgraderMap: map[int64]*Upgrader{},
+	}
+}
+
+func (this *Manager) AddUpgrader(upgrader *Upgrader) {
+	this.upgraderMap[upgrader.apiNodeId] = upgrader
+}
+
+func (this *Manager) FindUpgrader(apiNodeId int64) *Upgrader {
+	return this.upgraderMap[apiNodeId]
+}
+
+func (this *Manager) RemoveUpgrader(upgrader *Upgrader) {
+	if upgrader == nil {
+		return
+	}
+	delete(this.upgraderMap, upgrader.apiNodeId)
+}
--- a/internal/utils/apinodeutils/upgrader.go
+++ b/internal/utils/apinodeutils/upgrader.go
@@ -0,0 +1,201 @@
+// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package apinodeutils
+
+import (
+	"compress/gzip"
+	"crypto/md5"
+	"errors"
+	"fmt"
+	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/types"
+	stringutil "github.com/iwind/TeaGo/utils/string"
+	"io"
+	"os"
+	"path/filepath"
+	"runtime"
+)
+
+type Progress struct {
+	Percent float64
+}
+
+type Upgrader struct {
+	progress  *Progress
+	apiExe    string
+	apiNodeId int64
+}
+
+func NewUpgrader(apiNodeId int64) *Upgrader {
+	return &Upgrader{
+		apiExe:    apiExe(),
+		progress:  &Progress{Percent: 0},
+		apiNodeId: apiNodeId,
+	}
+}
+
+func (this *Upgrader) Upgrade() error {
+	sharedClient, err := rpc.SharedRPC()
+	if err != nil {
+		return err
+	}
+	apiNodeResp, err := sharedClient.APINodeRPC().FindEnabledAPINode(sharedClient.Context(0), &pb.FindEnabledAPINodeRequest{ApiNodeId: this.apiNodeId})
+	if err != nil {
+		return err
+	}
+	var apiNode = apiNodeResp.ApiNode
+	if apiNode == nil {
+		return errors.New("could not find api node with id '" + types.String(this.apiNodeId) + "'")
+	}
+
+	apiConfig, err := configs.LoadAPIConfig()
+	if err != nil {
+		return err
+	}
+	var newAPIConfig = apiConfig.Clone()
+	newAPIConfig.RPC.Endpoints = apiNode.AccessAddrs
+
+	rpcClient, err := rpc.NewRPCClient(newAPIConfig, false)
+	if err != nil {
+		return err
+	}
+	versionResp, err := rpcClient.APINodeRPC().FindCurrentAPINodeVersion(sharedClient.Context(0), &pb.FindCurrentAPINodeVersionRequest{})
+	if err != nil {
+		return err
+	}
+	if !Tea.IsTesting() /** 开发环境下允许突破此限制方便测试 **/ &&
+		(stringutil.VersionCompare(versionResp.Version, "0.6.4" /** 从0.6.4开始支持 **/) < 0 || versionResp.Os != runtime.GOOS || versionResp.Arch != runtime.GOARCH) {
+		return errors.New("could not upgrade api node v" + versionResp.Version + "/" + versionResp.Os + "/" + versionResp.Arch)
+	}
+
+	// 检查本地文件版本
+	canUpgrade, reason := CanUpgrade(versionResp.Version, versionResp.Os, versionResp.Arch)
+	if !canUpgrade {
+		return errors.New(reason)
+	}
+
+	localVersion, err := localVersion()
+	if err != nil {
+		return errors.New("lookup version failed: " + err.Error())
+	}
+
+	// 检查要升级的文件
+	var gzFile = this.apiExe + "." + localVersion + ".gz"
+
+	gzReader, err := os.Open(gzFile)
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return err
+		}
+		err = func() error {
+			// 压缩文件
+			exeReader, err := os.Open(this.apiExe)
+			if err != nil {
+				return err
+			}
+			defer func() {
+				_ = exeReader.Close()
+			}()
+			var tmpGzFile = gzFile + ".tmp"
+			gzFileWriter, err := os.OpenFile(tmpGzFile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
+			if err != nil {
+				return err
+			}
+			var gzWriter = gzip.NewWriter(gzFileWriter)
+			defer func() {
+				_ = gzWriter.Close()
+				_ = gzFileWriter.Close()
+
+				_ = os.Rename(tmpGzFile, gzFile)
+			}()
+			_, err = io.Copy(gzWriter, exeReader)
+			if err != nil {
+				return err
+			}
+
+			return nil
+		}()
+		if err != nil {
+			return err
+		}
+		gzReader, err = os.Open(gzFile)
+		if err != nil {
+			return err
+		}
+	}
+
+	defer func() {
+		_ = gzReader.Close()
+	}()
+
+	// 开始上传
+	var hash = md5.New()
+	var buf = make([]byte, 128*4096)
+	var isFirst = true
+	stat, err := gzReader.Stat()
+	if err != nil {
+		return err
+	}
+	var totalSize = stat.Size()
+	if totalSize == 0 {
+		_ = gzReader.Close()
+		_ = os.Remove(gzFile)
+		return errors.New("invalid gz file")
+	}
+
+	var uploadedSize int64 = 0
+	for {
+		n, err := gzReader.Read(buf)
+		if n > 0 {
+			// 计算Hash
+			hash.Write(buf[:n])
+
+			// 上传
+			_, uploadErr := rpcClient.APINodeRPC().UploadAPINodeFile(rpcClient.Context(0), &pb.UploadAPINodeFileRequest{
+				Filename:     filepath.Base(this.apiExe),
+				Sum:          "",
+				ChunkData:    buf[:n],
+				IsFirstChunk: isFirst,
+				IsLastChunk:  false,
+			})
+			if uploadErr != nil {
+				return uploadErr
+			}
+
+			// 进度
+			uploadedSize += int64(n)
+			this.progress = &Progress{Percent: float64(uploadedSize*100) / float64(totalSize)}
+		}
+		if isFirst {
+			isFirst = false
+		}
+		if err != nil {
+			if err != io.EOF {
+				return err
+			}
+			if err == io.EOF {
+				_, uploadErr := rpcClient.APINodeRPC().UploadAPINodeFile(rpcClient.Context(0), &pb.UploadAPINodeFileRequest{
+					Filename:     filepath.Base(this.apiExe),
+					Sum:          fmt.Sprintf("%x", hash.Sum(nil)),
+					ChunkData:    buf[:n],
+					IsFirstChunk: isFirst,
+					IsLastChunk:  true,
+				})
+				if uploadErr != nil {
+					return uploadErr
+				}
+
+				break
+			}
+		}
+	}
+
+	return nil
+}
+
+func (this *Upgrader) Progress() *Progress {
+	return this.progress
+}
--- a/internal/utils/apinodeutils/upgrader_test.go
+++ b/internal/utils/apinodeutils/upgrader_test.go
@@ -0,0 +1,22 @@
+// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package apinodeutils_test
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/apinodeutils"
+	_ "github.com/iwind/TeaGo/bootstrap"
+	"runtime"
+	"testing"
+)
+
+func TestUpgrader_CanUpgrade(t *testing.T) {
+	t.Log(apinodeutils.CanUpgrade("0.6.3", runtime.GOOS, runtime.GOARCH))
+}
+
+func TestUpgrader_Upgrade(t *testing.T) {
+	var upgrader = apinodeutils.NewUpgrader(1)
+	err := upgrader.Upgrade()
+	if err != nil {
+		t.Fatal(err)
+	}
+}
--- a/internal/utils/apinodeutils/utils.go
+++ b/internal/utils/apinodeutils/utils.go
@@ -0,0 +1,80 @@
+// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package apinodeutils
+
+import (
+	"bytes"
+	"errors"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/iwind/TeaGo/Tea"
+	stringutil "github.com/iwind/TeaGo/utils/string"
+	"os"
+	"os/exec"
+	"regexp"
+	"runtime"
+	"strings"
+)
+
+func CanUpgrade(apiVersion string, osName string, arch string) (canUpgrade bool, reason string) {
+	if len(apiVersion) == 0 {
+		return false, "current api version should not be empty"
+	}
+
+	if stringutil.VersionCompare(apiVersion, "0.6.4") < 0 {
+		return false, "api node version must greater than or equal to 0.6.4"
+	}
+
+	if osName != runtime.GOOS {
+		return false, "os not match: " + osName
+	}
+	if arch != runtime.GOARCH {
+		return false, "arch not match: " + arch
+	}
+
+	stat, err := os.Stat(apiExe())
+	if err != nil {
+		return false, "stat error: " + err.Error()
+	}
+	if stat.IsDir() {
+		return false, "is directory"
+	}
+
+	localVersion, err := localVersion()
+	if err != nil {
+		return false, "lookup version failed: " + err.Error()
+	}
+	if localVersion != teaconst.APINodeVersion {
+		return false, "not newest api node"
+	}
+	if stringutil.VersionCompare(localVersion, apiVersion) <= 0 {
+		return false, "need not upgrade, local '" + localVersion + "' vs remote '" + apiVersion + "'"
+	}
+
+	return true, ""
+}
+
+
+
+func localVersion() (string, error) {
+	var cmd = exec.Command(apiExe(), "-V")
+	var output = &bytes.Buffer{}
+	cmd.Stdout = output
+	err := cmd.Run()
+	if err != nil {
+		return "", err
+	}
+	var localVersion = strings.TrimSpace(output.String())
+
+	// 检查版本号
+	var reg = regexp.MustCompile(`^[\d.]+$`)
+	if !reg.MatchString(localVersion) {
+		return "", errors.New("lookup version failed: " + localVersion)
+	}
+
+	return localVersion, nil
+}
+
+
+func apiExe() string {
+	return Tea.Root + "/edge-api/bin/edge-api"
+}
--- a/internal/utils/dateutils/utils.go
+++ b/internal/utils/dateutils/utils.go
@@ -0,0 +1,12 @@
+// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package dateutils
+
+// SplitYmd 分隔Ymd格式的日期
+// Ymd => Y-m-d
+func SplitYmd(day string) string {
+	if len(day) != 8 {
+		return day
+	}
+	return day[:4] + "-" + day[4:6] + "-" + day[6:]
+}
--- a/internal/utils/email_test.go
+++ b/internal/utils/email_test.go
@@ -3,7 +3,7 @@
 package utils_test

 import (
-	"github.com/TeaOSLab/EdgeAPI/internal/utils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/iwind/TeaGo/assert"
 	"testing"
 )
--- a/internal/utils/numberutils/utils.go
+++ b/internal/utils/numberutils/utils.go
@@ -3,7 +3,9 @@ package numberutils
 import (
 	"fmt"
 	"github.com/iwind/TeaGo/types"
+	"regexp"
 	"strconv"
+	"strings"
 )

 func FormatInt64(value int64) string {
@@ -28,17 +30,35 @@ func FormatBytes(bytes int64) string {
 	if bytes < Pow1024(1) {
 		return FormatInt64(bytes) + "B"
 	} else if bytes < Pow1024(2) {
-		return fmt.Sprintf("%.2fKB", float64(bytes)/float64(Pow1024(1)))
+		return TrimZeroSuffix(fmt.Sprintf("%.2fKB", float64(bytes)/float64(Pow1024(1))))
 	} else if bytes < Pow1024(3) {
-		return fmt.Sprintf("%.2fMB", float64(bytes)/float64(Pow1024(2)))
+		return TrimZeroSuffix(fmt.Sprintf("%.2fMB", float64(bytes)/float64(Pow1024(2))))
 	} else if bytes < Pow1024(4) {
-		return fmt.Sprintf("%.2fGB", float64(bytes)/float64(Pow1024(3)))
+		return TrimZeroSuffix(fmt.Sprintf("%.2fGB", float64(bytes)/float64(Pow1024(3))))
 	} else if bytes < Pow1024(5) {
-		return fmt.Sprintf("%.2fTB", float64(bytes)/float64(Pow1024(4)))
+		return TrimZeroSuffix(fmt.Sprintf("%.2fTB", float64(bytes)/float64(Pow1024(4))))
 	} else if bytes < Pow1024(6) {
-		return fmt.Sprintf("%.2fPB", float64(bytes)/float64(Pow1024(5)))
+		return TrimZeroSuffix(fmt.Sprintf("%.2fPB", float64(bytes)/float64(Pow1024(5))))
 	} else {
-		return fmt.Sprintf("%.2fEB", float64(bytes)/float64(Pow1024(6)))
+		return TrimZeroSuffix(fmt.Sprintf("%.2fEB", float64(bytes)/float64(Pow1024(6))))
+	}
+}
+
+func FormatBits(bits int64) string {
+	if bits < Pow1024(1) {
+		return FormatInt64(bits) + "bps"
+	} else if bits < Pow1024(2) {
+		return TrimZeroSuffix(fmt.Sprintf("%.4fKbps", float64(bits)/float64(Pow1024(1))))
+	} else if bits < Pow1024(3) {
+		return TrimZeroSuffix(fmt.Sprintf("%.4fMbps", float64(bits)/float64(Pow1024(2))))
+	} else if bits < Pow1024(4) {
+		return TrimZeroSuffix(fmt.Sprintf("%.4fGbps", float64(bits)/float64(Pow1024(3))))
+	} else if bits < Pow1024(5) {
+		return TrimZeroSuffix(fmt.Sprintf("%.4fTbps", float64(bits)/float64(Pow1024(4))))
+	} else if bits < Pow1024(6) {
+		return TrimZeroSuffix(fmt.Sprintf("%.4fPbps", float64(bits)/float64(Pow1024(5))))
+	} else {
+		return TrimZeroSuffix(fmt.Sprintf("%.4fEbps", float64(bits)/float64(Pow1024(6))))
 	}
 }

@@ -62,9 +82,19 @@ func FormatFloat(f interface{}, decimal int) string {
 	switch x := f.(type) {
 	case float32, float64:
 		var s = fmt.Sprintf("%."+types.String(decimal)+"f", x)
+
+		// 分隔
+		var dotIndex = strings.Index(s, ".")
+		if dotIndex > 0 {
+			var d = s[:dotIndex]
+			var f2 = s[dotIndex:]
+			f2 = strings.TrimRight(strings.TrimRight(f2, "0"), ".")
+			return formatDigit(d) + f2
+		}
+
 		return s
 	case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64:
-		return types.String(x)
+		return formatDigit(types.String(x))
 	case string:
 		return x
 	}
@@ -74,3 +104,44 @@ func FormatFloat(f interface{}, decimal int) string {
 func FormatFloat2(f interface{}) string {
 	return FormatFloat(f, 2)
 }
+
+var decimalReg = regexp.MustCompile(`^(\d+\.\d+)([a-zA-Z]+)?$`)
+
+// TrimZeroSuffix 去除小数数字尾部多余的0
+func TrimZeroSuffix(s string) string {
+	var matches = decimalReg.FindStringSubmatch(s)
+	if len(matches) < 3 {
+		return s
+	}
+	return strings.TrimRight(strings.TrimRight(matches[1], "0"), ".") + matches[2]
+}
+
+func formatDigit(d string) string {
+	if len(d) == 0 {
+		return d
+	}
+
+	var prefix = ""
+	if d[0] < '0' || d[0] > '9' {
+		prefix = d[:1]
+		d = d[1:]
+	}
+
+	var l = len(d)
+	if l > 3 {
+		var pieces = l / 3
+		var commIndex = l - pieces*3
+		var d2 = ""
+		if commIndex > 0 {
+			d2 = d[:commIndex] + ", "
+		}
+		for i := 0; i < pieces; i++ {
+			d2 += d[commIndex+i*3 : commIndex+i*3+3]
+			if i != pieces-1 {
+				d2 += ", "
+			}
+		}
+		return prefix + d2
+	}
+	return prefix + d
+}
--- a/internal/utils/numberutils/utils_test.go
+++ b/internal/utils/numberutils/utils_test.go
@@ -33,4 +33,35 @@ func TestFormatFloat(t *testing.T) {
 	t.Log(numberutils.FormatFloat(100.23456, 2))
 	t.Log(numberutils.FormatFloat(100.000023, 2))
 	t.Log(numberutils.FormatFloat(100.012, 2))
+	t.Log(numberutils.FormatFloat(123.012, 2))
+	t.Log(numberutils.FormatFloat(1234.012, 2))
+	t.Log(numberutils.FormatFloat(12345.012, 2))
+	t.Log(numberutils.FormatFloat(123456.012, 2))
+	t.Log(numberutils.FormatFloat(1234567.012, 2))
+	t.Log(numberutils.FormatFloat(12345678.012, 2))
+	t.Log(numberutils.FormatFloat(123456789.012, 2))
+	t.Log(numberutils.FormatFloat(1234567890.012, 2))
+	t.Log(numberutils.FormatFloat(123, 2))
+	t.Log(numberutils.FormatFloat(1234, 2))
+	t.Log(numberutils.FormatFloat(1234.00001, 4))
+	t.Log(numberutils.FormatFloat(1234.56700, 4))
+	t.Log(numberutils.FormatFloat(-1234.56700, 2))
+	t.Log(numberutils.FormatFloat(-221745.12, 2))
+}
+
+func TestTrimZeroSuffix(t *testing.T) {
+	for _, s := range []string{
+		"1",
+		"1.0000",
+		"1.10",
+		"100",
+		"100.0000",
+		"100.0",
+		"100.0123",
+		"100.0010",
+		"100.000KB",
+		"100.010MB",
+	} {
+		t.Log(s, "=>", numberutils.TrimZeroSuffix(s))
+	}
 }
--- a/internal/utils/time.go
+++ b/internal/utils/time.go
@@ -0,0 +1,55 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package utils
+
+import (
+	"errors"
+	"fmt"
+	"github.com/iwind/TeaGo/types"
+	"regexp"
+)
+
+// RangeTimes 计算时间点
+func RangeTimes(timeFrom string, timeTo string, everyMinutes int32) (result []string, err error) {
+	if everyMinutes <= 0 {
+		return nil, errors.New("invalid 'everyMinutes'")
+	}
+
+	var reg = regexp.MustCompile(`^\d{4}$`)
+	if !reg.MatchString(timeFrom) {
+		return nil, errors.New("invalid timeFrom '" + timeFrom + "'")
+	}
+	if !reg.MatchString(timeTo) {
+		return nil, errors.New("invalid timeTo '" + timeTo + "'")
+	}
+
+	if timeFrom > timeTo {
+		// swap
+		timeFrom, timeTo = timeTo, timeFrom
+	}
+
+	var everyMinutesInt = int(everyMinutes)
+
+	var fromHour = types.Int(timeFrom[:2])
+	var fromMinute = types.Int(timeFrom[2:])
+	var toHour = types.Int(timeTo[:2])
+	var toMinute = types.Int(timeTo[2:])
+
+	if fromMinute%everyMinutesInt == 0 {
+		result = append(result, timeFrom)
+	}
+
+	for {
+		fromMinute += everyMinutesInt
+		if fromMinute > 59 {
+			fromHour += fromMinute / 60
+			fromMinute = fromMinute % 60
+		}
+		if fromHour > toHour || (fromHour == toHour && fromMinute > toMinute) {
+			break
+		}
+		result = append(result, fmt.Sprintf("%02d%02d", fromHour, fromMinute))
+	}
+
+	return
+}
--- a/internal/utils/upgrade_manager.go
+++ b/internal/utils/upgrade_manager.go
@@ -52,11 +52,14 @@ type UpgradeManager struct {
 	writer        *UpgradeFileWriter
 	body          io.ReadCloser
 	isCancelled   bool
+
+	downloadURL string
 }

-func NewUpgradeManager(component string) *UpgradeManager {
+func NewUpgradeManager(component string, downloadURL string) *UpgradeManager {
 	return &UpgradeManager{
-		component: component,
+		component:   component,
+		downloadURL: downloadURL,
 		client: &http.Client{
 			Transport: &http.Transport{
 				TLSClientConfig: &tls.Config{
@@ -96,8 +99,8 @@ func (this *UpgradeManager) Start() error {
 	}

 	// 检查新版本
-	var downloadURL = ""
-	{
+	var downloadURL = this.downloadURL
+	if len(downloadURL) == 0 {
 		var url = teaconst.UpdatesURL
 		var osName = runtime.GOOS
 		if Tea.IsTesting() && osName == "darwin" {
@@ -105,10 +108,12 @@ func (this *UpgradeManager) Start() error {
 		}
 		url = strings.ReplaceAll(url, "${os}", osName)
 		url = strings.ReplaceAll(url, "${arch}", runtime.GOARCH)
+		url = strings.ReplaceAll(url, "${version}", teaconst.Version)
 		req, err := http.NewRequest(http.MethodGet, url, nil)
 		if err != nil {
 			return errors.New("create url request failed: " + err.Error())
 		}
+		req.Header.Set("User-Agent", "Edge-Admin/"+teaconst.Version)

 		resp, err := this.client.Do(req)
 		if err != nil {
@@ -169,6 +174,7 @@ func (this *UpgradeManager) Start() error {
 		if err != nil {
 			return errors.New("create download request failed: " + err.Error())
 		}
+		req.Header.Set("User-Agent", "Edge-Admin/"+teaconst.Version)

 		resp, err := this.client.Do(req)
 		if err != nil {
--- a/internal/web/actions/actionutils/parent_action.go
+++ b/internal/web/actions/actionutils/parent_action.go
@@ -49,7 +49,11 @@ func (this *ParentAction) ErrorText(err string) {
 }

 func (this *ParentAction) NotFound(name string, itemId int64) {
-	this.ErrorPage(errors.New(name + " id: '" + strconv.FormatInt(itemId, 10) + "' is not found"))
+	if itemId > 0 {
+		this.ErrorPage(errors.New(name + " id: '" + strconv.FormatInt(itemId, 10) + "' is not found"))
+	} else {
+		this.ErrorPage(errors.New(name + " is not found"))
+	}
 }

 func (this *ParentAction) NewPage(total int64, size ...int64) *Page {
@@ -126,11 +130,8 @@ func (this *ParentAction) RPC() *rpc.RPCClient {
 }

 // AdminContext 获取Context
+// 每个请求的context都必须是一个新的实例
 func (this *ParentAction) AdminContext() context.Context {
-	if this.ctx != nil {
-		return this.ctx
-	}
-
 	if this.rpcClient == nil {
 		rpcClient, err := rpc.SharedRPC()
 		if err != nil {
--- a/internal/web/actions/default/admins/init.go
+++ b/internal/web/actions/default/admins/init.go
@@ -22,7 +22,7 @@ func init() {
 			Post("/options", new(OptionsAction)).

 			// AccessKeys
-			Prefix("/admins/accessKeys").
+			Prefix("/admins/accesskeys").
 			Get("", new(accesskeys.IndexAction)).
 			GetPost("/createPopup", new(accesskeys.CreatePopupAction)).
 			Post("/delete", new(accesskeys.DeleteAction)).
--- a/internal/web/actions/default/api/index.go
+++ b/internal/web/actions/default/api/index.go
@@ -3,12 +3,15 @@ package api
 import (
 	"encoding/json"
 	"fmt"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/apinodeutils"
 	"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/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
+	stringutil "github.com/iwind/TeaGo/utils/string"
 	timeutil "github.com/iwind/TeaGo/utils/time"
 	"time"
 )
@@ -44,7 +47,7 @@ func (this *IndexAction) RunGet(params struct{}) {

 		for _, node := range nodesResp.ApiNodes {
 			// 状态
-			status := &nodeconfigs.NodeStatus{}
+			var status = &nodeconfigs.NodeStatus{}
 			if len(node.StatusJSON) > 0 {
 				err = json.Unmarshal(node.StatusJSON, &status)
 				if err != nil {
@@ -55,7 +58,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 			}

 			// Rest地址
-			restAccessAddrs := []string{}
+			var restAccessAddrs = []string{}
 			if node.RestIsOn {
 				if len(node.RestHTTPJSON) > 0 {
 					httpConfig := &serverconfigs.HTTPProtocolConfig{}
@@ -86,6 +89,9 @@ func (this *IndexAction) RunGet(params struct{}) {
 				}
 			}

+			var shouldUpgrade = status.IsActive && len(status.BuildVersion) > 0 && stringutil.VersionCompare(teaconst.APINodeVersion, status.BuildVersion) > 0
+			canUpgrade, _ := apinodeutils.CanUpgrade(status.BuildVersion, status.OS, status.Arch)
+
 			nodeMaps = append(nodeMaps, maps.Map{
 				"id":              node.Id,
 				"isOn":            node.IsOn,
@@ -94,14 +100,17 @@ func (this *IndexAction) RunGet(params struct{}) {
 				"restAccessAddrs": restAccessAddrs,
 				"isPrimary":       node.IsPrimary,
 				"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),
-					"buildVersion": status.BuildVersion,
+					"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),
+					"buildVersion":  status.BuildVersion,
+					"latestVersion": teaconst.APINodeVersion,
+					"shouldUpgrade": shouldUpgrade,
+					"canUpgrade":    shouldUpgrade && canUpgrade,
 				},
 			})
 		}
--- a/internal/web/actions/default/api/node/createPopup.go
+++ b/internal/web/actions/default/api/node/createPopup.go
@@ -4,10 +4,12 @@ import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/lists"
 )

 type CreatePopupAction struct {
@@ -40,11 +42,11 @@ func (this *CreatePopupAction) 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)
@@ -64,15 +66,19 @@ func (this *CreatePopupAction) RunPost(params struct {
 	}

 	// Rest监听地址
-	restHTTPConfig := &serverconfigs.HTTPProtocolConfig{}
-	restHTTPSConfig := &serverconfigs.HTTPSProtocolConfig{}
+	var restHTTPConfig = &serverconfigs.HTTPProtocolConfig{}
+	var restHTTPSConfig = &serverconfigs.HTTPSProtocolConfig{}
 	if params.RestIsOn {
-		restListens := []*serverconfigs.NetworkAddressConfig{}
+		var restListens = []*serverconfigs.NetworkAddressConfig{}
 		err = json.Unmarshal(params.RestListensJSON, &restListens)
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
+		if len(restListens) == 0 {
+			this.Fail("请至少添加一个HTTP API监听端口")
+			return
+		}
 		for _, addr := range restListens {
 			if addr.Protocol.IsHTTPFamily() {
 				restHTTPConfig.IsOn = true
@@ -82,10 +88,35 @@ func (this *CreatePopupAction) RunPost(params struct {
 				restHTTPSConfig.Listen = append(restHTTPSConfig.Listen, addr)
 			}
 		}
+
+		// 是否有端口冲突
+		var rpcAddresses = []string{}
+		for _, listen := range listens {
+			err := listen.Init()
+			if err != nil {
+				this.Fail("校验配置失败：" + configutils.QuoteIP(listen.Host) + ":" + listen.PortRange + ": " + err.Error())
+				return
+			}
+			rpcAddresses = append(rpcAddresses, listen.Addresses()...)
+		}
+
+		for _, listen := range restListens {
+			err := listen.Init()
+			if err != nil {
+				this.Fail("校验配置失败：" + configutils.QuoteIP(listen.Host) + ":" + listen.PortRange + ": " + err.Error())
+				return
+			}
+			for _, address := range listen.Addresses() {
+				if lists.ContainsString(rpcAddresses, address) {
+					this.Fail("HTTP API地址 '" + address + "' 和 GRPC地址冲突，请修改后提交")
+					return
+				}
+			}
+		}
 	}

 	// 证书
-	certIds := []int64{}
+	var certIds = []int64{}
 	if len(params.CertIdsJSON) > 0 {
 		err = json.Unmarshal(params.CertIdsJSON, &certIds)
 		if err != nil {
@@ -97,7 +128,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		this.Fail("请添加至少一个证书")
 	}

-	certRefs := []*sslconfigs.SSLCertRef{}
+	var certRefs = []*sslconfigs.SSLCertRef{}
 	for _, certId := range certIds {
 		certRefs = append(certRefs, &sslconfigs.SSLCertRef{
 			IsOn:   true,
@@ -131,7 +162,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	}

 	// 访问地址
-	accessAddrs := []*serverconfigs.NetworkAddressConfig{}
+	var accessAddrs = []*serverconfigs.NetworkAddressConfig{}
 	err = json.Unmarshal(params.AccessAddrsJSON, &accessAddrs)
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/api/node/init.go
+++ b/internal/web/actions/default/api/node/init.go
@@ -24,7 +24,10 @@ func init() {
 			GetPost("/update", new(UpdateAction)).
 			Get("/install", new(InstallAction)).
 			Get("/logs", new(LogsAction)).
+			GetPost("/upgradePopup", new(UpgradePopupAction)).
+			Post("/upgradeCheck", new(UpgradeCheckAction)).

+			//
 			EndAll()
 	})
 }
--- a/internal/web/actions/default/api/node/update.go
+++ b/internal/web/actions/default/api/node/update.go
@@ -4,10 +4,12 @@ import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
 )

@@ -175,12 +177,16 @@ func (this *UpdateAction) RunPost(params struct {
 	var restHTTPConfig = &serverconfigs.HTTPProtocolConfig{}
 	var restHTTPSConfig = &serverconfigs.HTTPSProtocolConfig{}
 	if params.RestIsOn {
-		restListens := []*serverconfigs.NetworkAddressConfig{}
+		var restListens = []*serverconfigs.NetworkAddressConfig{}
 		err = json.Unmarshal(params.RestListensJSON, &restListens)
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
+		if len(restListens) == 0 {
+			this.Fail("请至少添加一个HTTP API监听端口")
+			return
+		}
 		for _, addr := range restListens {
 			if addr.Protocol.IsHTTPFamily() {
 				restHTTPConfig.IsOn = true
@@ -190,6 +196,31 @@ func (this *UpdateAction) RunPost(params struct {
 				restHTTPSConfig.Listen = append(restHTTPSConfig.Listen, addr)
 			}
 		}
+
+		// 是否有端口冲突
+		var rpcAddresses = []string{}
+		for _, listen := range listens {
+			err := listen.Init()
+			if err != nil {
+				this.Fail("校验配置失败：" + configutils.QuoteIP(listen.Host) + ":" + listen.PortRange + ": " + err.Error())
+				return
+			}
+			rpcAddresses = append(rpcAddresses, listen.Addresses()...)
+		}
+
+		for _, listen := range restListens {
+			err := listen.Init()
+			if err != nil {
+				this.Fail("校验配置失败：" + configutils.QuoteIP(listen.Host) + ":" + listen.PortRange + ": " + err.Error())
+				return
+			}
+			for _, address := range listen.Addresses() {
+				if lists.ContainsString(rpcAddresses, address) {
+					this.Fail("HTTP API地址 '" + address + "' 和 GRPC地址冲突，请修改后提交")
+					return
+				}
+			}
+		}
 	}

 	// 证书
--- a/internal/web/actions/default/api/node/upgradeCheck.go
+++ b/internal/web/actions/default/api/node/upgradeCheck.go
@@ -0,0 +1,67 @@
+// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package node
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+// UpgradeCheckAction 检查升级结果
+type UpgradeCheckAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpgradeCheckAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UpgradeCheckAction) RunPost(params struct {
+	NodeId int64
+}) {
+	this.Data["isOk"] = false
+
+	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{ApiNodeId: params.NodeId})
+	if err != nil {
+		this.Success()
+		return
+	}
+
+	var node = nodeResp.ApiNode
+	if node == nil || len(node.AccessAddrs) == 0 {
+		this.Success()
+		return
+	}
+
+	apiConfig, err := configs.LoadAPIConfig()
+	if err != nil {
+		this.Success()
+		return
+	}
+
+	var newAPIConfig = apiConfig.Clone()
+	newAPIConfig.RPC.Endpoints = node.AccessAddrs
+	rpcClient, err := rpc.NewRPCClient(newAPIConfig, false)
+	if err != nil {
+		this.Success()
+		return
+	}
+
+	versionResp, err := rpcClient.APINodeRPC().FindCurrentAPINodeVersion(rpcClient.Context(0), &pb.FindCurrentAPINodeVersionRequest{})
+	if err != nil {
+		this.Success()
+		return
+	}
+
+	if versionResp.Version != teaconst.Version {
+		this.Success()
+		return
+	}
+
+	this.Data["isOk"] = true
+
+	this.Success()
+}
--- a/internal/web/actions/default/api/node/upgradePopup.go
+++ b/internal/web/actions/default/api/node/upgradePopup.go
@@ -0,0 +1,124 @@
+// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package node
+
+import (
+	"encoding/json"
+	"errors"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/apinodeutils"
+	"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"
+	"strings"
+)
+
+type UpgradePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpgradePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UpgradePopupAction) RunGet(params struct {
+	NodeId int64
+}) {
+	this.Data["nodeId"] = params.NodeId
+	this.Data["nodeName"] = ""
+	this.Data["currentVersion"] = ""
+	this.Data["latestVersion"] = ""
+	this.Data["result"] = ""
+	this.Data["resultIsOk"] = true
+	this.Data["canUpgrade"] = false
+	this.Data["isUpgrading"] = false
+
+	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{ApiNodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var node = nodeResp.ApiNode
+	if node == nil {
+		this.Data["result"] = "要升级的节点不存在"
+		this.Data["resultIsOk"] = false
+		this.Show()
+		return
+	}
+	this.Data["nodeName"] = node.Name + " / [" + strings.Join(node.AccessAddrs, ", ") + "]"
+
+	// 节点状态
+	var status = &nodeconfigs.NodeStatus{}
+	if len(node.StatusJSON) > 0 {
+		err = json.Unmarshal(node.StatusJSON, &status)
+		if err != nil {
+			this.ErrorPage(errors.New("decode status failed: " + err.Error()))
+			return
+		}
+		this.Data["currentVersion"] = status.BuildVersion
+	} else {
+		this.Data["result"] = "无法检测到节点当前版本"
+		this.Data["resultIsOk"] = false
+		this.Show()
+		return
+	}
+	this.Data["latestVersion"] = teaconst.APINodeVersion
+
+	if status.IsActive && len(status.BuildVersion) > 0 {
+		canUpgrade, reason := apinodeutils.CanUpgrade(status.BuildVersion, status.OS, status.Arch)
+		if !canUpgrade {
+			this.Data["result"] = reason
+			this.Data["resultIsOk"] = false
+			this.Show()
+			return
+		}
+		this.Data["canUpgrade"] = true
+		this.Data["result"] = "等待升级"
+		this.Data["resultIsOk"] = true
+	} else {
+		this.Data["result"] = "当前节点非连接状态无法远程升级"
+		this.Data["resultIsOk"] = false
+		this.Show()
+		return
+	}
+
+	// 是否正在升级
+	var oldUpgrader = apinodeutils.SharedManager.FindUpgrader(params.NodeId)
+	if oldUpgrader != nil {
+		this.Data["result"] = "正在升级中..."
+		this.Data["resultIsOk"] = false
+		this.Data["isUpgrading"] = true
+	}
+
+	this.Show()
+}
+
+func (this *UpgradePopupAction) RunPost(params struct {
+	NodeId int64
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	var manager = apinodeutils.SharedManager
+
+	var oldUpgrader = manager.FindUpgrader(params.NodeId)
+	if oldUpgrader != nil {
+		this.Fail("正在升级中，无需重复提交 ...")
+		return
+	}
+
+	var upgrader = apinodeutils.NewUpgrader(params.NodeId)
+	manager.AddUpgrader(upgrader)
+	defer func() {
+		manager.RemoveUpgrader(upgrader)
+	}()
+
+	err := upgrader.Upgrade()
+	if err != nil {
+		this.Fail("升级失败：" + err.Error())
+		return
+	}
+
+	this.Success()
+}
--- a/internal/web/actions/default/clusters/cluster/node/detail.go
+++ b/internal/web/actions/default/clusters/cluster/node/detail.go
@@ -10,6 +10,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses/ipaddressutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/maps"
 	timeutil "github.com/iwind/TeaGo/utils/time"
 	"time"
@@ -88,7 +89,7 @@ func (this *DetailAction) RunGet(params struct {
 		return
 	}
 	var ipAddresses = ipAddressesResp.NodeIPAddresses
-	ipAddressMaps := []maps.Map{}
+	var ipAddressMaps = []maps.Map{}
 	for _, addr := range ipAddressesResp.NodeIPAddresses {
 		thresholds, err := ipaddressutils.InitNodeIPAddressThresholds(this.Parent(), addr.Id)
 		if err != nil {
@@ -102,6 +103,15 @@ func (this *DetailAction) RunGet(params struct {
 			addr.Ip = addr.BackupIP
 		}

+		// 专属集群
+		var addrClusterMaps = []maps.Map{}
+		for _, addrCluster := range addr.NodeClusters {
+			addrClusterMaps = append(addrClusterMaps, maps.Map{
+				"id":   addrCluster.Id,
+				"name": addrCluster.Name,
+			})
+		}
+
 		ipAddressMaps = append(ipAddressMaps, maps.Map{
 			"id":         addr.Id,
 			"name":       addr.Name,
@@ -110,6 +120,7 @@ func (this *DetailAction) RunGet(params struct {
 			"canAccess":  addr.CanAccess,
 			"isOn":       addr.IsOn,
 			"isUp":       addr.IsUp,
+			"clusters":   addrClusterMaps,
 			"thresholds": thresholds,
 		})
 	}
@@ -151,16 +162,31 @@ func (this *DetailAction) RunGet(params struct {
 			if !addr.CanAccess || !addr.IsUp || !addr.IsOn {
 				continue
 			}
+
+			// 过滤集群
+			if len(addr.NodeClusters) > 0 {
+				var inCluster = false
+				for _, addrCluster := range addr.NodeClusters {
+					if addrCluster.Id == cluster.Id {
+						inCluster = true
+					}
+				}
+				if !inCluster {
+					continue
+				}
+			}
+
 			for _, route := range dnsInfo.Routes {
 				var recordType = "A"
 				if utils.IsIPv6(addr.Ip) {
 					recordType = "AAAA"
 				}
 				recordMaps = append(recordMaps, maps.Map{
-					"name":  dnsInfo.NodeClusterDNSName + "." + domainName,
-					"type":  recordType,
-					"route": route.Name,
-					"value": addr.Ip,
+					"name":        dnsInfo.NodeClusterDNSName + "." + domainName,
+					"type":        recordType,
+					"route":       route.Name,
+					"value":       addr.Ip,
+					"clusterName": cluster.Name,
 				})
 			}
 		}
@@ -178,8 +204,8 @@ func (this *DetailAction) RunGet(params struct {
 			}
 		}

-		grantMap := maps.Map{}
-		grantId := loginParams.GetInt64("grantId")
+		var grantMap = maps.Map{}
+		var grantId = loginParams.GetInt64("grantId")
 		if grantId > 0 {
 			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
 			if err != nil {
@@ -300,6 +326,22 @@ func (this *DetailAction) RunGet(params struct {
 		lnAddrs = []string{}
 	}

+	// API节点地址
+	var apiNodeAddrStrings = []string{}
+	var apiNodeAddrs = []*serverconfigs.NetworkAddressConfig{}
+	if len(node.ApiNodeAddrsJSON) > 0 {
+		err = json.Unmarshal(node.ApiNodeAddrsJSON, &apiNodeAddrs)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		for _, addr := range apiNodeAddrs {
+			if addr.Init() == nil {
+				apiNodeAddrStrings = append(apiNodeAddrStrings, addr.FullAddresses()...)
+			}
+		}
+	}
+
 	this.Data["node"] = maps.Map{
 		"id":                node.Id,
 		"name":              node.Name,
@@ -318,6 +360,8 @@ func (this *DetailAction) RunGet(params struct {
 		"level":             node.Level,
 		"levelInfo":         nodeconfigs.FindNodeLevel(int(node.Level)),
 		"lnAddrs":           lnAddrs,
+		"enableIPLists":     node.EnableIPLists,
+		"apiNodeAddrs":      apiNodeAddrStrings,

 		"status": maps.Map{
 			"isActive":             status.IsActive,
@@ -337,6 +381,8 @@ func (this *DetailAction) RunGet(params struct {
 			"cacheTotalDiskSize":   numberutils.FormatBytes(status.CacheTotalDiskSize),
 			"cacheTotalMemorySize": numberutils.FormatBytes(status.CacheTotalMemorySize),
 			"exePath":              status.ExePath,
+			"apiSuccessPercent":    status.APISuccessPercent,
+			"apiAvgCostSeconds":    status.APIAvgCostSeconds,
 		},

 		"group":  groupMap,
--- a/internal/web/actions/default/clusters/cluster/node/settings/cache/index.go
+++ b/internal/web/actions/default/clusters/cluster/node/settings/cache/index.go
@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
@@ -57,9 +58,19 @@ func (this *IndexAction) RunGet(params struct {
 		}
 	}

+	var diskSubDirs = []*serverconfigs.CacheDir{}
+	if len(node.CacheDiskSubDirsJSON) > 0 {
+		err = json.Unmarshal(node.CacheDiskSubDirsJSON, &diskSubDirs)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
 	var nodeMap = this.Data["node"].(maps.Map)
 	nodeMap["maxCacheDiskCapacity"] = maxCacheDiskCapacity
 	nodeMap["cacheDiskDir"] = node.CacheDiskDir
+	nodeMap["cacheDiskSubDirs"] = diskSubDirs
 	nodeMap["maxCacheMemoryCapacity"] = maxCacheMemoryCapacity

 	this.Show()
@@ -69,6 +80,7 @@ func (this *IndexAction) RunPost(params struct {
 	NodeId                     int64
 	MaxCacheDiskCapacityJSON   []byte
 	CacheDiskDir               string
+	CacheDiskSubDirsJSON       []byte
 	MaxCacheMemoryCapacityJSON []byte

 	Must *actions.Must
@@ -105,10 +117,20 @@ func (this *IndexAction) RunPost(params struct {
 		}
 	}

+	if len(params.CacheDiskSubDirsJSON) > 0 {
+		var cacheSubDirs = []*serverconfigs.CacheDir{}
+		err := json.Unmarshal(params.CacheDiskSubDirsJSON, &cacheSubDirs)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
 	_, err := this.RPC().NodeRPC().UpdateNodeCache(this.AdminContext(), &pb.UpdateNodeCacheRequest{
 		NodeId:                 params.NodeId,
 		MaxCacheDiskCapacity:   pbMaxCacheDiskCapacity,
 		CacheDiskDir:           params.CacheDiskDir,
+		CacheDiskSubDirsJSON:   params.CacheDiskSubDirsJSON,
 		MaxCacheMemoryCapacity: pbMaxCacheMemoryCapacity,
 	})
 	if err != nil {
--- a/internal/web/actions/default/clusters/cluster/node/settings/system/index.go
+++ b/internal/web/actions/default/clusters/cluster/node/settings/system/index.go
@@ -8,6 +8,7 @@ import (
 	"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"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
@@ -50,6 +51,22 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["dnsResolverConfig"] = dnsResolverConfig

+	// API相关
+	apiConfigResp, err := this.RPC().NodeRPC().FindNodeAPIConfig(this.AdminContext(), &pb.FindNodeAPIConfigRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var apiNodeAddrs = []*serverconfigs.NetworkAddressConfig{}
+	if len(apiConfigResp.ApiNodeAddrsJSON) > 0 {
+		err = json.Unmarshal(apiConfigResp.ApiNodeAddrsJSON, &apiNodeAddrs)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+	this.Data["apiNodeAddrs"] = apiNodeAddrs
+
 	this.Show()
 }

@@ -59,6 +76,8 @@ func (this *IndexAction) RunPost(params struct {

 	DnsResolverJSON []byte

+	ApiNodeAddrsJSON []byte
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
@@ -68,6 +87,7 @@ func (this *IndexAction) RunPost(params struct {
 		this.Fail("CPU线程数不能小于0")
 	}

+	// 系统设置
 	_, err := this.RPC().NodeRPC().UpdateNodeSystem(this.AdminContext(), &pb.UpdateNodeSystemRequest{
 		NodeId: params.NodeId,
 		MaxCPU: params.MaxCPU,
@@ -77,6 +97,7 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}

+	// DNS解析设置
 	var dnsResolverConfig = nodeconfigs.DefaultDNSResolverConfig()
 	err = json.Unmarshal(params.DnsResolverJSON, dnsResolverConfig)
 	if err != nil {
@@ -98,5 +119,28 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}

+	// API节点设置
+	var apiNodeAddrs = []*serverconfigs.NetworkAddressConfig{}
+	if len(params.ApiNodeAddrsJSON) > 0 {
+		err = json.Unmarshal(params.ApiNodeAddrsJSON, &apiNodeAddrs)
+		if err != nil {
+			this.Fail("API节点地址校验错误：" + err.Error())
+		}
+		for _, addr := range apiNodeAddrs {
+			err = addr.Init()
+			if err != nil {
+				this.Fail("API节点地址校验错误：" + err.Error())
+			}
+		}
+	}
+	_, err = this.RPC().NodeRPC().UpdateNodeAPIConfig(this.AdminContext(), &pb.UpdateNodeAPIConfigRequest{
+		NodeId:           params.NodeId,
+		ApiNodeAddrsJSON: params.ApiNodeAddrsJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Success()
 }
--- a/internal/web/actions/default/clusters/cluster/node/update.go
+++ b/internal/web/actions/default/clusters/cluster/node/update.go
@@ -64,12 +64,22 @@ func (this *UpdateAction) RunGet(params struct {
 	}
 	var ipAddressMaps = []maps.Map{}
 	for _, addr := range ipAddressesResp.NodeIPAddresses {
+		// 阈值
 		thresholds, err := ipaddressutils.InitNodeIPAddressThresholds(this.Parent(), addr.Id)
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}

+		// 专属集群
+		var clusterMaps = []maps.Map{}
+		for _, addrCluster := range addr.NodeClusters {
+			clusterMaps = append(clusterMaps, maps.Map{
+				"id":   addrCluster.Id,
+				"name": addrCluster.Name,
+			})
+		}
+
 		ipAddressMaps = append(ipAddressMaps, maps.Map{
 			"id":         addr.Id,
 			"name":       addr.Name,
@@ -78,6 +88,7 @@ func (this *UpdateAction) RunGet(params struct {
 			"isOn":       addr.IsOn,
 			"isUp":       addr.IsUp,
 			"thresholds": thresholds,
+			"clusters":   clusterMaps,
 		})
 	}

@@ -100,14 +111,15 @@ func (this *UpdateAction) RunGet(params struct {
 	}

 	var nodeMap = maps.Map{
-		"id":          node.Id,
-		"name":        node.Name,
-		"ipAddresses": ipAddressMaps,
-		"cluster":     clusterMap,
-		"isOn":        node.IsOn,
-		"group":       groupMap,
-		"region":      regionMap,
-		"level":       node.Level,
+		"id":            node.Id,
+		"name":          node.Name,
+		"ipAddresses":   ipAddressMaps,
+		"cluster":       clusterMap,
+		"isOn":          node.IsOn,
+		"group":         groupMap,
+		"region":        regionMap,
+		"level":         node.Level,
+		"enableIPLists": node.EnableIPLists,
 	}

 	if node.LnAddrs == nil {
@@ -157,6 +169,7 @@ func (this *UpdateAction) RunPost(params struct {
 	IsOn                bool
 	Level               int32
 	LnAddrs             []string
+	EnableIPLists       bool

 	Must *actions.Must
 }) {
@@ -234,6 +247,7 @@ func (this *UpdateAction) RunPost(params struct {
 		IsOn:                    params.IsOn,
 		Level:                   params.Level,
 		LnAddrs:                 lnAddrs,
+		EnableIPLists:           params.EnableIPLists,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/clusters/cluster/nodes.go
+++ b/internal/web/actions/default/clusters/cluster/nodes.go
@@ -142,8 +142,17 @@ func (this *NodesAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		ipAddresses := []maps.Map{}
+		var ipAddresses = []maps.Map{}
 		for _, addr := range ipAddressesResp.NodeIPAddresses {
+			// 专属集群
+			var addrClusterMaps = []maps.Map{}
+			for _, addrCluster := range addr.NodeClusters {
+				addrClusterMaps = append(addrClusterMaps, maps.Map{
+					"id":   addrCluster.Id,
+					"name": addrCluster.Name,
+				})
+			}
+
 			ipAddresses = append(ipAddresses, maps.Map{
 				"id":        addr.Id,
 				"name":      addr.Name,
@@ -151,6 +160,7 @@ func (this *NodesAction) RunGet(params struct {
 				"canAccess": addr.CanAccess,
 				"isUp":      addr.IsUp,
 				"isOn":      addr.IsOn,
+				"clusters":  addrClusterMaps,
 			})
 		}

--- a/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go
+++ b/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go
@@ -78,8 +78,18 @@ func (this *IndexAction) RunPost(params struct {
 	HttpAllAllowNodeIP                     bool
 	HttpAllDefaultDomain                   string

+	HttpAccessLogEnableRequestHeaders     bool
+	HttpAccessLogEnableResponseHeaders    bool
+	HttpAccessLogCommonRequestHeadersOnly bool
+	HttpAccessLogEnableCookies            bool
+	HttpAccessLogEnableServerNotFound     bool
+
 	LogRecordServerError bool

+	PerformanceAutoReadTimeout  bool
+	PerformanceAutoWriteTimeout bool
+	PerformanceDebug            bool
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
@@ -119,12 +129,26 @@ func (this *IndexAction) RunPost(params struct {
 		}
 	}

+	// 域名
 	config.HTTPAll.AllowMismatchDomains = allowMismatchDomains
 	config.HTTPAll.AllowNodeIP = params.HttpAllAllowNodeIP
 	config.HTTPAll.DefaultDomain = params.HttpAllDefaultDomain

+	// 访问日志
+	config.HTTPAccessLog.EnableRequestHeaders = params.HttpAccessLogEnableRequestHeaders
+	config.HTTPAccessLog.EnableResponseHeaders = params.HttpAccessLogEnableResponseHeaders
+	config.HTTPAccessLog.CommonRequestHeadersOnly = params.HttpAccessLogCommonRequestHeadersOnly
+	config.HTTPAccessLog.EnableCookies = params.HttpAccessLogEnableCookies
+	config.HTTPAccessLog.EnableServerNotFound = params.HttpAccessLogEnableServerNotFound
+
+	// 日志
 	config.Log.RecordServerError = params.LogRecordServerError

+	// 性能
+	config.Performance.AutoReadTimeout = params.PerformanceAutoReadTimeout
+	config.Performance.AutoWriteTimeout = params.PerformanceAutoWriteTimeout
+	config.Performance.Debug = params.PerformanceDebug
+
 	err = config.Init()
 	if err != nil {
 		this.Fail("配置校验失败：" + err.Error())
--- a/internal/web/actions/default/clusters/cluster/settings/index.go
+++ b/internal/web/actions/default/clusters/cluster/settings/index.go
@@ -45,7 +45,7 @@ func (this *IndexAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		grant := grantResp.NodeGrant
+		var grant = grantResp.NodeGrant
 		if grant != nil {
 			grantMap = maps.Map{
 				"id":         grant.Id,
@@ -79,6 +79,29 @@ func (this *IndexAction) RunGet(params struct {
 		}
 	}

+	// SSH参数
+	var sshParams = nodeconfigs.DefaultSSHParams()
+	if len(cluster.SshParamsJSON) > 0 {
+		err = json.Unmarshal(cluster.SshParamsJSON, sshParams)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	// DNS信息
+	var fullDomainName = ""
+	if len(cluster.DnsName) > 0 && cluster.DnsDomainId > 0 {
+		domainResp, err := this.RPC().DNSDomainRPC().FindBasicDNSDomain(this.AdminContext(), &pb.FindBasicDNSDomainRequest{DnsDomainId: cluster.DnsDomainId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if domainResp.DnsDomain != nil {
+			fullDomainName = cluster.DnsName + "." + domainResp.DnsDomain.Name
+		}
+	}
+
 	this.Data["cluster"] = maps.Map{
 		"id":                  cluster.Id,
 		"name":                cluster.Name,
@@ -89,6 +112,8 @@ func (this *IndexAction) RunGet(params struct {
 		"clock":               clockConfig,
 		"autoRemoteStart":     cluster.AutoRemoteStart,
 		"autoInstallNftables": cluster.AutoInstallNftables,
+		"sshParams":           sshParams,
+		"domainName":          fullDomainName,
 	}

 	// 默认值
@@ -104,12 +129,14 @@ func (this *IndexAction) RunPost(params struct {
 	ClusterId           int64
 	Name                string
 	GrantId             int64
+	SshParamsPort       int
 	InstallDir          string
 	TimeZone            string
 	NodeMaxThreads      int32
 	AutoOpenPorts       bool
 	ClockAutoSync       bool
 	ClockServer         string
+	ClockCheckChrony    bool
 	AutoRemoteStart     bool
 	AutoInstallNftables bool

@@ -129,9 +156,20 @@ func (this *IndexAction) RunPost(params struct {
 			Lte(int64(nodeconfigs.DefaultMaxThreadsMax), "单节点最大线程数最大值不能大于"+types.String(nodeconfigs.DefaultMaxThreadsMax))
 	}

+	// ssh
+	var sshParams = nodeconfigs.DefaultSSHParams()
+	sshParams.Port = params.SshParamsPort
+	sshParamsJSON, err := json.Marshal(sshParams)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// clock
 	var clockConfig = nodeconfigs.DefaultClockConfig()
 	clockConfig.AutoSync = params.ClockAutoSync
 	clockConfig.Server = params.ClockServer
+	clockConfig.CheckChrony = params.ClockCheckChrony
 	clockConfigJSON, err := json.Marshal(clockConfig)
 	if err != nil {
 		this.ErrorPage(err)
@@ -155,6 +193,7 @@ func (this *IndexAction) RunPost(params struct {
 		ClockJSON:           clockConfigJSON,
 		AutoRemoteStart:     params.AutoRemoteStart,
 		AutoInstallNftables: params.AutoInstallNftables,
+		SshParamsJSON:       sshParamsJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go
+++ b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go
@@ -60,7 +60,7 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext
 		var tabbar = actionutils.NewTabbar()
 		tabbar.Add("集群列表", "", "/clusters", "", false)
 		if teaconst.IsPlus {
-			tabbar.Add("集群看板", "", "/clusters/cluster/boards?clusterId="+clusterIdString, "board", selectedTabbar == "board")
+			tabbar.Add("集群看板", "", "/clusters/cluster/boards?clusterId="+clusterIdString, "chart line area", selectedTabbar == "board")
 		}
 		tabbar.Add("集群节点", "", "/clusters/cluster/nodes?clusterId="+clusterIdString, "server", selectedTabbar == "node")
 		tabbar.Add("集群设置", "", "/clusters/cluster/settings?clusterId="+clusterIdString, "setting", selectedTabbar == "setting")
@@ -68,7 +68,7 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext
 		actionutils.SetTabbar(action, tabbar)

 		// 左侧菜单
-		secondMenuItem := action.Data.GetString("secondMenuItem")
+		var secondMenuItem = action.Data.GetString("secondMenuItem")
 		switch selectedTabbar {
 		case "setting":
 			var menuItems = this.createSettingMenu(cluster, clusterInfo, secondMenuItem)
--- a/internal/web/actions/default/clusters/logs/deleteAll.go
+++ b/internal/web/actions/default/clusters/logs/deleteAll.go
@@ -0,0 +1,60 @@
+// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package logs
+
+import (
+	"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"
+)
+
+type DeleteAllAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteAllAction) RunPost(params struct {
+	DayFrom   string
+	DayTo     string
+	Keyword   string
+	Level     string
+	Type      string // unread, needFix
+	Tag       string
+	ClusterId int64
+	NodeId    int64
+}) {
+	defer this.CreateLogInfo("批量删除节点运行日志")
+
+	// 目前仅允许通过关键词删除，防止误删
+	if len(params.Keyword) == 0 {
+		this.Fail("目前仅允许通过关键词删除")
+		return
+	}
+
+	var fixedState configutils.BoolState = 0
+	var allServers = false
+	if params.Type == "needFix" {
+		fixedState = configutils.BoolStateNo
+		allServers = true
+	}
+
+	_, err := this.RPC().NodeLogRPC().DeleteNodeLogs(this.AdminContext(), &pb.DeleteNodeLogsRequest{
+		NodeClusterId: params.ClusterId,
+		NodeId:        params.NodeId,
+		Role:          nodeconfigs.NodeRoleNode,
+		DayFrom:       params.DayFrom,
+		DayTo:         params.DayTo,
+		Keyword:       params.Keyword,
+		Level:         params.Level,
+		IsUnread:      params.Type == "unread",
+		Tag:           params.Tag,
+		FixedState:    int32(fixedState),
+		AllServers:    allServers,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}
--- a/internal/web/actions/default/clusters/logs/index.go
+++ b/internal/web/actions/default/clusters/logs/index.go
@@ -39,6 +39,7 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["dayFrom"] = params.DayFrom
 	this.Data["dayTo"] = params.DayTo
 	this.Data["keyword"] = params.Keyword
+	this.Data["searchedKeyword"] = params.Keyword
 	this.Data["level"] = params.Level
 	this.Data["type"] = params.Type
 	this.Data["tag"] = params.Tag
@@ -97,6 +98,8 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 	var count = countResp.Count
+	this.Data["countLogs"] = count
+
 	var page = this.NewPage(count)
 	this.Data["page"] = page.AsHTML()

--- a/internal/web/actions/default/clusters/logs/init.go
+++ b/internal/web/actions/default/clusters/logs/init.go
@@ -18,6 +18,7 @@ func init() {
 			Post("/readAllLogs", new(ReadAllLogsAction)).
 			Post("/fix", new(FixAction)).
 			Post("/fixAll", new(FixAllAction)).
+			Post("/deleteAll", new(DeleteAllAction)).
 			EndAll()
 	})
 }
--- a/internal/web/actions/default/clusters/nodes.go
+++ b/internal/web/actions/default/clusters/nodes.go
@@ -144,8 +144,17 @@ func (this *NodesAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		ipAddresses := []maps.Map{}
+		var ipAddresses = []maps.Map{}
 		for _, addr := range ipAddressesResp.NodeIPAddresses {
+			// 专属集群
+			var addrClusterMaps = []maps.Map{}
+			for _, addrCluster := range addr.NodeClusters {
+				addrClusterMaps = append(addrClusterMaps, maps.Map{
+					"id":   addrCluster.Id,
+					"name": addrCluster.Name,
+				})
+			}
+
 			ipAddresses = append(ipAddresses, maps.Map{
 				"id":        addr.Id,
 				"name":      addr.Name,
@@ -153,6 +162,7 @@ func (this *NodesAction) RunGet(params struct {
 				"canAccess": addr.CanAccess,
 				"isUp":      addr.IsUp,
 				"isOn":      addr.IsOn,
+				"clusters":  addrClusterMaps,
 			})
 		}

@@ -175,7 +185,7 @@ func (this *NodesAction) RunGet(params struct {
 		}

 		// DNS
-		dnsRouteNames := []string{}
+		var dnsRouteNames = []string{}
 		for _, route := range node.DnsRoutes {
 			dnsRouteNames = append(dnsRouteNames, route.Name)
 		}
--- a/internal/web/actions/default/clusters/regions/index.go
+++ b/internal/web/actions/default/clusters/regions/index.go
@@ -11,7 +11,7 @@ type IndexAction struct {
 }

 func (this *IndexAction) Init() {
-	this.Nav("", "", "region")
+	this.Nav("", "", "index")
 }

 func (this *IndexAction) RunGet(params struct{}) {
@@ -20,7 +20,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 		this.ErrorPage(err)
 		return
 	}
-	regionMaps := []maps.Map{}
+	var regionMaps = []maps.Map{}
 	for _, region := range regionsResp.NodeRegions {
 		countNodesResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeRegionId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeRegionIdRequest{NodeRegionId: region.Id})
 		if err != nil {
--- a/internal/web/actions/default/clusters/regions/init.go
+++ b/internal/web/actions/default/clusters/regions/init.go
@@ -18,9 +18,13 @@ func init() {
 			GetPost("/updatePopup", new(UpdatePopupAction)).
 			Post("/delete", new(DeleteAction)).
 			Post("/sort", new(SortAction)).
+			Get("/nodes", new(NodesAction)).
+			GetPost("/updateNodeRegionPopup", new(UpdateNodeRegionPopupAction)).
+
+			//
 			GetPost("/selectPopup", new(SelectPopupAction)).
-			GetPost("/prices", new(PricesAction)).
-			GetPost("/updatePricePopup", new(UpdatePricePopupAction)).
+
+			//
 			EndAll()
 	})
 }
--- a/internal/web/actions/default/clusters/regions/items/createPopup.go
+++ b/internal/web/actions/default/clusters/regions/items/createPopup.go
@@ -1,50 +0,0 @@
-package items
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/regions/regionutils"
-	"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{}) {
-	this.Show()
-}
-
-func (this *CreatePopupAction) RunPost(params struct {
-	Name     string
-	BitsFrom int64
-	BitsTo   int64
-
-	Must *actions.Must
-	CSRF *actionutils.CSRF
-}) {
-	params.Must.
-		Field("name", params.Name).
-		Require("请输入名称").
-		Field("bitsFrom", params.BitsFrom).
-		Gte(0, "请输入不小于0的整数").
-		Field("bitsTo", params.BitsTo).
-		Gte(0, "请输入不小于0的整数")
-
-	createResp, err := this.RPC().NodePriceItemRPC().CreateNodePriceItem(this.AdminContext(), &pb.CreateNodePriceItemRequest{
-		Name:     params.Name,
-		Type:     regionutils.PriceTypeTraffic,
-		BitsFrom: params.BitsFrom * 1000 * 1000,
-		BitsTo:   params.BitsTo * 1000 * 1000,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	defer this.CreateLogInfo("创建流量价格项目", createResp.NodePriceItemId)
-	this.Success()
-}
--- a/internal/web/actions/default/clusters/regions/items/delete.go
+++ b/internal/web/actions/default/clusters/regions/items/delete.go
@@ -1,24 +0,0 @@
-package items
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-)
-
-type DeleteAction struct {
-	actionutils.ParentAction
-}
-
-func (this *DeleteAction) RunPost(params struct {
-	ItemId int64
-}) {
-	defer this.CreateLogInfo("删除流量价格项目 %d", params.ItemId)
-
-	_, err := this.RPC().NodePriceItemRPC().DeleteNodePriceItem(this.AdminContext(), &pb.DeleteNodePriceItemRequest{NodePriceItemId: params.ItemId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Success()
-}
--- a/internal/web/actions/default/clusters/regions/items/init.go
+++ b/internal/web/actions/default/clusters/regions/items/init.go
@@ -1,21 +0,0 @@
-package items
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
-	"github.com/iwind/TeaGo"
-)
-
-func init() {
-	TeaGo.BeforeStart(func(server *TeaGo.Server) {
-		server.
-			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNode)).
-			Data("teaMenu", "clusters").
-			Data("teaSubMenu", "region").
-			Prefix("/clusters/regions/items").
-			GetPost("/createPopup", new(CreatePopupAction)).
-			GetPost("/updatePopup", new(UpdatePopupAction)).
-			Post("/delete", new(DeleteAction)).
-			EndAll()
-	})
-}
--- a/internal/web/actions/default/clusters/regions/items/updatePopup.go
+++ b/internal/web/actions/default/clusters/regions/items/updatePopup.go
@@ -1,73 +0,0 @@
-package items
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/actions"
-	"github.com/iwind/TeaGo/maps"
-)
-
-type UpdatePopupAction struct {
-	actionutils.ParentAction
-}
-
-func (this *UpdatePopupAction) Init() {
-	this.Nav("", "", "")
-}
-
-func (this *UpdatePopupAction) RunGet(params struct {
-	ItemId int64
-}) {
-	itemResp, err := this.RPC().NodePriceItemRPC().FindEnabledNodePriceItem(this.AdminContext(), &pb.FindEnabledNodePriceItemRequest{NodePriceItemId: params.ItemId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	item := itemResp.NodePriceItem
-	if item == nil {
-		this.NotFound("nodePriceItem", params.ItemId)
-		return
-	}
-
-	this.Data["item"] = maps.Map{
-		"id":       item.Id,
-		"name":     item.Name,
-		"bitsFrom": item.BitsFrom,
-		"bitsTo":   item.BitsTo,
-	}
-
-	this.Show()
-}
-
-func (this *UpdatePopupAction) RunPost(params struct {
-	ItemId   int64
-	Name     string
-	BitsFrom int64
-	BitsTo   int64
-
-	Must *actions.Must
-	CSRF *actionutils.CSRF
-}) {
-	defer this.CreateLogInfo("修改流量价格项目 %d", params.ItemId)
-
-	params.Must.
-		Field("name", params.Name).
-		Require("请输入名称").
-		Field("bitsFrom", params.BitsFrom).
-		Gte(0, "请输入不小于0的整数").
-		Field("bitsTo", params.BitsTo).
-		Gte(0, "请输入不小于0的整数")
-
-	_, err := this.RPC().NodePriceItemRPC().UpdateNodePriceItem(this.AdminContext(), &pb.UpdateNodePriceItemRequest{
-		NodePriceItemId: params.ItemId,
-		Name:            params.Name,
-		BitsFrom:        params.BitsFrom * 1000 * 1000,
-		BitsTo:          params.BitsTo * 1000 * 1000,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Success()
-}
--- a/internal/web/actions/default/clusters/regions/nodes.go
+++ b/internal/web/actions/default/clusters/regions/nodes.go
@@ -0,0 +1,92 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package regions
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type NodesAction struct {
+	actionutils.ParentAction
+}
+
+func (this *NodesAction) Init() {
+	this.Nav("", "", "node")
+}
+
+func (this *NodesAction) RunGet(params struct {
+	RegionId int64
+}) {
+	this.Data["regionId"] = params.RegionId
+
+	// 所有区域
+	regionsResp, err := this.RPC().NodeRegionRPC().FindAllAvailableNodeRegions(this.AdminContext(), &pb.FindAllAvailableNodeRegionsRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var regionMaps = []maps.Map{}
+	for _, region := range regionsResp.NodeRegions {
+		regionMaps = append(regionMaps, maps.Map{
+			"id":   region.Id,
+			"name": region.Name,
+		})
+	}
+	this.Data["regions"] = regionMaps
+
+	// 节点数量
+	countResp, err := this.RPC().NodeRPC().CountAllNodeRegionInfo(this.AdminContext(), &pb.CountAllNodeRegionInfoRequest{NodeRegionId: params.RegionId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var page = this.NewPage(countResp.Count)
+	this.Data["page"] = page.AsHTML()
+
+	// 节点列表
+	var hasNodesWithoutRegion = false
+	nodesResp, err := this.RPC().NodeRPC().ListNodeRegionInfo(this.AdminContext(), &pb.ListNodeRegionInfoRequest{
+		NodeRegionId: params.RegionId,
+		Offset:       page.Offset,
+		Size:         page.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var nodeMaps = []maps.Map{}
+	for _, node := range nodesResp.InfoList {
+		// region
+		var regionMap maps.Map
+		if node.NodeRegion != nil {
+			regionMap = maps.Map{
+				"id":   node.NodeRegion.Id,
+				"name": node.NodeRegion.Name,
+			}
+		} else {
+			hasNodesWithoutRegion = true
+		}
+
+		// cluster
+		var clusterMap maps.Map
+		if node.NodeCluster != nil {
+			clusterMap = maps.Map{
+				"id":   node.NodeCluster.Id,
+				"name": node.NodeCluster.Name,
+			}
+		}
+
+		nodeMaps = append(nodeMaps, maps.Map{
+			"id":      node.Id,
+			"name":    node.Name,
+			"region":  regionMap,
+			"cluster": clusterMap,
+		})
+	}
+	this.Data["nodes"] = nodeMaps
+	this.Data["hasNodesWithoutRegion"] = hasNodesWithoutRegion
+
+	this.Show()
+}
--- a/internal/web/actions/default/clusters/regions/prices.go
+++ b/internal/web/actions/default/clusters/regions/prices.go
@@ -1,86 +0,0 @@
-package regions
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/regions/regionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-)
-
-type PricesAction struct {
-	actionutils.ParentAction
-}
-
-func (this *PricesAction) Init() {
-	this.Nav("", "", "price")
-}
-
-func (this *PricesAction) RunGet(params struct{}) {
-	// 所有价格项目
-	itemsResp, err := this.RPC().NodePriceItemRPC().FindAllAvailableNodePriceItems(this.AdminContext(), &pb.FindAllAvailableNodePriceItemsRequest{Type: regionutils.PriceTypeTraffic})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	itemMaps := []maps.Map{}
-	for _, item := range itemsResp.NodePriceItems {
-
-		itemMaps = append(itemMaps, maps.Map{
-			"id":             item.Id,
-			"name":           item.Name,
-			"bitsFromString": this.formatBits(item.BitsFrom),
-			"bitsToString":   this.formatBits(item.BitsTo),
-		})
-	}
-	this.Data["items"] = itemMaps
-
-	// 所有区域
-	regionsResp, err := this.RPC().NodeRegionRPC().FindAllEnabledNodeRegions(this.AdminContext(), &pb.FindAllEnabledNodeRegionsRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	regionMaps := []maps.Map{}
-	for _, region := range regionsResp.NodeRegions {
-		pricesMap := map[string]float32{}
-		if len(region.PricesJSON) > 0 {
-			err = json.Unmarshal(region.PricesJSON, &pricesMap)
-			if err != nil {
-				this.ErrorPage(err)
-				return
-			}
-		}
-		regionMaps = append(regionMaps, maps.Map{
-			"id":     region.Id,
-			"isOn":   region.IsOn,
-			"name":   region.Name,
-			"prices": pricesMap,
-		})
-	}
-	this.Data["regions"] = regionMaps
-
-	this.Show()
-}
-
-func (this *PricesAction) formatBits(bits int64) string {
-	sizeHuman := ""
-	if bits < 1000 {
-		sizeHuman = numberutils.FormatInt64(bits) + "BPS"
-	} else if bits < 1_000_000 {
-		sizeHuman = fmt.Sprintf("%.2fKBPS", float64(bits)/1000)
-	} else if bits < 1_000_000_000 {
-		sizeHuman = fmt.Sprintf("%.2fMBPS", float64(bits)/1000/1000)
-	} else if bits < 1_000_000_000_000 {
-		sizeHuman = fmt.Sprintf("%.2fGBPS", float64(bits)/1000/1000/1000)
-	} else if bits < 1_000_000_000_000_000 {
-		sizeHuman = fmt.Sprintf("%.2fTBPS", float64(bits)/1000/1000/1000/1000)
-	} else if bits < 1_000_000_000_000_000_000 {
-		sizeHuman = fmt.Sprintf("%.2fPBPS", float64(bits)/1000/1000/1000/1000/1000)
-	} else {
-		sizeHuman = fmt.Sprintf("%.2fEBPS", float64(bits)/1000/1000/1000/1000/1000/1000)
-	}
-	return sizeHuman
-}
--- a/internal/web/actions/default/clusters/regions/regionutils/consts.go
+++ b/internal/web/actions/default/clusters/regions/regionutils/consts.go
@@ -1,5 +0,0 @@
-package regionutils
-
-const (
-	PriceTypeTraffic = "traffic"
-)
--- a/internal/web/actions/default/clusters/regions/selectPopup.go
+++ b/internal/web/actions/default/clusters/regions/selectPopup.go
@@ -40,12 +40,18 @@ func (this *SelectPopupAction) RunPost(params struct {
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
+	if params.RegionId <= 0 {
+		this.Data["region"] = nil
+		this.Success()
+		return
+	}
+
 	regionResp, err := this.RPC().NodeRegionRPC().FindEnabledNodeRegion(this.AdminContext(), &pb.FindEnabledNodeRegionRequest{NodeRegionId: params.RegionId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	region := regionResp.NodeRegion
+	var region = regionResp.NodeRegion
 	if region == nil {
 		this.NotFound("nodeRegion", params.RegionId)
 		return
--- a/internal/web/actions/default/clusters/regions/updateNodeRegionPopup.go
+++ b/internal/web/actions/default/clusters/regions/updateNodeRegionPopup.go
@@ -0,0 +1,97 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package regions
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type UpdateNodeRegionPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateNodeRegionPopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UpdateNodeRegionPopupAction) RunGet(params struct {
+	NodeId   int64
+	RegionId int64
+}) {
+	// node
+	nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var node = nodeResp.Node
+	if node == nil {
+		this.NotFound("node", params.NodeId)
+		return
+	}
+	this.Data["node"] = maps.Map{
+		"id":   node.Id,
+		"name": node.Name,
+	}
+
+	// region
+	this.Data["region"] = maps.Map{
+		"id":   0,
+		"name": "",
+	}
+	if params.RegionId > 0 {
+		regionResp, err := this.RPC().NodeRegionRPC().FindEnabledNodeRegion(this.AdminContext(), &pb.FindEnabledNodeRegionRequest{NodeRegionId: params.RegionId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		var region = regionResp.NodeRegion
+		if region != nil {
+			this.Data["region"] = maps.Map{
+				"id":   region.Id,
+				"name": region.Name,
+			}
+		}
+	}
+
+	// all regions
+	regionsResp, err := this.RPC().NodeRegionRPC().FindAllAvailableNodeRegions(this.AdminContext(), &pb.FindAllAvailableNodeRegionsRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var regionMaps = []maps.Map{}
+	for _, region := range regionsResp.NodeRegions {
+		regionMaps = append(regionMaps, maps.Map{
+			"id":   region.Id,
+			"name": region.Name,
+		})
+	}
+	this.Data["regions"] = regionMaps
+
+	this.Show()
+}
+
+func (this *UpdateNodeRegionPopupAction) RunPost(params struct {
+	NodeId   int64
+	RegionId int64
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改节点 %d 区域到 %d", params.RegionId)
+
+	_, err := this.RPC().NodeRPC().UpdateNodeRegionInfo(this.AdminContext(), &pb.UpdateNodeRegionInfoRequest{
+		NodeId:       params.NodeId,
+		NodeRegionId: params.RegionId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}
--- a/internal/web/actions/default/clusters/regions/updatePricePopup.go
+++ b/internal/web/actions/default/clusters/regions/updatePricePopup.go
@@ -1,94 +0,0 @@
-package regions
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/actions"
-	"github.com/iwind/TeaGo/maps"
-)
-
-type UpdatePricePopupAction struct {
-	actionutils.ParentAction
-}
-
-func (this *UpdatePricePopupAction) Init() {
-	this.Nav("", "", "")
-}
-
-func (this *UpdatePricePopupAction) RunGet(params struct {
-	RegionId int64
-	ItemId   int64
-}) {
-	// 区域
-	regionResp, err := this.RPC().NodeRegionRPC().FindEnabledNodeRegion(this.AdminContext(), &pb.FindEnabledNodeRegionRequest{NodeRegionId: params.RegionId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	region := regionResp.NodeRegion
-	if region == nil {
-		this.NotFound("nodeRegion", params.RegionId)
-		return
-	}
-	this.Data["region"] = maps.Map{
-		"id":   region.Id,
-		"isOn": region.IsOn,
-		"name": region.Name,
-	}
-
-	// 当前价格
-	pricesMap := map[string]float32{}
-	if len(region.PricesJSON) > 0 {
-		err = json.Unmarshal(region.PricesJSON, &pricesMap)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-	}
-	this.Data["price"] = pricesMap[numberutils.FormatInt64(params.ItemId)]
-
-	// 价格项
-	itemResp, err := this.RPC().NodePriceItemRPC().FindEnabledNodePriceItem(this.AdminContext(), &pb.FindEnabledNodePriceItemRequest{NodePriceItemId: params.ItemId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	item := itemResp.NodePriceItem
-	if item == nil {
-		this.NotFound("nodePriceItem", params.ItemId)
-		return
-	}
-
-	this.Data["item"] = maps.Map{
-		"id":       item.Id,
-		"name":     item.Name,
-		"bitsFrom": item.BitsFrom,
-		"bitsTo":   item.BitsTo,
-	}
-
-	this.Show()
-}
-
-func (this *UpdatePricePopupAction) RunPost(params struct {
-	RegionId int64
-	ItemId   int64
-	Price    float32
-
-	Must *actions.Must
-	CSRF *actionutils.CSRF
-}) {
-	defer this.CreateLogInfo("修改区域 %d-价格项 %d 的价格", params.RegionId, params.ItemId)
-
-	_, err := this.RPC().NodeRegionRPC().UpdateNodeRegionPrice(this.AdminContext(), &pb.UpdateNodeRegionPriceRequest{
-		NodeRegionId: params.RegionId,
-		NodeItemId:   params.ItemId,
-		Price:        params.Price,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Success()
-}
--- a/internal/web/actions/default/clusters/tasks/check.go
+++ b/internal/web/actions/default/clusters/tasks/check.go
@@ -3,23 +3,38 @@ package tasks
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"time"
 )

 type CheckAction struct {
 	actionutils.ParentAction
 }

-func (this *CheckAction) RunPost(params struct{}) {
-	resp, err := this.RPC().NodeTaskRPC().ExistsNodeTasks(this.AdminContext(), &pb.ExistsNodeTasksRequest{
-		ExcludeTypes: []string{"ipItemChanged"},
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
+func (this *CheckAction) RunPost(params struct {
+	IsDoing   bool
+	HasError  bool
+	IsUpdated bool
+}) {
+	var maxTries = 10
+	for i := 0; i < maxTries; i++ {
+		resp, err := this.RPC().NodeTaskRPC().ExistsNodeTasks(this.AdminContext(), &pb.ExistsNodeTasksRequest{
+			ExcludeTypes: []string{"ipItemChanged"},
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}

-	this.Data["isDoing"] = resp.ExistTasks
-	this.Data["hasError"] = resp.ExistError
+		// 如果没有数据变化，继续查询
+		if i < maxTries-1 && params.IsUpdated && resp.ExistTasks == params.IsDoing && resp.ExistError == params.HasError {
+			time.Sleep(3 * time.Second)
+			continue
+		}
+
+		this.Data["isDoing"] = resp.ExistTasks
+		this.Data["hasError"] = resp.ExistError
+		break
+	}

 	this.Success()
 }
--- a/internal/web/actions/default/dashboard/index.go
+++ b/internal/web/actions/default/dashboard/index.go
@@ -76,16 +76,14 @@ func (this *IndexAction) RunPost(params struct{}) {
 	this.Data["dashboard"] = maps.Map{
 		"defaultClusterId": resp.DefaultNodeClusterId,

-		"countServers":          resp.CountServers,
-		"countNodeClusters":     resp.CountNodeClusters,
-		"countNodes":            resp.CountNodes,
-		"countOfflineNodes":     resp.CountOfflineNodes,
-		"countUsers":            resp.CountUsers,
-		"countAPINodes":         resp.CountAPINodes,
-		"countOfflineAPINodes":  resp.CountOfflineAPINodes,
-		"countDBNodes":          resp.CountDBNodes,
-		"countUserNodes":        resp.CountUserNodes,
-		"countOfflineUserNodes": resp.CountOfflineUserNodes,
+		"countServers":         resp.CountServers,
+		"countNodeClusters":    resp.CountNodeClusters,
+		"countNodes":           resp.CountNodes,
+		"countOfflineNodes":    resp.CountOfflineNodes,
+		"countUsers":           resp.CountUsers,
+		"countAPINodes":        resp.CountAPINodes,
+		"countOfflineAPINodes": resp.CountOfflineAPINodes,
+		"countDBNodes":         resp.CountDBNodes,

 		"canGoServers":  configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeServer),
 		"canGoNodes":    configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeNode),
--- a/internal/web/actions/default/dns/clusters/cluster.go
+++ b/internal/web/actions/default/dns/clusters/cluster.go
@@ -43,7 +43,7 @@ func (this *ClusterAction) RunGet(params struct {
 	}
 	var defaultRoute = dnsResp.DefaultRoute
 	domainName := ""
-	dnsMap := maps.Map{
+	var dnsMap = maps.Map{
 		"dnsName":          dnsResp.Name,
 		"domainId":         0,
 		"domainName":       "",
@@ -76,14 +76,14 @@ func (this *ClusterAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	nodeMaps := []maps.Map{}
+	var nodeMaps = []maps.Map{}
 	for _, node := range nodesResp.Nodes {
 		if len(node.Routes) > 0 {
 			for _, route := range node.Routes {
 				// 检查是否已解析
-				isResolved := false
+				var isResolved = false
 				if cluster.DnsDomainId > 0 && len(cluster.DnsName) > 0 && len(node.IpAddr) > 0 {
-					recordType := "A"
+					var recordType = "A"
 					if utils.IsIPv6(node.IpAddr) {
 						recordType = "AAAA"
 					}
@@ -102,9 +102,10 @@ func (this *ClusterAction) RunGet(params struct {
 				}

 				nodeMaps = append(nodeMaps, maps.Map{
-					"id":     node.Id,
-					"name":   node.Name,
-					"ipAddr": node.IpAddr,
+					"id":       node.Id,
+					"name":     node.Name,
+					"ipAddr":   node.IpAddr,
+					"ipAddrId": node.NodeIPAddressId,
 					"route": maps.Map{
 						"name": route.Name,
 						"code": route.Code,
@@ -117,7 +118,7 @@ func (this *ClusterAction) RunGet(params struct {
 			// 默认线路
 			var isResolved = false
 			if len(defaultRoute) > 0 {
-				recordType := "A"
+				var recordType = "A"
 				if utils.IsIPv6(node.IpAddr) {
 					recordType = "AAAA"
 				}
@@ -135,9 +136,10 @@ func (this *ClusterAction) RunGet(params struct {
 				isResolved = checkResp.IsOk
 			}
 			nodeMaps = append(nodeMaps, maps.Map{
-				"id":     node.Id,
-				"name":   node.Name,
-				"ipAddr": node.IpAddr,
+				"id":       node.Id,
+				"name":     node.Name,
+				"ipAddr":   node.IpAddr,
+				"ipAddrId": node.NodeIPAddressId,
 				"route": maps.Map{
 					"name": "",
 					"code": "",
@@ -155,7 +157,7 @@ func (this *ClusterAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	serverMaps := []maps.Map{}
+	var serverMaps = []maps.Map{}
 	for _, server := range serversResp.Servers {
 		// 检查是否已解析
 		isResolved := false
@@ -198,7 +200,7 @@ func (this *ClusterAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	issueMaps := []maps.Map{}
+	var issueMaps = []maps.Map{}
 	for _, issue := range issuesResp.Issues {
 		issueMaps = append(issueMaps, maps.Map{
 			"target":      issue.Target,
@@ -218,7 +220,7 @@ func (this *ClusterAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	taskMaps := []maps.Map{}
+	var taskMaps = []maps.Map{}
 	for _, task := range resp.DnsTasks {
 		var clusterMap maps.Map = nil
 		var nodeMap maps.Map = nil
--- a/internal/web/actions/default/dns/domains/domainutils/utils.go
+++ b/internal/web/actions/default/dns/domains/domainutils/utils.go
@@ -71,7 +71,10 @@ func ValidateRecordName(name string) bool {
 	}

 	pieces := strings.Split(name, ".")
-	for _, piece := range pieces {
+	for index, piece := range pieces {
+		if index == 0 && piece == "*" {
+			continue
+		}
 		if piece == "-" ||
 			strings.HasPrefix(piece, "-") ||
 			strings.HasSuffix(piece, "-") ||
@@ -130,6 +133,11 @@ func ValidateRecordValue(recordType dnsconfigs.RecordType, value string) (messag
 			message = "请输入正确的邮件服务器域名"
 			return
 		}
+	case dnsconfigs.RecordTypeSRV:
+		if len(value) == 0 {
+			message = "请输入主机名"
+			return
+		}
 	case dnsconfigs.RecordTypeTXT:
 		if len(value) > 512 {
 			message = "文本长度不能超出512字节"
--- a/internal/web/actions/default/dns/issues/updateNodePopup.go
+++ b/internal/web/actions/default/dns/issues/updateNodePopup.go
@@ -22,12 +22,14 @@ func (this *UpdateNodePopupAction) Init() {
 func (this *UpdateNodePopupAction) RunGet(params struct {
 	ClusterId int64
 	NodeId    int64
+	IpAddrId  int64
 }) {
 	this.Data["nodeId"] = params.NodeId

 	dnsInfoResp, err := this.RPC().NodeRPC().FindEnabledNodeDNS(this.AdminContext(), &pb.FindEnabledNodeDNSRequest{
 		NodeId:        params.NodeId,
 		NodeClusterId: params.ClusterId,
+		NodeIPAddrId:  params.IpAddrId,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -39,12 +41,13 @@ func (this *UpdateNodePopupAction) RunGet(params struct {
 		return
 	}
 	this.Data["ipAddr"] = dnsInfo.IpAddr
+	this.Data["ipAddrId"] = dnsInfo.NodeIPAddressId
 	this.Data["routes"] = domainutils.ConvertRoutesToMaps(dnsInfo)
 	this.Data["domainId"] = dnsInfo.DnsDomainId
 	this.Data["domainName"] = dnsInfo.DnsDomainName

 	// 读取所有线路
-	allRouteMaps := []maps.Map{}
+	var allRouteMaps = []maps.Map{}
 	if dnsInfo.DnsDomainId > 0 {
 		routesResp, err := this.RPC().DNSDomainRPC().FindAllDNSDomainRoutes(this.AdminContext(), &pb.FindAllDNSDomainRoutesRequest{DnsDomainId: dnsInfo.DnsDomainId})
 		if err != nil {
@@ -75,6 +78,7 @@ func (this *UpdateNodePopupAction) RunGet(params struct {
 func (this *UpdateNodePopupAction) RunPost(params struct {
 	NodeId        int64
 	IpAddr        string
+	IpAddrId      int64
 	DomainId      int64
 	DnsRoutesJSON []byte

@@ -84,7 +88,7 @@ func (this *UpdateNodePopupAction) RunPost(params struct {
 	// 操作日志
 	defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId)

-	routes := []string{}
+	var routes = []string{}
 	if len(params.DnsRoutesJSON) > 0 {
 		err := json.Unmarshal(params.DnsRoutesJSON, &routes)
 		if err != nil {
@@ -103,10 +107,11 @@ func (this *UpdateNodePopupAction) RunPost(params struct {

 	// 执行修改
 	_, err := this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{
-		NodeId:      params.NodeId,
-		IpAddr:      params.IpAddr,
-		DnsDomainId: params.DomainId,
-		Routes:      routes,
+		NodeId:          params.NodeId,
+		IpAddr:          params.IpAddr,
+		NodeIPAddressId: params.IpAddrId,
+		DnsDomainId:     params.DomainId,
+		Routes:          routes,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/dns/providers/createPopup.go
+++ b/internal/web/actions/default/dns/providers/createPopup.go
@@ -64,6 +64,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	// HuaweiDNS
 	ParamHuaweiAccessKeyId     string
 	ParamHuaweiAccessKeySecret string
+	ParamHuaweiEndpoint        string

 	// CloudFlare
 	ParamCloudFlareAPIKey string
@@ -119,6 +120,7 @@ func (this *CreatePopupAction) RunPost(params struct {

 		apiParams["accessKeyId"] = params.ParamHuaweiAccessKeyId
 		apiParams["accessKeySecret"] = params.ParamHuaweiAccessKeySecret
+		apiParams["endpoint"] = params.ParamHuaweiEndpoint
 	case "cloudFlare":
 		params.Must.
 			Field("paramCloudFlareAPIKey", params.ParamCloudFlareAPIKey).
--- a/internal/web/actions/default/dns/providers/index.go
+++ b/internal/web/actions/default/dns/providers/index.go
@@ -59,7 +59,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	var providerMaps = []maps.Map{}
 	for _, provider := range providersResp.DnsProviders {
-		dataUpdatedTime := ""
+		var dataUpdatedTime = ""
 		if provider.DataUpdatedAt > 0 {
 			dataUpdatedTime = timeutil.FormatTime("Y-m-d H:i:s", provider.DataUpdatedAt)
 		}
@@ -72,7 +72,7 @@ func (this *IndexAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		countDomains := countDomainsResp.Count
+		var countDomains = countDomainsResp.Count

 		providerMaps = append(providerMaps, maps.Map{
 			"id":              provider.Id,
--- a/internal/web/actions/default/dns/providers/updatePopup.go
+++ b/internal/web/actions/default/dns/providers/updatePopup.go
@@ -91,6 +91,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	// HuaweiDNS
 	ParamHuaweiAccessKeyId     string
 	ParamHuaweiAccessKeySecret string
+	ParamHuaweiEndpoint        string

 	// CloudFlare
 	ParamCloudFlareAPIKey string
@@ -148,6 +149,7 @@ func (this *UpdatePopupAction) RunPost(params struct {

 		apiParams["accessKeyId"] = params.ParamHuaweiAccessKeyId
 		apiParams["accessKeySecret"] = params.ParamHuaweiAccessKeySecret
+		apiParams["endpoint"] = params.ParamHuaweiEndpoint
 	case "cloudFlare":
 		params.Must.
 			Field("paramCloudFlareAPIKey", params.ParamCloudFlareAPIKey).
--- a/internal/web/actions/default/dns/tasks/check.go
+++ b/internal/web/actions/default/dns/tasks/check.go
@@ -3,21 +3,36 @@ package tasks
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"time"
 )

 type CheckAction struct {
 	actionutils.ParentAction
 }

-func (this *CheckAction) RunPost(params struct{}) {
-	resp, err := this.RPC().DNSTaskRPC().ExistsDNSTasks(this.AdminContext(), &pb.ExistsDNSTasksRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
+func (this *CheckAction) RunPost(params struct {
+	IsDoing   bool
+	HasError  bool
+	IsUpdated bool
+}) {
+	var maxTries = 10
+	for i := 0; i < maxTries; i++ {
+		resp, err := this.RPC().DNSTaskRPC().ExistsDNSTasks(this.AdminContext(), &pb.ExistsDNSTasksRequest{})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}

-	this.Data["isDoing"] = resp.ExistTasks
-	this.Data["hasError"] = resp.ExistError
+		// 如果没有数据变化，继续查询
+		if i < maxTries-1 && params.IsUpdated && resp.ExistTasks == params.IsDoing && resp.ExistError == params.HasError {
+			time.Sleep(3 * time.Second)
+			continue
+		}
+
+		this.Data["isDoing"] = resp.ExistTasks
+		this.Data["hasError"] = resp.ExistError
+		break
+	}

 	this.Success()
 }
--- a/internal/web/actions/default/index/checkOTP.go
+++ b/internal/web/actions/default/index/checkOTP.go
@@ -1,30 +0,0 @@
-package index
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/actions"
-)
-
-// 检查是否需要OTP
-type CheckOTPAction struct {
-	actionutils.ParentAction
-}
-
-func (this *CheckOTPAction) Init() {
-	this.Nav("", "", "")
-}
-
-func (this *CheckOTPAction) RunPost(params struct {
-	Username string
-
-	Must *actions.Must
-}) {
-	checkResp, err := this.RPC().AdminRPC().CheckAdminOTPWithUsername(this.AdminContext(), &pb.CheckAdminOTPWithUsernameRequest{Username: params.Username})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["requireOTP"] = checkResp.RequireOTP
-	this.Success()
-}
--- a/internal/web/actions/default/index/index.go
+++ b/internal/web/actions/default/index/index.go
@@ -1,7 +1,6 @@
 package index

 import (
-	"encoding/json"
 	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
@@ -14,10 +13,8 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
-	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/types"
 	stringutil "github.com/iwind/TeaGo/utils/string"
-	"github.com/xlzd/gotp"
 	"time"
 )

@@ -27,7 +24,8 @@ type IndexAction struct {

 // 首页（登录页）

-var TokenSalt = stringutil.Rand(32)
+// TokenKey 加密用的密钥
+var TokenKey = stringutil.Rand(32)

 func (this *IndexAction) RunGet(params struct {
 	From string
@@ -59,7 +57,7 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["menu"] = "signIn"

 	var timestamp = fmt.Sprintf("%d", time.Now().Unix())
-	this.Data["token"] = stringutil.Md5(TokenSalt+timestamp) + timestamp
+	this.Data["token"] = stringutil.Md5(TokenKey+timestamp) + timestamp
 	this.Data["from"] = params.From

 	uiConfig, err := configloaders.LoadAdminUIConfig()
@@ -93,9 +91,10 @@ func (this *IndexAction) RunPost(params struct {
 	Password string
 	OtpCode  string
 	Remember bool
-	Must     *actions.Must
-	Auth     *helpers.UserShouldAuth
-	CSRF     *actionutils.CSRF
+
+	Must *actions.Must
+	Auth *helpers.UserShouldAuth
+	CSRF *actionutils.CSRF
 }) {
 	params.Must.
 		Field("username", params.Username).
@@ -112,7 +111,7 @@ func (this *IndexAction) RunPost(params struct {
 		this.Fail("请通过登录页面登录")
 	}
 	var timestampString = params.Token[32:]
-	if stringutil.Md5(TokenSalt+timestampString) != params.Token[:32] {
+	if stringutil.Md5(TokenKey+timestampString) != params.Token[:32] {
 		this.FailField("refresh", "登录页面已过期，请刷新后重试")
 	}
 	var timestamp = types.Int64(timestampString)
@@ -123,6 +122,7 @@ func (this *IndexAction) RunPost(params struct {
 	rpcClient, err := rpc.SharedRPC()
 	if err != nil {
 		this.Fail("服务器出了点小问题：" + err.Error())
+		return
 	}
 	resp, err := rpcClient.AdminRPC().LoginAdmin(rpcClient.Context(0), &pb.LoginAdminRequest{
 		Username: params.Username,
@@ -136,6 +136,7 @@ func (this *IndexAction) RunPost(params struct {
 		}

 		actionutils.Fail(this, err)
+		return
 	}

 	if !resp.IsOk {
@@ -145,31 +146,37 @@ func (this *IndexAction) RunPost(params struct {
 		}

 		this.Fail("请输入正确的用户名密码")
+		return
 	}
+	var adminId = resp.AdminId

-	// 检查OTP
-	otpLoginResp, err := this.RPC().LoginRPC().FindEnabledLogin(this.AdminContext(), &pb.FindEnabledLoginRequest{
-		AdminId: resp.AdminId,
-		Type:    "otp",
-	})
+	// 检查是否支持OTP
+	checkOTPResp, err := this.RPC().AdminRPC().CheckAdminOTPWithUsername(this.AdminContext(), &pb.CheckAdminOTPWithUsernameRequest{Username: params.Username})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	if otpLoginResp.Login != nil && otpLoginResp.Login.IsOn {
-		var loginParams = maps.Map{}
-		err = json.Unmarshal(otpLoginResp.Login.ParamsJSON, &loginParams)
+	var requireOTP = checkOTPResp.RequireOTP
+	this.Data["requireOTP"] = requireOTP
+	if requireOTP {
+		this.Data["remember"] = params.Remember
+
+		var sid = this.Session().Sid
+		this.Data["sid"] = sid
+		_, err = this.RPC().LoginSessionRPC().WriteLoginSessionValue(this.AdminContext(), &pb.WriteLoginSessionValueRequest{
+			Sid:   sid + "_otp",
+			Key:   "adminId",
+			Value: types.String(adminId),
+		})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		secret := loginParams.GetString("secret")
-		if gotp.NewDefaultTOTP(secret).Now() != params.OtpCode {
-			this.Fail("请输入正确的OTP动态密码")
-		}
+		this.Success()
+		return
 	}

-	var adminId = resp.AdminId
+	// 写入SESSION
 	params.Auth.StoreAdmin(adminId, params.Remember)

 	// 记录日志
--- a/internal/web/actions/default/index/init.go
+++ b/internal/web/actions/default/index/init.go
@@ -7,9 +7,9 @@ import (
 func init() {
 	TeaGo.BeforeStart(func(server *TeaGo.Server) {
 		server.
-			Post("/checkOTP", new(CheckOTPAction)).
-			Prefix("/").
-			GetPost("", new(IndexAction)).
+			Prefix("").
+			GetPost("/", new(IndexAction)).
+			GetPost("/index/otp", new(OtpAction)).
 			EndAll()
 	})
 }
--- a/internal/web/actions/default/index/otp.go
+++ b/internal/web/actions/default/index/otp.go
@@ -0,0 +1,154 @@
+// Copyright 2023 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package index
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeAdmin/internal/setup"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+	stringutil "github.com/iwind/TeaGo/utils/string"
+	"github.com/xlzd/gotp"
+	"time"
+)
+
+type OtpAction struct {
+	actionutils.ParentAction
+}
+
+func (this *OtpAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *OtpAction) RunGet(params struct {
+	From     string
+	Sid      string
+	Remember bool
+}) {
+	// 检查系统是否已经配置过
+	if !setup.IsConfigured() {
+		this.RedirectURL("/setup")
+		return
+	}
+
+	//// 是否新安装
+	if setup.IsNewInstalled() {
+		this.RedirectURL("/setup/confirm")
+		return
+	}
+
+	this.Data["isUser"] = false
+	this.Data["menu"] = "signIn"
+
+	var timestamp = fmt.Sprintf("%d", time.Now().Unix())
+	this.Data["token"] = stringutil.Md5(TokenKey+timestamp) + timestamp
+	this.Data["from"] = params.From
+	this.Data["sid"] = params.Sid
+
+	uiConfig, err := configloaders.LoadAdminUIConfig()
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["systemName"] = uiConfig.AdminSystemName
+	this.Data["showVersion"] = uiConfig.ShowVersion
+	if len(uiConfig.Version) > 0 {
+		this.Data["version"] = uiConfig.Version
+	} else {
+		this.Data["version"] = teaconst.Version
+	}
+	this.Data["faviconFileId"] = uiConfig.FaviconFileId
+	this.Data["remember"] = params.Remember
+
+	this.Show()
+}
+
+func (this *OtpAction) RunPost(params struct {
+	Sid      string
+	OtpCode  string
+	Remember bool
+
+	Must *actions.Must
+	Auth *helpers.UserShouldAuth
+}) {
+	if len(params.OtpCode) == 0 {
+		this.FailField("otpCode", "请输入正确的OTP动态密码")
+		return
+	}
+
+	var sid = params.Sid
+	if len(sid) == 0 || len(sid) > 64 {
+		this.Fail("参数错误，请重新登录（001）")
+		return
+	}
+	sid += "_otp"
+
+	// 获取SESSION
+	sessionResp, err := this.RPC().LoginSessionRPC().FindLoginSession(this.AdminContext(), &pb.FindLoginSessionRequest{Sid: sid})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var session = sessionResp.LoginSession
+	if session == nil || session.AdminId <= 0 {
+		this.Fail("参数错误，请重新登录（002）")
+		return
+	}
+	var adminId = session.AdminId
+
+	// 检查OTP
+	otpLoginResp, err := this.RPC().LoginRPC().FindEnabledLogin(this.AdminContext(), &pb.FindEnabledLoginRequest{
+		AdminId: adminId,
+		Type:    "otp",
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if otpLoginResp.Login != nil && otpLoginResp.Login.IsOn {
+		var loginParams = maps.Map{}
+		err = json.Unmarshal(otpLoginResp.Login.ParamsJSON, &loginParams)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		var secret = loginParams.GetString("secret")
+		if gotp.NewDefaultTOTP(secret).Now() != params.OtpCode {
+			this.FailField("otpCode", "请输入正确的OTP动态密码")
+			return
+		}
+	}
+
+	// 写入SESSION
+	params.Auth.StoreAdmin(adminId, params.Remember)
+
+	// 删除OTP SESSION
+	_, err = this.RPC().LoginSessionRPC().DeleteLoginSession(this.AdminContext(), &pb.DeleteLoginSessionRequest{Sid: sid})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 记录日志
+	rpcClient, err := rpc.SharedRPC()
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	err = dao.SharedLogDAO.CreateAdminLog(rpcClient.Context(adminId), oplogs.LevelInfo, this.Request.URL.Path, "成功通过OTP验证登录系统", this.RequestRemoteIP())
+	if err != nil {
+		utils.PrintError(err)
+	}
+
+	this.Success()
+}
--- a/internal/web/actions/default/nodes/ipAddresses/createPopup.go
+++ b/internal/web/actions/default/nodes/ipAddresses/createPopup.go
@@ -5,6 +5,7 @@ import (
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses/ipaddressutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
@@ -20,8 +21,18 @@ func (this *CreatePopupAction) Init() {
 }

 func (this *CreatePopupAction) RunGet(params struct {
+	NodeId            int64
 	SupportThresholds bool
 }) {
+	// 专属集群
+	clusterMaps, err := ipaddressutils.FindNodeClusterMapsWithNodeId(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["clusters"] = clusterMaps
+
+	// 阈值
 	this.Data["supportThresholds"] = params.SupportThresholds

 	this.Show()
@@ -33,6 +44,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	Name           string
 	IsUp           bool
 	ThresholdsJSON []byte
+	ClusterIds     []int64

 	Must *actions.Must
 }) {
@@ -57,6 +69,14 @@ func (this *CreatePopupAction) RunPost(params struct {
 		_ = json.Unmarshal(params.ThresholdsJSON, &thresholds)
 	}

+	// 专属集群
+	// 目前只考虑CDN边缘集群
+	clusterMaps, err := ipaddressutils.FindNodeClusterMaps(this.Parent(), params.ClusterIds)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Data["ipAddress"] = maps.Map{
 		"name":       params.Name,
 		"canAccess":  params.CanAccess,
@@ -65,6 +85,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		"isOn":       true,
 		"isUp":       params.IsUp,
 		"thresholds": thresholds,
+		"clusters":   clusterMaps,
 	}
 	this.Success()
 }
--- a/internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go
+++ b/internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go
@@ -11,14 +11,28 @@ import (

 // UpdateNodeIPAddresses 保存一组IP地址
 func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64, role nodeconfigs.NodeRole, ipAddressesJSON []byte) error {
-	addresses := []maps.Map{}
+	var addresses = []maps.Map{}
 	err := json.Unmarshal(ipAddressesJSON, &addresses)
 	if err != nil {
 		return err
 	}
 	for _, addr := range addresses {
 		var resultAddrIds = []int64{}
-		addrId := addr.GetInt64("id")
+		var addrId = addr.GetInt64("id")
+
+		// 专属集群
+		var addrClusterIds = []int64{}
+		var addrClusters = addr.GetSlice("clusters")
+		if len(addrClusters) > 0 {
+			for _, addrCluster := range addrClusters {
+				var m = maps.NewMap(addrCluster)
+				var clusterId = m.GetInt64("id")
+				if clusterId > 0 {
+					addrClusterIds = append(addrClusterIds, clusterId)
+				}
+			}
+		}
+
 		if addrId > 0 {
 			resultAddrIds = append(resultAddrIds, addrId)

@@ -36,6 +50,7 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 				CanAccess:       addr.GetBool("canAccess"),
 				IsOn:            isOn,
 				IsUp:            addr.GetBool("isUp"),
+				ClusterIds:      addrClusterIds,
 			})
 			if err != nil {
 				return err
@@ -47,12 +62,13 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 			if len(result) == 1 {
 				// 单个创建
 				createResp, err := parentAction.RPC().NodeIPAddressRPC().CreateNodeIPAddress(parentAction.AdminContext(), &pb.CreateNodeIPAddressRequest{
-					NodeId:    nodeId,
-					Role:      role,
-					Name:      addr.GetString("name"),
-					Ip:        result[0],
-					CanAccess: addr.GetBool("canAccess"),
-					IsUp:      addr.GetBool("isUp"),
+					NodeId:         nodeId,
+					Role:           role,
+					Name:           addr.GetString("name"),
+					Ip:             result[0],
+					CanAccess:      addr.GetBool("canAccess"),
+					IsUp:           addr.GetBool("isUp"),
+					NodeClusterIds: addrClusterIds,
 				})
 				if err != nil {
 					return err
@@ -62,13 +78,14 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 			} else if len(result) > 1 {
 				// 批量创建
 				createResp, err := parentAction.RPC().NodeIPAddressRPC().CreateNodeIPAddresses(parentAction.AdminContext(), &pb.CreateNodeIPAddressesRequest{
-					NodeId:     nodeId,
-					Role:       role,
-					Name:       addr.GetString("name"),
-					IpList:     result,
-					CanAccess:  addr.GetBool("canAccess"),
-					IsUp:       addr.GetBool("isUp"),
-					GroupValue: ipStrings,
+					NodeId:         nodeId,
+					Role:           role,
+					Name:           addr.GetString("name"),
+					IpList:         result,
+					CanAccess:      addr.GetBool("canAccess"),
+					IsUp:           addr.GetBool("isUp"),
+					GroupValue:     ipStrings,
+					NodeClusterIds: addrClusterIds,
 				})
 				if err != nil {
 					return err
@@ -140,3 +157,53 @@ func InitNodeIPAddressThresholds(parentAction *actionutils.ParentAction, addrId
 	}
 	return thresholds, nil
 }
+
+// FindNodeClusterMapsWithNodeId 根据节点读取集群信息
+func FindNodeClusterMapsWithNodeId(parentAction *actionutils.ParentAction, nodeId int64) ([]maps.Map, error) {
+	var clusterMaps = []maps.Map{}
+	if nodeId > 0 { // CDN边缘节点
+		nodeResp, err := parentAction.RPC().NodeRPC().FindEnabledNode(parentAction.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: nodeId})
+		if err != nil {
+			return nil, err
+		}
+		var node = nodeResp.Node
+		if node != nil {
+			var clusters = []*pb.NodeCluster{}
+			if node.NodeCluster != nil {
+				clusters = append(clusters, nodeResp.Node.NodeCluster)
+			}
+			if len(node.SecondaryNodeClusters) > 0 {
+				clusters = append(clusters, node.SecondaryNodeClusters...)
+			}
+			for _, cluster := range clusters {
+				clusterMaps = append(clusterMaps, maps.Map{
+					"id":        cluster.Id,
+					"name":      cluster.Name,
+					"isChecked": false,
+				})
+			}
+		}
+	}
+	return clusterMaps, nil
+}
+
+// FindNodeClusterMaps 根据一组集群ID读取集群信息
+func FindNodeClusterMaps(parentAction *actionutils.ParentAction, clusterIds []int64) ([]maps.Map, error) {
+	var clusterMaps = []maps.Map{}
+	if len(clusterIds) > 0 {
+		for _, clusterId := range clusterIds {
+			clusterResp, err := parentAction.RPC().NodeClusterRPC().FindEnabledNodeCluster(parentAction.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: clusterId})
+			if err != nil {
+				return nil, err
+			}
+			var cluster = clusterResp.NodeCluster
+			if cluster != nil {
+				clusterMaps = append(clusterMaps, maps.Map{
+					"id":   cluster.Id,
+					"name": cluster.Name,
+				})
+			}
+		}
+	}
+	return clusterMaps, nil
+}
--- a/internal/web/actions/default/nodes/ipAddresses/updatePopup.go
+++ b/internal/web/actions/default/nodes/ipAddresses/updatePopup.go
@@ -5,6 +5,7 @@ import (
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses/ipaddressutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
@@ -21,9 +22,18 @@ func (this *UpdatePopupAction) Init() {
 }

 func (this *UpdatePopupAction) RunGet(params struct {
+	NodeId            int64
 	AddressId         int64
 	SupportThresholds bool
 }) {
+	// 专属集群
+	clusterMaps, err := ipaddressutils.FindNodeClusterMapsWithNodeId(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["clusters"] = clusterMaps
+
 	this.Data["supportThresholds"] = params.SupportThresholds

 	this.Show()
@@ -37,6 +47,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	IsOn           bool
 	IsUp           bool
 	ThresholdsJSON []byte
+	ClusterIds     []int64

 	Must *actions.Must
 }) {
@@ -81,6 +92,14 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		_ = json.Unmarshal(params.ThresholdsJSON, &thresholds)
 	}

+	// 专属集群
+	// 目前只考虑CDN边缘集群
+	clusterMaps, err := ipaddressutils.FindNodeClusterMaps(this.Parent(), params.ClusterIds)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Data["ipAddress"] = maps.Map{
 		"name":       params.Name,
 		"ip":         params.IP,
@@ -89,6 +108,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		"isOn":       params.IsOn,
 		"isUp":       isUp,
 		"thresholds": thresholds,
+		"clusters":    clusterMaps,
 	}

 	this.Success()
--- a/internal/web/actions/default/servers/certs/acme/updateTaskPopup.go
+++ b/internal/web/actions/default/servers/certs/acme/updateTaskPopup.go
@@ -1,6 +1,7 @@
 package acme

 import (
+	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -25,7 +26,7 @@ func (this *UpdateTaskPopupAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	task := taskResp.AcmeTask
+	var task = taskResp.AcmeTask
 	if task == nil {
 		this.NotFound("acmeTask", params.TaskId)
 		return
@@ -74,7 +75,7 @@ func (this *UpdateTaskPopupAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	providerMaps := []maps.Map{}
+	var providerMaps = []maps.Map{}
 	for _, provider := range providersResp.DnsProviders {
 		providerMaps = append(providerMaps, maps.Map{
 			"id":       provider.Id,
@@ -93,7 +94,7 @@ func (this *UpdateTaskPopupAction) RunPost(params struct {
 	AcmeUserId    int64
 	DnsProviderId int64
 	DnsDomain     string
-	Domains       []string
+	DomainsJSON   []byte
 	AutoRenew     bool
 	AuthURL       string

@@ -123,11 +124,20 @@ func (this *UpdateTaskPopupAction) RunPost(params struct {
 		}
 	}

-	if len(params.Domains) == 0 {
+	var domains = []string{}
+	if len(params.DomainsJSON) > 0 {
+		err := json.Unmarshal(params.DomainsJSON, &domains)
+		if err != nil {
+			this.Fail("解析域名数据失败：" + err.Error())
+			return
+		}
+	}
+
+	if len(domains) == 0 {
 		this.Fail("请输入证书域名列表")
 	}
-	realDomains := []string{}
-	for _, domain := range params.Domains {
+	var realDomains = []string{}
+	for _, domain := range domains {
 		domain = strings.ToLower(domain)
 		if params.AuthType == "dns" {
 			if !strings.HasSuffix(domain, "."+dnsDomain) && domain != dnsDomain {
--- a/internal/web/actions/default/servers/certs/acme/users/createPopup.go
+++ b/internal/web/actions/default/servers/certs/acme/users/createPopup.go
@@ -15,7 +15,11 @@ func (this *CreatePopupAction) Init() {
 	this.Nav("", "", "")
 }

-func (this *CreatePopupAction) RunGet(params struct{}) {
+func (this *CreatePopupAction) RunGet(params struct {
+	ProviderCode string
+}) {
+	this.Data["providerCode"] = params.ProviderCode
+
 	// 服务商
 	providersResp, err := this.RPC().ACMEProviderRPC().FindAllACMEProviders(this.AdminContext(), &pb.FindAllACMEProvidersRequest{})
 	if err != nil {
--- a/internal/web/actions/default/servers/certs/selectPopup.go
+++ b/internal/web/actions/default/servers/certs/selectPopup.go
@@ -30,9 +30,10 @@ func (this *SelectPopupAction) RunGet(params struct {
 	// TODO 列出常用和最新的证书供用户选择

 	this.Data["keyword"] = params.Keyword
+	this.Data["selectedCertIds"] = params.SelectedCertIds

 	// 已经选择的证书
-	selectedCertIds := []string{}
+	var selectedCertIds = []string{}
 	if len(params.SelectedCertIds) > 0 {
 		selectedCertIds = strings.Split(params.SelectedCertIds, ",")
 	}
--- a/internal/web/actions/default/servers/components/waf/createRulePopup.go
+++ b/internal/web/actions/default/servers/components/waf/createRulePopup.go
@@ -32,6 +32,7 @@ func (this *CreateRulePopupAction) RunGet(params struct {
 				"params":      checkpoint.Params,
 				"options":     checkpoint.Options,
 				"isComposed":  checkpoint.IsComposed,
+				"dataType":    checkpoint.DataType,
 			})
 		}
 	}
--- a/internal/web/actions/default/servers/groups/group/index.go
+++ b/internal/web/actions/default/servers/groups/group/index.go
@@ -55,10 +55,11 @@ func (this *IndexAction) RunGet(params struct {

 	// 服务列表
 	serversResp, err := this.RPC().ServerRPC().ListEnabledServersMatch(this.AdminContext(), &pb.ListEnabledServersMatchRequest{
-		Offset:        page.Offset,
-		Size:          page.Size,
-		ServerGroupId: params.GroupId,
-		Keyword:       params.Keyword,
+		Offset:         page.Offset,
+		Size:           page.Size,
+		ServerGroupId:  params.GroupId,
+		Keyword:        params.Keyword,
+		IgnoreSSLCerts: true,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/groups/group/settings/headers/index.go
+++ b/internal/web/actions/default/servers/groups/group/settings/headers/index.go
@@ -43,7 +43,7 @@ func (this *IndexAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		headerPolicyId := createHeaderPolicyResp.HeaderPolicyId
+		headerPolicyId := createHeaderPolicyResp.HttpHeaderPolicyId
 		ref := &shared.HTTPHeaderPolicyRef{
 			IsPrior:        false,
 			IsOn:           true,
@@ -70,7 +70,7 @@ func (this *IndexAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		headerPolicyId := createHeaderPolicyResp.HeaderPolicyId
+		headerPolicyId := createHeaderPolicyResp.HttpHeaderPolicyId
 		ref := &shared.HTTPHeaderPolicyRef{
 			IsPrior:        false,
 			IsOn:           true,
--- a/internal/web/actions/default/servers/headers/options.go
+++ b/internal/web/actions/default/servers/headers/options.go
@@ -0,0 +1,26 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package headers
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+)
+
+type OptionsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *OptionsAction) RunPost(params struct {
+	Type string
+}) {
+	if params.Type == "request" {
+		this.Data["headers"] = serverconfigs.AllHTTPCommonRequestHeaders
+	} else if params.Type == "response" {
+		this.Data["headers"] = serverconfigs.AllHTTPCommonResponseHeaders
+	} else {
+		this.Data["headers"] = []string{}
+	}
+
+	this.Success()
+}
--- a/internal/web/actions/default/servers/index.go
+++ b/internal/web/actions/default/servers/index.go
@@ -3,7 +3,6 @@ package servers
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
@@ -90,15 +89,17 @@ func (this *IndexAction) RunGet(params struct {

 	// 服务列表
 	serversResp, err := this.RPC().ServerRPC().ListEnabledServersMatch(this.AdminContext(), &pb.ListEnabledServersMatchRequest{
-		Offset:         page.Offset,
-		Size:           page.Size,
-		NodeClusterId:  params.ClusterId,
-		ServerGroupId:  params.GroupId,
-		Keyword:        params.Keyword,
-		AuditingFlag:   params.AuditingFlag,
-		TrafficOutDesc: params.TrafficOutOrder == "desc",
-		TrafficOutAsc:  params.TrafficOutOrder == "asc",
-		UserId:         params.UserId,
+		Offset:            page.Offset,
+		Size:              page.Size,
+		NodeClusterId:     params.ClusterId,
+		ServerGroupId:     params.GroupId,
+		Keyword:           params.Keyword,
+		AuditingFlag:      params.AuditingFlag,
+		TrafficOutDesc:    params.TrafficOutOrder == "desc",
+		TrafficOutAsc:     params.TrafficOutOrder == "asc",
+		UserId:            params.UserId,
+		IgnoreServerNames: true,
+		IgnoreSSLCerts:    true,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -176,27 +177,35 @@ func (this *IndexAction) RunGet(params struct {
 		}

 		// 域名列表
-		var serverNames = []*serverconfigs.ServerNameConfig{}
 		if server.IsAuditing || (server.AuditingResult != nil && !server.AuditingResult.IsOk) {
 			server.ServerNamesJSON = server.AuditingServerNamesJSON
+
+			if len(config.ServerNames) == 0 {
+				// 审核中的域名
+				if len(server.ServerNamesJSON) > 0 {
+					var serverNames = []*serverconfigs.ServerNameConfig{}
+					err = json.Unmarshal(server.ServerNamesJSON, &serverNames)
+					if err != nil {
+						this.ErrorPage(err)
+						return
+					}
+					config.ServerNames = serverNames
+				}
+			}
 		}
 		var auditingIsOk = true
 		if !server.IsAuditing && server.AuditingResult != nil && !server.AuditingResult.IsOk {
 			auditingIsOk = false
 		}
-		if len(server.ServerNamesJSON) > 0 {
-			err = json.Unmarshal(server.ServerNamesJSON, &serverNames)
-			if err != nil {
-				this.ErrorPage(err)
-				return
+		var firstServerName = ""
+		for _, serverNameConfig := range config.ServerNames {
+			if len(serverNameConfig.Name) > 0 {
+				firstServerName = serverNameConfig.Name
+				break
 			}
-		}
-		var countServerNames = 0
-		for _, serverName := range serverNames {
-			if len(serverName.SubNames) == 0 {
-				countServerNames++
-			} else {
-				countServerNames += len(serverName.SubNames)
+			if len(serverNameConfig.SubNames) > 0 {
+				firstServerName = serverNameConfig.SubNames[0]
+				break
 			}
 		}

@@ -216,9 +225,9 @@ func (this *IndexAction) RunGet(params struct {
 		}

 		// 统计数据
-		var bandwidth = ""
+		var bandwidthBits int64 = 0
 		if server.BandwidthBytes > 0 {
-			bandwidth = numberutils.FormatBytes(server.BandwidthBytes)
+			bandwidthBits = server.BandwidthBytes * 8
 		}

 		serverMaps = append(serverMaps, maps.Map{
@@ -232,13 +241,13 @@ func (this *IndexAction) RunGet(params struct {
 			"ports":            portMaps,
 			"serverTypeName":   serverconfigs.FindServerType(server.Type).GetString("name"),
 			"groups":           groupMaps,
-			"serverNames":      serverNames,
-			"countServerNames": countServerNames,
+			"firstServerName":  firstServerName,
+			"countServerNames": server.CountServerNames,
 			"isAuditing":       server.IsAuditing,
 			"auditingIsOk":     auditingIsOk,
 			"user":             userMap,
 			"auditingTime":     auditingTime,
-			"bandwidth":        bandwidth,
+			"bandwidthBits":    bandwidthBits,
 		})
 	}
 	this.Data["servers"] = serverMaps
--- a/internal/web/actions/default/servers/init.go
+++ b/internal/web/actions/default/servers/init.go
@@ -2,6 +2,7 @@ package servers

 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/headers"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/users"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
@@ -26,10 +27,13 @@ func init() {
 			Get("/serverNamesPopup", new(ServerNamesPopupAction)).
 			Post("/status", new(StatusAction)).

-			//
+			// user
 			Post("/users/options", new(users.OptionsAction)).
 			Post("/users/plans", new(users.PlansAction)).

+			// header
+			Post("/headers/options", new(headers.OptionsAction)).
+
 			//
 			EndAll()
 	})
--- a/internal/web/actions/default/servers/ipbox/index.go
+++ b/internal/web/actions/default/servers/ipbox/index.go
@@ -30,6 +30,9 @@ func (this *IndexAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
+
+	this.Data["regions"] = ""
+	this.Data["isp"] = ""
 	if regionResp.IpRegion != nil {
 		var regionName = regionResp.IpRegion.Summary

@@ -39,10 +42,8 @@ func (this *IndexAction) RunGet(params struct {
 			regionName = regionName[:index]
 		}
 		this.Data["regions"] = regionName
-	} else {
-		this.Data["regions"] = ""
+		this.Data["isp"] = regionResp.IpRegion.Isp
 	}
-	this.Data["isp"] = regionResp.IpRegion.Isp

 	// IP列表
 	ipListResp, err := this.RPC().IPListRPC().FindEnabledIPListContainsIP(this.AdminContext(), &pb.FindEnabledIPListContainsIPRequest{
--- a/internal/web/actions/default/servers/iplists/index.go
+++ b/internal/web/actions/default/servers/iplists/index.go
@@ -21,21 +21,21 @@ func (this *IndexAction) Init() {
 }

 func (this *IndexAction) RunGet(params struct {
-	Ip         string
+	Keyword    string
 	GlobalOnly bool
 	Unread     bool
 	EventLevel string
 	ListType   string
 }) {
 	this.Data["type"] = ""
-	this.Data["ip"] = params.Ip
+	this.Data["keyword"] = params.Keyword
 	this.Data["globalOnly"] = params.GlobalOnly
 	this.Data["unread"] = params.Unread
 	this.Data["eventLevel"] = params.EventLevel
 	this.Data["listType"] = params.ListType

 	countUnreadResp, err := this.RPC().IPItemRPC().CountAllEnabledIPItems(this.AdminContext(), &pb.CountAllEnabledIPItemsRequest{
-		Ip:         params.Ip,
+		Keyword:    params.Keyword,
 		GlobalOnly: params.GlobalOnly,
 		Unread:     true,
 		EventLevel: params.EventLevel,
@@ -48,7 +48,7 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["countUnread"] = countUnreadResp.Count

 	countResp, err := this.RPC().IPItemRPC().CountAllEnabledIPItems(this.AdminContext(), &pb.CountAllEnabledIPItemsRequest{
-		Ip:         params.Ip,
+		Keyword:    params.Keyword,
 		GlobalOnly: params.GlobalOnly,
 		Unread:     params.Unread,
 		EventLevel: params.EventLevel,
@@ -63,7 +63,7 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["page"] = page.AsHTML()

 	itemsResp, err := this.RPC().IPItemRPC().ListAllEnabledIPItems(this.AdminContext(), &pb.ListAllEnabledIPItemsRequest{
-		Ip:         params.Ip,
+		Keyword:    params.Keyword,
 		GlobalOnly: params.GlobalOnly,
 		Unread:     params.Unread,
 		EventLevel: params.EventLevel,
--- a/internal/web/actions/default/servers/server/settings/dns/updateCNAMEPopup.go
+++ b/internal/web/actions/default/servers/server/settings/dns/updateCNAMEPopup.go
@@ -48,7 +48,10 @@ func (this *UpdateCNAMEPopupAction) RunPost(params struct {
 		this.FailField("dnsName", "CNAME中只能包含数字、英文字母")
 	}

-	serverResp, err := this.RPC().ServerRPC().FindEnabledServer(this.AdminContext(), &pb.FindEnabledServerRequest{ServerId: params.ServerId})
+	serverResp, err := this.RPC().ServerRPC().FindEnabledServer(this.AdminContext(), &pb.FindEnabledServerRequest{
+		ServerId:       params.ServerId,
+		IgnoreSSLCerts: true,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
--- a/internal/web/actions/default/servers/server/settings/headers/createDeletePopup.go
+++ b/internal/web/actions/default/servers/server/settings/headers/createDeletePopup.go
@@ -19,8 +19,10 @@ func (this *CreateDeletePopupAction) Init() {

 func (this *CreateDeletePopupAction) RunGet(params struct {
 	HeaderPolicyId int64
+	Type           string
 }) {
 	this.Data["headerPolicyId"] = params.HeaderPolicyId
+	this.Data["type"] = params.Type

 	this.Show()
 }
@@ -38,13 +40,13 @@ func (this *CreateDeletePopupAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("名称不能为空")

-	policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HeaderPolicyId: params.HeaderPolicyId})
+	policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HttpHeaderPolicyId: params.HeaderPolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	policyConfig := &shared.HTTPHeaderPolicy{}
-	err = json.Unmarshal(policyConfigResp.HeaderPolicyJSON, policyConfig)
+	err = json.Unmarshal(policyConfigResp.HttpHeaderPolicyJSON, policyConfig)
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -53,8 +55,8 @@ func (this *CreateDeletePopupAction) RunPost(params struct {
 	deleteHeaders := policyConfig.DeleteHeaders
 	deleteHeaders = append(deleteHeaders, params.Name)
 	_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicyDeletingHeaders(this.AdminContext(), &pb.UpdateHTTPHeaderPolicyDeletingHeadersRequest{
-		HeaderPolicyId: params.HeaderPolicyId,
-		HeaderNames:    deleteHeaders,
+		HttpHeaderPolicyId: params.HeaderPolicyId,
+		HeaderNames:        deleteHeaders,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/server/settings/headers/createSetPopup.go
+++ b/internal/web/actions/default/servers/server/settings/headers/createSetPopup.go
@@ -52,13 +52,13 @@ func (this *CreateSetPopupAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入Header名称")

-	configResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HeaderPolicyId: params.HeaderPolicyId})
+	configResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HttpHeaderPolicyId: params.HeaderPolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	policyConfig := &shared.HTTPHeaderPolicy{}
-	err = json.Unmarshal(configResp.HeaderPolicyJSON, policyConfig)
+	err = json.Unmarshal(configResp.HttpHeaderPolicyJSON, policyConfig)
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -135,8 +135,8 @@ func (this *CreateSetPopupAction) RunPost(params struct {
 	}

 	_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicySettingHeaders(this.AdminContext(), &pb.UpdateHTTPHeaderPolicySettingHeadersRequest{
-		HeaderPolicyId: params.HeaderPolicyId,
-		HeadersJSON:    refsJSON,
+		HttpHeaderPolicyId: params.HeaderPolicyId,
+		HeadersJSON:        refsJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/server/settings/headers/delete.go
+++ b/internal/web/actions/default/servers/server/settings/headers/delete.go
@@ -8,7 +8,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 )

-// 删除Header
+// DeleteAction 删除Header
 type DeleteAction struct {
 	actionutils.ParentAction
 }
@@ -21,14 +21,14 @@ func (this *DeleteAction) RunPost(params struct {
 	defer this.CreateLog(oplogs.LevelInfo, "删除请求Header，HeaderPolicyId:%d, HeaderId:%d", params.HeaderPolicyId, params.HeaderId)

 	policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{
-		HeaderPolicyId: params.HeaderPolicyId,
+		HttpHeaderPolicyId: params.HeaderPolicyId,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	policyConfig := &shared.HTTPHeaderPolicy{}
-	err = json.Unmarshal(policyConfigResp.HeaderPolicyJSON, policyConfig)
+	err = json.Unmarshal(policyConfigResp.HttpHeaderPolicyJSON, policyConfig)
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -48,8 +48,8 @@ func (this *DeleteAction) RunPost(params struct {
 			return
 		}
 		_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicySettingHeaders(this.AdminContext(), &pb.UpdateHTTPHeaderPolicySettingHeadersRequest{
-			HeaderPolicyId: params.HeaderPolicyId,
-			HeadersJSON:    resultJSON,
+			HttpHeaderPolicyId: params.HeaderPolicyId,
+			HeadersJSON:        resultJSON,
 		})
 		if err != nil {
 			this.ErrorPage(err)
--- a/internal/web/actions/default/servers/server/settings/headers/deleteDeletingHeader.go
+++ b/internal/web/actions/default/servers/server/settings/headers/deleteDeletingHeader.go
@@ -19,12 +19,12 @@ func (this *DeleteDeletingHeaderAction) RunPost(params struct {
 	// 日志
 	defer this.CreateLog(oplogs.LevelInfo, "删除需要删除的请求Header，HeaderPolicyId:%d, HeaderName:%s", params.HeaderPolicyId, params.HeaderName)

-	policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HeaderPolicyId: params.HeaderPolicyId})
+	policyConfigResp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HttpHeaderPolicyId: params.HeaderPolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	policyConfigJSON := policyConfigResp.HeaderPolicyJSON
+	policyConfigJSON := policyConfigResp.HttpHeaderPolicyJSON
 	policyConfig := &shared.HTTPHeaderPolicy{}
 	err = json.Unmarshal(policyConfigJSON, policyConfig)
 	if err != nil {
@@ -40,8 +40,8 @@ func (this *DeleteDeletingHeaderAction) RunPost(params struct {
 		headerNames = append(headerNames, h)
 	}
 	_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicyDeletingHeaders(this.AdminContext(), &pb.UpdateHTTPHeaderPolicyDeletingHeadersRequest{
-		HeaderPolicyId: params.HeaderPolicyId,
-		HeaderNames:    headerNames,
+		HttpHeaderPolicyId: params.HeaderPolicyId,
+		HeaderNames:        headerNames,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/server/settings/headers/index.go
+++ b/internal/web/actions/default/servers/server/settings/headers/index.go
@@ -47,7 +47,7 @@ func (this *IndexAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		headerPolicyId := createHeaderPolicyResp.HeaderPolicyId
+		var headerPolicyId = createHeaderPolicyResp.HttpHeaderPolicyId
 		ref := &shared.HTTPHeaderPolicyRef{
 			IsPrior:        false,
 			IsOn:           true,
@@ -74,7 +74,7 @@ func (this *IndexAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		headerPolicyId := createHeaderPolicyResp.HeaderPolicyId
+		headerPolicyId := createHeaderPolicyResp.HttpHeaderPolicyId
 		ref := &shared.HTTPHeaderPolicyRef{
 			IsPrior:        false,
 			IsOn:           true,
--- a/internal/web/actions/default/servers/server/settings/headers/init.go
+++ b/internal/web/actions/default/servers/server/settings/headers/init.go
@@ -19,6 +19,7 @@ func init() {
 			GetPost("/createDeletePopup", new(CreateDeletePopupAction)).
 			Post("/deleteDeletingHeader", new(DeleteDeletingHeaderAction)).
 			Post("/delete", new(DeleteAction)).
+			GetPost("/updateCORSPopup", new(UpdateCORSPopupAction)).
 			EndAll()
 	})
 }
--- a/internal/web/actions/default/servers/server/settings/headers/updateCORSPopup.go
+++ b/internal/web/actions/default/servers/server/settings/headers/updateCORSPopup.go
@@ -0,0 +1,75 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package headers
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type UpdateCORSPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateCORSPopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UpdateCORSPopupAction) RunGet(params struct {
+	HeaderPolicyId int64
+}) {
+	this.Data["headerPolicyId"] = params.HeaderPolicyId
+
+	resp, err := this.RPC().HTTPHeaderPolicyRPC().FindEnabledHTTPHeaderPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderPolicyConfigRequest{HttpHeaderPolicyId: params.HeaderPolicyId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var headerPolicyJSON = resp.HttpHeaderPolicyJSON
+	var headerPolicy = &shared.HTTPHeaderPolicy{}
+	if len(headerPolicyJSON) > 0 {
+		err = json.Unmarshal(headerPolicyJSON, headerPolicy)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+	this.Data["cors"] = headerPolicy.CORS
+
+	this.Show()
+}
+
+func (this *UpdateCORSPopupAction) RunPost(params struct {
+	HeaderPolicyId int64
+	CorsJSON       []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	var config = &shared.HTTPCORSHeaderConfig{}
+	err := json.Unmarshal(params.CorsJSON, config)
+	if err != nil {
+		this.Fail("配置校验失败：" + err.Error())
+		return
+	}
+
+	err = config.Init()
+	if err != nil {
+		this.Fail("配置校验失败：" + err.Error())
+		return
+	}
+
+	_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicyCORS(this.AdminContext(), &pb.UpdateHTTPHeaderPolicyCORSRequest{
+		HttpHeaderPolicyId: params.HeaderPolicyId,
+		CorsJSON:           params.CorsJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}
--- a/internal/web/actions/default/servers/server/settings/https/index.go
+++ b/internal/web/actions/default/servers/server/settings/https/index.go
@@ -31,7 +31,7 @@ func (this *IndexAction) RunGet(params struct {
 	if !isOk {
 		return
 	}
-	httpsConfig := &serverconfigs.HTTPSProtocolConfig{}
+	var httpsConfig = &serverconfigs.HTTPSProtocolConfig{}
 	if len(server.HttpsJSON) > 0 {
 		err := json.Unmarshal(server.HttpsJSON, httpsConfig)
 		if err != nil {
@@ -44,12 +44,15 @@ func (this *IndexAction) RunGet(params struct {

 	var sslPolicy *sslconfigs.SSLPolicy
 	if httpsConfig.SSLPolicyRef != nil && httpsConfig.SSLPolicyRef.SSLPolicyId > 0 {
-		sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{SslPolicyId: httpsConfig.SSLPolicyRef.SSLPolicyId})
+		sslPolicyConfigResp, err := this.RPC().SSLPolicyRPC().FindEnabledSSLPolicyConfig(this.AdminContext(), &pb.FindEnabledSSLPolicyConfigRequest{
+			SslPolicyId: httpsConfig.SSLPolicyRef.SSLPolicyId,
+			IgnoreData:  true,
+		})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		sslPolicyConfigJSON := sslPolicyConfigResp.SslPolicyJSON
+		var sslPolicyConfigJSON = sslPolicyConfigResp.SslPolicyJSON
 		if len(sslPolicyConfigJSON) > 0 {
 			sslPolicy = &sslconfigs.SSLPolicy{}
 			err = json.Unmarshal(sslPolicyConfigJSON, sslPolicy)
--- a/internal/web/actions/default/servers/server/settings/index.go
+++ b/internal/web/actions/default/servers/server/settings/index.go
@@ -42,7 +42,10 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["clusters"] = clusterMaps

 	// 当前服务信息
-	serverResp, err := this.RPC().ServerRPC().FindEnabledServer(this.AdminContext(), &pb.FindEnabledServerRequest{ServerId: params.ServerId})
+	serverResp, err := this.RPC().ServerRPC().FindEnabledServer(this.AdminContext(), &pb.FindEnabledServerRequest{
+		ServerId:       params.ServerId,
+		IgnoreSSLCerts: true,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -65,34 +68,7 @@ func (this *IndexAction) RunGet(params struct {
 	}

 	// 套餐
-	var userPlanMap = maps.Map{"id": server.UserPlanId, "dayTo": "", "plan": maps.Map{}}
-	if server.UserPlanId > 0 {
-		userPlanResp, err := this.RPC().UserPlanRPC().FindEnabledUserPlan(this.AdminContext(), &pb.FindEnabledUserPlanRequest{UserPlanId: server.UserPlanId})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		var userPlan = userPlanResp.UserPlan
-		if userPlan != nil {
-			planResp, err := this.RPC().PlanRPC().FindEnabledPlan(this.AdminContext(), &pb.FindEnabledPlanRequest{PlanId: userPlan.PlanId})
-			if err != nil {
-				this.ErrorPage(err)
-				return
-			}
-			var plan = planResp.Plan
-			if plan != nil {
-				userPlanMap = maps.Map{
-					"id":    userPlan.Id,
-					"dayTo": userPlan.DayTo,
-					"plan": maps.Map{
-						"id":   plan.Id,
-						"name": plan.Name,
-					},
-				}
-			}
-		}
-	}
-	this.Data["userPlan"] = userPlanMap
+	this.initUserPlan(server)

 	// 集群
 	clusterId := int64(0)
@@ -148,6 +124,7 @@ func (this *IndexAction) RunGet(params struct {
 // RunPost 保存
 func (this *IndexAction) RunPost(params struct {
 	ServerId       int64
+	UserId         int64
 	Name           string
 	Description    string
 	ClusterId      int64
@@ -184,16 +161,28 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}

-	// 修改套餐
-	if params.UserPlanId > 0 {
-		_, err = this.RPC().ServerRPC().UpdateServerUserPlan(this.AdminContext(), &pb.UpdateServerUserPlanRequest{
-			ServerId:   params.ServerId,
-			UserPlanId: params.UserPlanId,
+	// 修改用户
+	if params.UserId > 0 {
+		_, err = this.RPC().ServerRPC().UpdateServerUser(this.AdminContext(), &pb.UpdateServerUserRequest{
+			ServerId: params.ServerId,
+			UserId:   params.UserId,
 		})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
+	} else {
+		// 修改套餐
+		if params.UserPlanId > 0 {
+			_, err = this.RPC().ServerRPC().UpdateServerUserPlan(this.AdminContext(), &pb.UpdateServerUserPlanRequest{
+				ServerId:   params.ServerId,
+				UserPlanId: params.UserPlanId,
+			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+		}
 	}

 	this.Success()
--- a/internal/web/actions/default/servers/server/settings/index_ext.go
+++ b/internal/web/actions/default/servers/server/settings/index_ext.go
@@ -0,0 +1,14 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
+//go:build !plus
+
+package settings
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+func (this *IndexAction) initUserPlan(server *pb.Server) {
+	var userPlanMap = maps.Map{"id": server.UserPlanId, "dayTo": "", "plan": maps.Map{}}
+	this.Data["userPlan"] = userPlanMap
+}
--- a/internal/web/actions/default/servers/server/settings/locations/headers/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/headers/index.go
@@ -36,7 +36,7 @@ func (this *IndexAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		headerPolicyId := createHeaderPolicyResp.HeaderPolicyId
+		headerPolicyId := createHeaderPolicyResp.HttpHeaderPolicyId
 		ref := &shared.HTTPHeaderPolicyRef{
 			IsPrior:        false,
 			IsOn:           true,
@@ -59,7 +59,7 @@ func (this *IndexAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		headerPolicyId := createHeaderPolicyResp.HeaderPolicyId
+		headerPolicyId := createHeaderPolicyResp.HttpHeaderPolicyId
 		ref := &shared.HTTPHeaderPolicyRef{
 			IsPrior:        false,
 			IsOn:           true,
--- a/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go
+++ b/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go
@@ -109,6 +109,12 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString
 		"isActive": secondMenuItem == "referer",
 		"isOn":     locationConfig.Web != nil && locationConfig.Web.Referers != nil && locationConfig.Web.Referers.IsPrior,
 	})
+	menuItems = append(menuItems, maps.Map{
+		"name":     "UA名单",
+		"url":      "/servers/server/settings/locations/userAgent?serverId=" + serverIdString + "&locationId=" + locationIdString,
+		"isActive": secondMenuItem == "userAgent",
+		"isOn":     locationConfig.Web != nil && locationConfig.Web.UserAgent != nil && locationConfig.Web.UserAgent.IsPrior,
+	})
 	menuItems = append(menuItems, maps.Map{
 		"name":     "字符编码",
 		"url":      "/servers/server/settings/locations/charset?serverId=" + serverIdString + "&locationId=" + locationIdString,
--- a/internal/web/actions/default/servers/server/settings/locations/referers/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/referers/index.go
@@ -1,6 +1,6 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.

-package uam
+package referers

 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
刘祥超	619a2817ce	检查版本更新时增加当前版本参数	2023-03-12 21:24:08 +08:00
刘祥超	12a33ee9fc	自动安装的MySQL binlog过期时间改成7天	2023-03-12 20:58:13 +08:00
刘祥超	26302ca930	重启edge-admin时确保同目录下的edge-api也能重启	2023-03-11 22:02:29 +08:00
刘祥超	7e85555ba7	安装过程中可以选择自动在本机安装MySQL	2023-03-11 18:52:40 +08:00
刘祥超	2546676f6a	删除页脚捐助作者链接	2023-03-11 14:44:19 +08:00
刘祥超	93b7edf5c4	安装过程中节点主机地址允许填写域名	2023-03-10 17:00:53 +08:00
刘祥超	571e432263	WAF cc防护增加“检查请求来源指纹”选项	2023-03-10 10:34:50 +08:00
刘祥超	580b158567	优化tips弹窗	2023-03-09 17:40:49 +08:00
刘祥超	395aa665d7	可以在运行日志页面中删除使用关键词匹配的运行日志	2023-03-09 16:20:09 +08:00
刘祥超	a80e54e0b3	优化<url-patterns-box>组件	2023-03-09 12:09:28 +08:00
刘祥超	8ccd41b551	优化路由规则标签、菜单、删除UAM组件	2023-03-09 11:42:15 +08:00
刘祥超	9d6a3a8a0d	优化<url-patterns-box>组件	2023-03-07 17:18:13 +08:00
刘祥超	a9d1b4b863	集群服务设置增加“记录找不到网站日志”选项	2023-03-07 10:30:11 +08:00
刘祥超	459d664a60	更新go.mod	2023-03-06 21:51:10 +08:00
刘祥超	5f10b0156c	5秒盾增加例外URL和限制URL	2023-03-06 21:48:29 +08:00
刘祥超	348c07f847	优化网站服务WAF设置界面	2023-03-06 16:40:42 +08:00
刘祥超	934b1894c4	使用edge-admin upgrade升级时可以通过--url参数指定升级包URL	2023-03-05 19:52:48 +08:00
刘祥超	a660f4af93	上传components.js	2023-03-05 19:51:46 +08:00
刘祥超	12c0d39b13	优化缓存条件设置界面	2023-03-05 16:48:01 +08:00
刘祥超	bc6de68006	远程升级API节点限制版本号必须不小于0.6.4	2023-03-05 15:32:27 +08:00
刘祥超	52bb753594	实现API节点远程升级	2023-03-05 12:05:18 +08:00
刘祥超	ed6b763d06	远程升级API节点（部分实现）	2023-03-04 21:04:30 +08:00
刘祥超	07e421afea	更新components.js	2023-03-04 09:34:17 +08:00
刘祥超	71352841bf	修复无法启动安装的Bug	2023-03-04 09:34:10 +08:00
刘祥超	91e8fcbb24	使用edge-admin upgrade升级系统时URL请求增加User-Agent	2023-03-03 10:44:04 +08:00
刘祥超	5b67a85624	WAF阻止动作也增加最大封禁时长	2023-03-01 19:18:22 +08:00
刘祥超	b49efa0d5a	WAF拦截动作可以设置最大封禁时间，从而实现封禁时间随机	2023-03-01 18:59:42 +08:00
刘祥超	abeb585a0d	优化代码	2023-03-01 16:58:38 +08:00
刘祥超	cf621f1cc9	WAF支持忽略全局WAF规则	2023-03-01 16:46:49 +08:00
刘祥超	389a494e00	优化界面	2023-03-01 15:30:32 +08:00
刘祥超	a9c55dc23b	在节点列表中IP地址中显示对应的专属集群	2023-03-01 15:23:36 +08:00
刘祥超	3d35b7e71b	节点IP地址可以设置专属集群	2023-03-01 11:38:21 +08:00
刘祥超	6f78146711	可以修改单个用户的带宽算法	2023-02-27 10:46:48 +08:00
刘祥超	8afa47c351	删除不必要的文件	2023-02-22 19:25:38 +08:00
刘祥超	20838cfc3e	增加<js-page>组件	2023-02-22 17:34:32 +08:00
刘祥超	d00acd6d2f	上传日期相关公共函数	2023-02-18 20:45:05 +08:00
刘祥超	0b58a36779	优化界面	2023-02-17 10:30:25 +08:00
刘祥超	54bc98e9c1	优化组件显示	2023-02-13 09:44:10 +08:00
刘祥超	836daf2ad9	Dockerfile版本号修改为0.6.3	2023-02-10 18:17:57 +08:00
刘祥超	9a8cd9bd87	优化缓存请求条件界面	2023-02-10 11:15:06 +08:00
刘祥超	c555d91503	文件扩展名相关变量使用${requestPathLowerExtension}	2023-02-10 10:44:29 +08:00
刘祥超	e0e7c1bcc4	修复表单能够上传的数据过小问题	2023-02-07 11:40:28 +08:00
刘祥超	4bf733beec	在管理员登录后才验证OTP	2023-02-04 16:44:33 +08:00
刘祥超	e93f23c943	使用数据库存储SESSION	2023-02-04 15:18:26 +08:00
刘祥超	5384f4d9f2	优化WAF规则大小写敏感显示	2023-02-02 16:14:07 +08:00
刘祥超	3c0a97c3cc	修复防盗链设置中域名无法修改的Bug	2023-02-01 18:16:41 +08:00
刘祥超	129db6cf4e	修复无法显示IPv6最近日志的Bug	2023-02-01 10:36:30 +08:00
刘祥超	c6bfa5652f	版本号修改为0.6.4	2023-01-14 17:19:03 +08:00
刘祥超	780472d83e	更新components.js	2023-01-14 17:18:34 +08:00
刘祥超	0d02e3f15a	优化WAF创建规则界面中参数选项显示	2023-01-13 18:51:14 +08:00
刘祥超	bf82f22d0f	WAF规则中如果对比值为空，则显示空字样	2023-01-13 15:58:35 +08:00
刘祥超	e18f182ce6	版本号修改为0.6.3	2023-01-11 15:45:03 +08:00
刘祥超	761c26b587	Update Dockerfile	2023-01-10 21:32:20 +08:00
刘祥超	5e62769dcf	修改版本为0.6.2	2023-01-10 21:17:20 +08:00
刘祥超	86b8a718a0	在Dockerfile中增加local repository提示	2023-01-10 18:31:28 +08:00
刘祥超	a729cfc31d	更新Dockerfile文件	2023-01-10 10:53:48 +08:00
刘祥超	96cfda852a	Dockerfile版本号更新到0.6.0	2023-01-09 20:45:04 +08:00
刘祥超	0423d9246c	更新components.js	2023-01-09 18:12:45 +08:00
刘祥超	985798757f	修复<values-box>组件内容中如果出现数字的显示问题	2023-01-09 18:08:24 +08:00
刘祥超	72876f6749	版本修改为0.6.1	2023-01-09 16:06:13 +08:00
刘祥超	03d6e223d8	更新components.js	2023-01-09 09:31:19 +08:00
刘祥超	62d9f2ed97	优化文字提示	2023-01-08 19:38:50 +08:00
刘祥超	a550a44a52	集群服务设置增加自动读超时选项	2023-01-07 20:04:42 +08:00
刘祥超	b19d586949	更新components.js	2023-01-07 19:34:48 +08:00
刘祥超	bbfa3ee57f	优化任务Badge检查频率	2023-01-07 19:34:40 +08:00
刘祥超	af409dd3b8	优化WAF规则显示样式	2023-01-06 20:06:30 +08:00
刘祥超	3db79ca149	更新components.js	2023-01-06 19:17:31 +08:00
刘祥超	e880420494	WAF规则使用中文显示运算符	2023-01-06 19:12:53 +08:00
刘祥超	28ec17b8fe	优化请求条件操作符描述	2023-01-06 16:05:06 +08:00
刘祥超	8026a40807	修改一处错别字	2023-01-05 10:27:59 +08:00
刘祥超	068c6d406a	useragent改为userAgent	2023-01-02 18:20:42 +08:00
刘祥超	57470e4ef0	集群服务设置中增加性能设置	2023-01-01 19:26:59 +08:00
刘祥超	ca8e1537f5	修复文字错误	2023-01-01 18:33:05 +08:00
刘祥超	d67b818398	华为云可以设置终端节点（endpoint）	2023-01-01 18:28:37 +08:00
刘祥超	f5f46424bb	集群/节点阈值切换监控项时同时切换参数描述	2022-12-31 18:33:42 +08:00
刘祥超	1e259717ce	优化代码	2022-12-31 17:31:17 +08:00
刘祥超	91ece99a9c	优化证书加载速度	2022-12-31 17:21:48 +08:00
刘祥超	d30ebdb369	优化证书数量很多时的页面加载速度	2022-12-31 17:12:49 +08:00
刘祥超	ade8522b69	实现UA名单功能	2022-12-30 20:48:38 +08:00
刘祥超	159b308f31	内容压缩增加默认内容长度限制	2022-12-30 14:37:50 +08:00
刘祥超	837bf25f7b	内容压缩支持例外扩展名	2022-12-30 12:04:17 +08:00
刘祥超	8301d3669b	默认情况下内容压缩不支持Partial Content	2022-12-30 11:43:47 +08:00
刘祥超	cc752e8d80	优化文字提示	2022-12-29 17:19:53 +08:00
刘祥超	d20e6bd42f	增加CORS自适应跨域	2022-12-29 17:16:07 +08:00
刘祥超	bfee9fe233	优化文字提示	2022-12-27 18:55:18 +08:00
刘祥超	9c962b09f1	调整文字提示	2022-12-22 11:43:31 +08:00
刘祥超	46edefead7	服务没有设置所属用户时可以设置一个用户	2022-12-21 16:13:39 +08:00
刘祥超	725cfc8a2b	优化代码	2022-12-15 16:18:10 +08:00
刘祥超	1ce48b9ef4	安全设置中检查搜索引擎和爬虫时不区分大小写	2022-12-13 18:22:11 +08:00
刘祥超	37cc28f225	优化界面	2022-12-13 18:21:31 +08:00
刘祥超	5ebe3bb8e0	实时访问日志有弹窗打开时，暂时不更新数据	2022-12-10 19:01:57 +08:00
刘祥超	aa01512f89	优化<more-options-indicator>组件	2022-12-10 15:57:39 +08:00
刘祥超	37ff2b886a	初步完成用户电子邮箱绑定（激活）	2022-12-08 20:25:20 +08:00
刘祥超	ce18212756	自定义线路增加区域之间关系设置	2022-12-06 22:32:32 +08:00
刘祥超	08f50a274a	修复HTTPS之HSTS设置无法手动输入有效时间的Bug	2022-12-06 14:38:59 +08:00
刘祥超	892ee0013a	修复点击修改WAF规则时未保存时也会生效的Bug	2022-12-06 10:46:46 +08:00
刘祥超	e9a47041fd	刷新预热页面增加功能说明	2022-12-06 09:52:57 +08:00
刘祥超	d419fa06e8	优化文字提示	2022-12-03 14:29:30 +08:00
刘祥超	8b961a890c	优化文字提示	2022-12-01 14:40:17 +08:00
刘祥超	db32915114	更新components.js	2022-11-29 15:40:37 +08:00
刘祥超	2ffdb10cce	版本号更新为0.6.0	2022-11-29 15:40:23 +08:00
刘祥超	507fd7e5d4	更新Dockerfile中的版本号	2022-11-29 15:40:11 +08:00
刘祥超	7df599b5a9	DNS线路选择器增加代号搜索	2022-11-28 19:00:14 +08:00
刘祥超	9987334f55	版本号修改为0.5.10	2022-11-28 18:59:40 +08:00
刘祥超	d8c3365384	节点时间相差30秒钟以上才提示	2022-11-28 15:57:41 +08:00
刘祥超	2e284b5af9	版本号修改为0.5.9	2022-11-28 15:57:18 +08:00
刘祥超	89ddd4e6a3	更新依赖库	2022-11-28 11:39:38 +08:00
刘祥超	36524ea481	修复一处测试用例package引用错误	2022-11-28 11:39:08 +08:00
刘祥超	35cf693610	更新Dockerfile	2022-11-28 11:34:02 +08:00
刘祥超	42148a66bd	改进文字提示	2022-11-27 22:00:35 +08:00
刘祥超	96878715bf	优化界面	2022-11-26 19:04:55 +08:00
刘祥超	1a5f3342e7	优化文字提示	2022-11-26 15:28:01 +08:00
刘祥超	3613d13a2b	优化文字说明	2022-11-25 19:05:11 +08:00
刘祥超	7786140d85	优化代码	2022-11-24 17:20:08 +08:00
刘祥超	3a23b57f1b	优化智能DNS访问日志组件	2022-11-24 10:24:04 +08:00
刘祥超	5a6e6fba69	节点详情显示API连接状况	2022-11-22 11:27:48 +08:00
刘祥超	910b3a6162	在节点详情中显示API节点地址	2022-11-21 21:07:51 +08:00
刘祥超	0dc19bed45	节点可以单独设置所使用的API节点地址	2022-11-21 19:54:54 +08:00
刘祥超	a7bdb64301	记录名第一段允许通配符	2022-11-20 20:08:03 +08:00
刘祥超	4739072a85	Update go.mod	2022-11-18 17:37:25 +08:00
刘祥超	07bdae2488	安装时检测本地数据库时增加更多的候选密码	2022-11-18 17:07:12 +08:00
刘祥超	b84035d821	优化代码	2022-11-18 17:02:38 +08:00
刘祥超	dc0a7b9dae	优化文字提示	2022-11-18 15:45:13 +08:00
刘祥超	2937bd8de0	提交components.js	2022-11-17 17:34:21 +08:00
刘祥超	37315ef4d9	优化代码	2022-11-17 10:41:56 +08:00
刘祥超	1986fece07	优化代码	2022-11-17 10:40:57 +08:00
刘祥超	16b1657f35	优化WAF规则相关界面	2022-11-16 15:43:08 +08:00
刘祥超	c115c62cd9	去掉服务CNAME末尾的点符号，防止误解	2022-11-16 14:44:07 +08:00
刘祥超	d2df7f8d5b	节点列表页带宽使用bps显示	2022-11-16 12:02:56 +08:00
刘祥超	6cb79864e6	边缘节点支持设置多个缓存目录	2022-11-15 20:35:45 +08:00
刘祥超	982d28c7b4	docker build增加--no-cache参数	2022-11-14 15:01:13 +08:00
刘祥超	0f57516fdc	Dockerfile: 使用alpine:latest代替alpine:edge	2022-11-14 14:49:19 +08:00
刘祥超	75a89defcb	构建Dockerfile时从官网下载最新版本安装包	2022-11-14 10:01:22 +08:00
刘祥超	22a6c52060	增加Docker镜像构建脚本	2022-11-13 18:46:30 +08:00
刘祥超	37607e4a41	安装过程显示更详细内容	2022-11-11 21:47:36 +08:00
刘祥超	5936155998	优化文字提示	2022-11-11 17:46:10 +08:00
刘祥超	8d76de935f	优化文字提示	2022-11-10 15:07:15 +08:00
刘祥超	9baa530064	优化文字提示	2022-11-09 18:20:18 +08:00
刘祥超	103414b338	优化<checkbox>组件	2022-11-09 17:50:22 +08:00
刘祥超	72fe68ebfe	访问日志搜索method:XXX和requestMethod:XXX方法	2022-11-09 11:58:39 +08:00
刘祥超	cfed31958b	优化文字提示	2022-11-08 09:22:09 +08:00
刘祥超	3d5fca2d36	调整默认压缩的mime types	2022-11-08 09:18:13 +08:00
刘祥超	a5710286ec	优化代码	2022-11-06 20:34:19 +08:00
刘祥超	d0ce0c6c58	优化界面	2022-11-06 15:16:21 +08:00
刘祥超	779e2cf0f2	域名跳转增加忽略跳转前端口选项	2022-11-04 20:59:20 +08:00
刘祥超	2108474777	删除不必要的文件	2022-11-04 15:19:30 +08:00
刘祥超	e25e0f1747	删除不必要的文件	2022-11-04 15:01:36 +08:00
刘祥超	e8e74b639c	优化datepicker组件	2022-11-04 14:35:32 +08:00
刘祥超	a14fcd1e50	添加和修改API节点时，检查HTTP API端口是否和GRPC端口冲突	2022-11-04 12:04:07 +08:00
刘祥超	485c0e0891	修复系统用户和平台用户access key无法禁用和删除的问题	2022-11-04 11:06:45 +08:00
刘祥超	00a19e9d43	时钟同步增加是否检查chrony选项	2022-11-03 14:58:32 +08:00
刘祥超	67d0dc0783	版本修改为0.5.8	2022-11-02 15:10:47 +08:00
刘祥超	3718c35842	提交components.js	2022-11-02 15:10:39 +08:00
刘祥超	567ffc80b6	优化<domains-box>组件	2022-11-02 09:58:59 +08:00
刘祥超	5d15a08ac8	防盗链使用<domains-box>组件	2022-11-02 09:47:17 +08:00
刘祥超	2b84037346	修改一处注释	2022-11-01 21:16:48 +08:00
刘祥超	536f11e617	修复datetime组件时间戳生成错误	2022-10-31 11:08:36 +08:00
刘祥超	5d367a384e	修改版本为0.5.7	2022-10-31 10:39:10 +08:00
刘祥超	04933e6bf0	重置配置的同时也重置本地API节点的配置	2022-10-30 20:06:59 +08:00
刘祥超	12abe9aa69	优化界面显示	2022-10-30 20:06:38 +08:00
刘祥超	cba642a4bc	多处域名列表支持批量输入	2022-10-28 17:59:46 +08:00
刘祥超	9fce0ac0aa	优化API节点界面	2022-10-27 19:45:03 +08:00
刘祥超	681812b619	优化申请证书界面	2022-10-27 19:44:50 +08:00
刘祥超	6d0be57698	更新components.js	2022-10-27 11:19:10 +08:00
刘祥超	1d521602e1	节点SSH登录自动使用集群设置	2022-10-26 19:23:50 +08:00
刘祥超	2f67e7937a	集群全局服务配置中增加多个访问日志相关选项	2022-10-26 17:49:25 +08:00
刘祥超	e0078a42dc	URL跳转中增加域名跳转、端口跳转	2022-10-26 16:06:50 +08:00
刘祥超	3ec875d49d	节点设置中增加“通过IP名单”选项	2022-10-26 10:41:42 +08:00
刘祥超	35028d1310	开源版本Dashboard不再显示用户节点相关信息	2022-10-26 09:51:09 +08:00
刘祥超	7ba3d7c4bb	修复窄屏显示时有些内容无法隐藏的问题	2022-10-26 09:30:41 +08:00
刘祥超	c05e64098c	更新components.js	2022-10-25 14:36:40 +08:00
刘祥超	e82ee56a2c	IP名单支持模糊查询	2022-10-25 10:15:17 +08:00
刘祥超	5681b61aea	在选择区域弹出框中可以不选区域直接确定返回	2022-10-25 09:43:31 +08:00
刘祥超	d6ce7eab25	修复域名解析--集群中单节点多IP时无法修改IP的Bug	2022-10-24 16:33:56 +08:00
刘祥超	bf597fe41c	添加、修改、删除HTTP Header时增加通用Header提示	2022-10-24 15:42:18 +08:00
刘祥超	6a920f964f	集群服务设置--访问日志中可以设置是否只记录通用Header	2022-10-24 14:39:32 +08:00
刘祥超	977b66ba4e	防盗链功能增加禁止的来源域名	2022-10-24 10:20:44 +08:00
刘祥超	4659c29358	优化界面显示	2022-10-23 11:44:09 +08:00
刘祥超	e3bc95b275	管理安全设置中域名列表支持通配符	2022-10-21 18:36:33 +08:00
刘祥超	bf51255e13	优化区域列表界面	2022-10-20 15:17:03 +08:00
刘祥超	915fe6837b	区域设置中增加节点快速设置区域的功能	2022-10-20 15:11:26 +08:00
刘祥超	d1237215c0	更新components.js	2022-10-20 11:07:07 +08:00
刘祥超	8ba5cfdfa6	优化代码	2022-10-19 19:55:51 +08:00
刘祥超	0d1097425d	优化界面和文字	2022-10-18 10:31:20 +08:00
刘祥超	0789a9ecc8	优化数字格式化	2022-10-16 09:36:36 +08:00
刘祥超	400f764b74	优化数字格式化	2022-10-15 19:33:07 +08:00
刘祥超	46e036e3a4	删除代码	2022-10-15 16:58:45 +08:00
刘祥超	17e6264af8	删除不需要的代码	2022-10-14 09:57:24 +08:00
刘祥超	468b6ae125	添加源站的时候也提示8443和8080对应的协议	2022-10-07 09:01:22 +08:00
刘祥超	e5f5ee4f6a	提交components.js	2022-10-03 21:11:02 +08:00
刘祥超	3695082ec2	服务列表页带宽使用比特代替字节	2022-10-03 19:25:20 +08:00
刘祥超	f384d86014	版本修改为0.5.6	2022-10-01 08:49:00 +08:00
刘祥超	34bf5028c3	删除不必要的代码	2022-10-01 07:16:37 +08:00
刘祥超	8b727aa939	提交components.js	2022-09-30 18:36:46 +08:00
刘祥超	9432600de6	优化网站服务列表页在海量域名时的加载速度	2022-09-30 13:48:16 +08:00
刘祥超	bb790ec687	文件下载链接找不到对应元素时不提示错误	2022-09-30 09:39:59 +08:00
刘祥超	8bad658d7c	版本调整为v0.5.5	2022-09-28 18:57:47 +08:00