用户增加AccessKey管理

README.md

@@ -9,7 +9,8 @@
 * `高扩展性` - 可以自由扩展新的节点，支持亿级数据
 
 ## 文档
-[点这里查看文档](http://edge.teaos.cn/docs)
+* [新手指南](https://edge.teaos.cn/docs/QuickStart/Index.md)
+* [文档](http://edge.teaos.cn/docs)
 
 ## 架构
 ![架构](doc/architect-zh.jpg)
@@ -23,4 +24,5 @@
 有什么问题和建议都可以加入QQ群 `659832182`。
 
 ## 感谢
-* 感谢[JetBrains公司](https://www.jetbrains.com/)提供免费的IDE开发Licence。
+* 感谢[JetBrains公司](https://www.jetbrains.com/)提供免费的IDE开发Licence。
+* 感谢[Gitee](https://gitee.com/)提供国内源代码托管平台

build/build-all.sh

@@ -6,3 +6,4 @@
 ./build.sh linux mips64
 ./build.sh linux mips64le
 ./build.sh darwin amd64
+./build.sh darwin arm64

build/licenses/README.md

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

build/licenses/miekg-dns.md

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

cmd/edge-admin/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/apps"
+	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/nodes"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web"
@@ -13,7 +14,14 @@ func main() {
 	app := apps.NewAppCmd().
 		Version(teaconst.Version).
 		Product(teaconst.ProductName).
-		Usage(teaconst.ProcessName + " [-v|start|stop|restart|service|daemon]")
+		Usage(teaconst.ProcessName+" [-v|start|stop|restart|service|daemon|reset]").
+		Option("-h", "show this help").
+		Option("-v", "show version").
+		Option("start", "start the service").
+		Option("stop", "stop the service").
+		Option("service", "register service into systemd").
+		Option("daemon", "start the service with daemon").
+		Option("reset", "reset configs")
 
 	app.On("daemon", func() {
 		nodes.NewAdminNode().Daemon()
@@ -26,6 +34,14 @@ func main() {
 		}
 		fmt.Println("done")
 	})
+	app.On("reset", func() {
+		err := configs.ResetAPIConfig()
+		if err != nil {
+			fmt.Println("[ERROR]reset failed: " + err.Error())
+			return
+		}
+		fmt.Println("done")
+	})
 	app.Run(func() {
 		adminNode := nodes.NewAdminNode()
 		adminNode.Run()

go.mod

@@ -9,13 +9,12 @@ require (
 	github.com/cespare/xxhash v1.1.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/go-yaml/yaml v2.1.0+incompatible
-	github.com/iwind/TeaGo v0.0.0-20201206115018-cdd967bfb13d
+	github.com/iwind/TeaGo v0.0.0-20210411134150-ddf57e240c2f
 	github.com/miekg/dns v1.1.35
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/tealeg/xlsx/v3 v3.2.3
 	github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119
-	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c // indirect
+	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c
 	google.golang.org/grpc v1.32.0
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 )

go.sum

@@ -9,6 +9,7 @@ github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiU
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -53,9 +54,8 @@ github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iwind/TeaGo v0.0.0-20200923021120-f5d76441fe9e/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
-github.com/iwind/TeaGo v0.0.0-20201206115018-cdd967bfb13d h1:J4ohNUwOqCQkY62LFwaygfGtHJj+87pnzr+RJxEYSBo=
-github.com/iwind/TeaGo v0.0.0-20201206115018-cdd967bfb13d/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/iwind/TeaGo v0.0.0-20210411134150-ddf57e240c2f h1:r2O8PONj/KiuZjJHVHn7KlCePUIjNtgAmvLfgRafQ8o=
+github.com/iwind/TeaGo v0.0.0-20210411134150-ddf57e240c2f/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
 github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -65,12 +65,10 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs=
 github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=

internal/configloaders/admin_module.go

@@ -1,6 +1,7 @@
 package configloaders
 
 import (
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
@@ -14,6 +15,7 @@ const (
 	AdminModuleCodeServer    AdminModuleCode = "server"    // 网站
 	AdminModuleCodeNode      AdminModuleCode = "node"      // 节点
 	AdminModuleCodeDNS       AdminModuleCode = "dns"       // DNS
+	AdminModuleCodeNS        AdminModuleCode = "ns"        // 域名服务
 	AdminModuleCodeAdmin     AdminModuleCode = "admin"     // 系统用户
 	AdminModuleCodeUser      AdminModuleCode = "user"      // 平台用户
 	AdminModuleCodeFinance   AdminModuleCode = "finance"   // 财务
@@ -68,7 +70,7 @@ func NotifyAdminModuleMappingChange() error {
 	return err
 }
 
-// 检查用户是否存在
+// CheckAdmin 检查用户是否存在
 func CheckAdmin(adminId int64) bool {
 	locker.Lock()
 	defer locker.Unlock()
@@ -82,7 +84,7 @@ func CheckAdmin(adminId int64) bool {
 	return ok
 }
 
-// 检查模块是否允许访问
+// AllowModule 检查模块是否允许访问
 func AllowModule(adminId int64, module string) bool {
 	locker.Lock()
 	defer locker.Unlock()
@@ -103,7 +105,7 @@ func AllowModule(adminId int64, module string) bool {
 	return false
 }
 
-// 获取管理员第一个可访问模块
+// FindFirstAdminModule 获取管理员第一个可访问模块
 func FindFirstAdminModule(adminId int64) (module AdminModuleCode, ok bool) {
 	locker.Lock()
 	defer locker.Unlock()
@@ -118,7 +120,7 @@ func FindFirstAdminModule(adminId int64) (module AdminModuleCode, ok bool) {
 	return
 }
 
-// 查找某个管理员名称
+// FindAdminFullname 查找某个管理员名称
 func FindAdminFullname(adminId int64) string {
 	locker.Lock()
 	defer locker.Unlock()
@@ -130,9 +132,9 @@ func FindAdminFullname(adminId int64) string {
 	return ""
 }
 
-// 所有权限列表
+// AllModuleMaps 所有权限列表
 func AllModuleMaps() []maps.Map {
-	return []maps.Map{
+	m := []maps.Map{
 		{
 			"name": "看板",
 			"code": AdminModuleCodeDashboard,
@@ -153,6 +155,15 @@ func AllModuleMaps() []maps.Map {
 			"code": AdminModuleCodeDNS,
 			"url":  "/dns",
 		},
+	}
+	if teaconst.IsPlus {
+		m = append(m, maps.Map{
+			"name": "域名服务",
+			"code": AdminModuleCodeNS,
+			"url":  "/ns",
+		})
+	}
+	m = append(m, []maps.Map{
 		{
 			"name": "平台用户",
 			"code": AdminModuleCodeUser,
@@ -178,5 +189,6 @@ func AllModuleMaps() []maps.Map {
 			"code": AdminModuleCodeSetting,
 			"url":  "/settings",
 		},
-	}
+	}...)
+	return m
 }

internal/configs/api_config.go

@@ -59,6 +59,49 @@ func LoadAPIConfig() (*APIConfig, error) {
 	return config, nil
 }
 
+// ResetAPIConfig 重置配置
+func ResetAPIConfig() error {
+	filename := "api.yaml"
+
+	{
+		configFile := Tea.ConfigFile(filename)
+		stat, err := os.Stat(configFile)
+		if err == nil && !stat.IsDir() {
+			err = os.Remove(configFile)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	// 重置 ~/.edge-admin/api.yaml
+	homeDir, homeErr := os.UserHomeDir()
+	if homeErr == nil {
+		configFile := homeDir + "/." + teaconst.ProcessName + "/" + filename
+		stat, err := os.Stat(configFile)
+		if err == nil && !stat.IsDir() {
+			err = os.Remove(configFile)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	// 重置 /etc/edge-admin/api.yaml
+	{
+		configFile := "/etc/" + teaconst.ProcessName + "/" + filename
+		stat, err := os.Stat(configFile)
+		if err == nil && !stat.IsDir() {
+			err = os.Remove(configFile)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
 // WriteFile 写入API配置
 func (this *APIConfig) WriteFile(path string) error {
 	data, err := yaml.Marshal(this)
@@ -84,7 +127,7 @@ func (this *APIConfig) WriteFile(path string) error {
 		}
 	}
 
-	// 写入 /etc/.edge-admin
+	// 写入 /etc/edge-admin
 	{
 		dir := "/etc/" + teaconst.ProcessName
 		stat, err := os.Stat(dir)

internal/const/const.go

@@ -1,7 +1,7 @@
 package teaconst
 
 const (
-	Version = "0.0.13"
+	Version = "0.2.1"
 
 	ProductName   = "Edge Admin"
 	ProcessName   = "edge-admin"

internal/rpc/rpc_client.go

@@ -22,7 +22,7 @@ import (
 	"time"
 )
 
-// RPC客户端
+// RPCClient RPC客户端
 type RPCClient struct {
 	apiConfig *configs.APIConfig
 	conns     []*grpc.ClientConn
@@ -30,7 +30,7 @@ type RPCClient struct {
 	locker sync.Mutex
 }
 
-// 构造新的RPC客户端
+// NewRPCClient 构造新的RPC客户端
 func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) {
 	if apiConfig == nil {
 		return nil, errors.New("api config should not be nil")
@@ -91,6 +91,14 @@ func (this *RPCClient) NodeIPAddressRPC() pb.NodeIPAddressServiceClient {
 	return pb.NewNodeIPAddressServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) NodeValueRPC() pb.NodeValueServiceClient {
+	return pb.NewNodeValueServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NodeThresholdRPC() pb.NodeThresholdServiceClient {
+	return pb.NewNodeThresholdServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) ServerRPC() pb.ServerServiceClient {
 	return pb.NewServerServiceClient(this.pickConn())
 }
@@ -123,6 +131,10 @@ func (this *RPCClient) ServerHTTPFirewallDailyStatRPC() pb.ServerHTTPFirewallDai
 	return pb.NewServerHTTPFirewallDailyStatServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) ServerDailyStatRPC() pb.ServerDailyStatServiceClient {
+	return pb.NewServerDailyStatServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) ServerGroupRPC() pb.ServerGroupServiceClient {
 	return pb.NewServerGroupServiceClient(this.pickConn())
 }
@@ -212,6 +224,10 @@ func (this *RPCClient) HTTPAccessLogRPC() pb.HTTPAccessLogServiceClient {
 	return pb.NewHTTPAccessLogServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) HTTPFastcgiRPC() pb.HTTPFastcgiServiceClient {
+	return pb.NewHTTPFastcgiServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) SSLCertRPC() pb.SSLCertServiceClient {
 	return pb.NewSSLCertServiceClient(this.pickConn())
 }
@@ -320,6 +336,10 @@ func (this *RPCClient) UserBillRPC() pb.UserBillServiceClient {
 	return pb.NewUserBillServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) UserAccessKeyRPC() pb.UserAccessKeyServiceClient {
+	return pb.NewUserAccessKeyServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) LoginRPC() pb.LoginServiceClient {
 	return pb.NewLoginServiceClient(this.pickConn())
 }
@@ -336,6 +356,34 @@ func (this *RPCClient) AuthorityNodeRPC() pb.AuthorityNodeServiceClient {
 	return pb.NewAuthorityNodeServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) LatestItemRPC() pb.LatestItemServiceClient {
+	return pb.NewLatestItemServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSClusterRPC() pb.NSClusterServiceClient {
+	return pb.NewNSClusterServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSNodeRPC() pb.NSNodeServiceClient {
+	return pb.NewNSNodeServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSDomainRPC() pb.NSDomainServiceClient {
+	return pb.NewNSDomainServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSRecordRPC() pb.NSRecordServiceClient {
+	return pb.NewNSRecordServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSRouteRPC() pb.NSRouteServiceClient {
+	return pb.NewNSRouteServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSAccessLogRPC() pb.NSAccessLogServiceClient {
+	return pb.NewNSAccessLogServiceClient(this.pickConn())
+}
+
 // Context 构造Admin上下文
 func (this *RPCClient) Context(adminId int64) context.Context {
 	ctx := context.Background()

internal/rpc/rpc_client_test.go

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

internal/tasks/task_authority.go

@@ -6,6 +6,7 @@ import (
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/events"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeAdmin/internal/setup"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/logs"
@@ -34,7 +35,7 @@ func (this *AuthorityTask) Start() {
 	}
 
 	// 初始化的时候先获取一次
-	timeout := time.NewTimer(5 * time.Second)
+	timeout := time.NewTimer(3 * time.Second)
 	<-timeout.C
 	err := this.Loop()
 	if err != nil {
@@ -51,6 +52,11 @@ func (this *AuthorityTask) Start() {
 }
 
 func (this *AuthorityTask) Loop() error {
+	// 如果还没有安装直接返回
+	if !setup.IsConfigured() {
+		return nil
+	}
+
 	rpcClient, err := rpc.SharedRPC()
 	if err != nil {
 		return err

internal/tasks/task_sync_api_nodes.go

@@ -4,6 +4,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/events"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeAdmin/internal/setup"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/logs"
@@ -42,6 +43,11 @@ func (this *SyncAPINodesTask) Start() {
 }
 
 func (this *SyncAPINodesTask) Loop() error {
+	// 如果还没有安装直接返回
+	if !setup.IsConfigured() {
+		return nil
+	}
+
 	// 获取所有可用的节点
 	rpcClient, err := rpc.SharedRPC()
 	if err != nil {

internal/tasks/task_sync_cluster.go

@@ -20,7 +20,7 @@ func init() {
 	})
 }
 
-// 自动同步集群任务
+// SyncClusterTask 自动同步集群任务
 type SyncClusterTask struct {
 }
 

internal/ttlcache/piece.go

@@ -30,7 +30,7 @@ func (this *Piece) IncreaseInt64(key uint64, delta int64, expiredAt int64) (resu
 	this.locker.Lock()
 	item, ok := this.m[key]
 	if ok {
-		result := types.Int64(item.Value) + delta
+		result = types.Int64(item.Value) + delta
 		item.Value = result
 		item.expiredAt = expiredAt
 	} else {

internal/utils/numberutils/utils.go

@@ -22,8 +22,12 @@ func FormatBytes(bytes int64) string {
 		return fmt.Sprintf("%.2fMB", float64(bytes)/1024/1024)
 	} else if bytes < 1024*1024*1024*1024 {
 		return fmt.Sprintf("%.2fGB", float64(bytes)/1024/1024/1024)
+	} else if bytes < 1024*1024*1024*1024*1024 {
+		return fmt.Sprintf("%.2fTB", float64(bytes)/1024/1024/1024/1024)
+	} else if bytes < 1024*1024*1024*1024*1024*1024 {
+		return fmt.Sprintf("%.2fPB", float64(bytes)/1024/1024/1024/1024/1024)
 	} else {
-		return fmt.Sprintf("%.2fPB", float64(bytes)/1024/1024/1024/1024)
+		return fmt.Sprintf("%.2fEB", float64(bytes)/1024/1024/1024/1024/1024/1024)
 	}
 }
 
@@ -36,7 +40,11 @@ func FormatBits(bits int64) string {
 		return fmt.Sprintf("%.2fMB", float64(bits)/1000/1000)
 	} else if bits < 1000*1000*1000*1000 {
 		return fmt.Sprintf("%.2fGB", float64(bits)/1000/1000/1000)
+	} else if bits < 1000*1000*1000*1000*1000 {
+		return fmt.Sprintf("%.2fTB", float64(bits)/1000/1000/1000/1000)
+	} else if bits < 1000*1000*1000*1000*1000*1000 {
+		return fmt.Sprintf("%.2fPB", float64(bits)/1000/1000/1000/1000/1000)
 	} else {
-		return fmt.Sprintf("%.2fPB", float64(bits)/1000/1000/1000/1000)
+		return fmt.Sprintf("%.2fEB", float64(bits)/1000/1000/1000/1000/1000/1000)
 	}
 }

internal/web/actions/actionutils/parent_action.go

@@ -20,7 +20,7 @@ type ParentAction struct {
 	rpcClient *rpc.RPCClient
 }
 
-// 可以调用自身的一个简便方法
+// Parent 可以调用自身的一个简便方法
 func (this *ParentAction) Parent() *ParentAction {
 	return this
 }
@@ -97,7 +97,7 @@ func (this *ParentAction) CreateLogInfo(description string, args ...interface{})
 	this.CreateLog(oplogs.LevelInfo, description, args...)
 }
 
-// 获取RPC
+// RPC 获取RPC
 func (this *ParentAction) RPC() *rpc.RPCClient {
 	if this.rpcClient != nil {
 		return this.rpcClient
@@ -114,7 +114,7 @@ func (this *ParentAction) RPC() *rpc.RPCClient {
 	return rpcClient
 }
 
-// 获取Context
+// AdminContext 获取Context
 func (this *ParentAction) AdminContext() context.Context {
 	if this.rpcClient == nil {
 		rpcClient, err := rpc.SharedRPC()

internal/web/actions/actionutils/utils.go

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

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

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

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

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

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

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
@@ -133,9 +134,9 @@ func (this *CreateNodeAction) RunPost(params struct {
 	createResp, err := this.RPC().NodeRPC().CreateNode(this.AdminContext(), &pb.CreateNodeRequest{
 		Name:          params.Name,
 		NodeClusterId: params.ClusterId,
-		GroupId:       params.GroupId,
-		RegionId:      params.RegionId,
-		Login:         loginInfo,
+		NodeGroupId:   params.GroupId,
+		NodeRegionId:  params.RegionId,
+		NodeLogin:     loginInfo,
 		DnsDomainId:   params.DnsDomainId,
 		DnsRoutes:     dnsRouteCodes,
 	})
@@ -156,6 +157,7 @@ func (this *CreateNodeAction) RunPost(params struct {
 		} else {
 			_, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
 				NodeId:    nodeId,
+				Role:      nodeconfigs.NodeRoleNode,
 				Name:      address.GetString("name"),
 				Ip:        address.GetString("ip"),
 				CanAccess: address.GetBool("canAccess"),

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -47,8 +47,8 @@ func (this *IndexAction) RunGet(params struct {
 
 	countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
 		NodeClusterId: params.ClusterId,
-		GroupId:       params.GroupId,
-		RegionId:      params.RegionId,
+		NodeGroupId:   params.GroupId,
+		NodeRegionId:  params.RegionId,
 		InstallState:  types.Int32(params.InstalledState),
 		ActiveState:   types.Int32(params.ActiveState),
 		Keyword:       params.Keyword,
@@ -65,12 +65,16 @@ func (this *IndexAction) RunGet(params struct {
 		Offset:        page.Offset,
 		Size:          page.Size,
 		NodeClusterId: params.ClusterId,
-		GroupId:       params.GroupId,
-		RegionId:      params.RegionId,
+		NodeGroupId:   params.GroupId,
+		NodeRegionId:  params.RegionId,
 		InstallState:  types.Int32(params.InstalledState),
 		ActiveState:   types.Int32(params.ActiveState),
 		Keyword:       params.Keyword,
 	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
 	nodeMaps := []maps.Map{}
 	for _, node := range nodesResp.Nodes {
 		// 状态
@@ -87,7 +91,10 @@ func (this *IndexAction) RunGet(params struct {
 		}
 
 		// IP
-		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{NodeId: node.Id})
+		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+			NodeId: node.Id,
+			Role:   nodeconfigs.NodeRoleNode,
+		})
 		if err != nil {
 			this.ErrorPage(err)
 			return
@@ -104,19 +111,19 @@ func (this *IndexAction) RunGet(params struct {
 
 		// 分组
 		var groupMap maps.Map = nil
-		if node.Group != nil {
+		if node.NodeGroup != nil {
 			groupMap = maps.Map{
-				"id":   node.Group.Id,
-				"name": node.Group.Name,
+				"id":   node.NodeGroup.Id,
+				"name": node.NodeGroup.Name,
 			}
 		}
 
 		// 区域
 		var regionMap maps.Map = nil
-		if node.Region != nil {
+		if node.NodeRegion != nil {
 			regionMap = maps.Map{
-				"id":   node.Region.Id,
-				"name": node.Region.Name,
+				"id":   node.NodeRegion.Id,
+				"name": node.NodeRegion.Name,
 			}
 		}
 
@@ -162,14 +169,14 @@ func (this *IndexAction) RunGet(params struct {
 
 	// 所有分组
 	groupMaps := []maps.Map{}
-	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{
+	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithNodeClusterIdRequest{
 		NodeClusterId: params.ClusterId,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	for _, group := range groupsResp.Groups {
+	for _, group := range groupsResp.NodeGroups {
 		countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGroupId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGroupIdRequest{NodeGroupId: group.Id})
 		if err != nil {
 			this.ErrorPage(err)
@@ -203,5 +210,15 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["regions"] = regionMaps
 
+	// 记录最近访问
+	_, err = this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{
+		ItemType: "cluster",
+		ItemId:   params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Show()
 }

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

@@ -4,6 +4,8 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/groups"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/monitor"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/thresholds"
 	clusters "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
@@ -28,7 +30,7 @@ func init() {
 			GetPost("/installManual", new(InstallManualAction)).
 
 			// 节点相关
-			Get("/node", new(node.NodeAction)).
+			Get("/node", new(node.IndexAction)).
 			GetPost("/node/update", new(node.UpdateAction)).
 			GetPost("/node/install", new(node.InstallAction)).
 			Post("/node/updateInstallStatus", new(node.UpdateInstallStatusAction)).
@@ -37,6 +39,14 @@ func init() {
 			Post("/node/start", new(node.StartAction)).
 			Post("/node/stop", new(node.StopAction)).
 			Post("/node/up", new(node.UpAction)).
+			Get("/node/monitor", new(monitor.IndexAction)).
+			Post("/node/monitor/cpu", new(monitor.CpuAction)).
+			Post("/node/monitor/memory", new(monitor.MemoryAction)).
+			Post("/node/monitor/load", new(monitor.LoadAction)).
+			Post("/node/monitor/trafficIn", new(monitor.TrafficInAction)).
+			Post("/node/monitor/trafficOut", new(monitor.TrafficOutAction)).
+			Post("/node/monitor/connections", new(monitor.ConnectionsAction)).
+			Get("/node/thresholds", new(thresholds.IndexAction)).
 
 			// 分组相关
 			Get("/groups", new(groups.IndexAction)).

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

@@ -21,7 +21,7 @@ func (this *InstallManualAction) RunGet(params struct {
 }) {
 	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "manual")
 
-	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: params.ClusterId})
+	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithNodeClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithNodeClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return

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

@@ -23,7 +23,7 @@ func (this *InstallRemoteAction) RunGet(params struct {
 }) {
 	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "install")
 
-	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: params.ClusterId})
+	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithNodeClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithNodeClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return

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

@@ -3,6 +3,7 @@ package node
 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/grants/grantutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
@@ -11,16 +12,16 @@ import (
 	"time"
 )
 
-type NodeAction struct {
+type IndexAction struct {
 	actionutils.ParentAction
 }
 
-func (this *NodeAction) Init() {
+func (this *IndexAction) Init() {
 	this.Nav("", "node", "node")
 	this.SecondMenu("nodes")
 }
 
-func (this *NodeAction) RunGet(params struct {
+func (this *IndexAction) RunGet(params struct {
 	NodeId int64
 }) {
 	this.Data["nodeId"] = params.NodeId
@@ -55,7 +56,10 @@ func (this *NodeAction) RunGet(params struct {
 	}
 
 	// IP地址
-	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{NodeId: params.NodeId})
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+		NodeId: params.NodeId,
+		Role:   nodeconfigs.NodeRoleNode,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -114,17 +118,17 @@ func (this *NodeAction) RunGet(params struct {
 		grantMap := maps.Map{}
 		grantId := loginParams.GetInt64("grantId")
 		if grantId > 0 {
-			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: grantId})
+			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
 			if err != nil {
 				this.ErrorPage(err)
 				return
 			}
-			if grantResp.Grant != nil {
+			if grantResp.NodeGrant != nil {
 				grantMap = maps.Map{
-					"id":         grantResp.Grant.Id,
-					"name":       grantResp.Grant.Name,
-					"method":     grantResp.Grant.Method,
-					"methodName": grantutils.FindGrantMethodName(grantResp.Grant.Method),
+					"id":         grantResp.NodeGrant.Id,
+					"name":       grantResp.NodeGrant.Name,
+					"method":     grantResp.NodeGrant.Method,
+					"methodName": grantutils.FindGrantMethodName(grantResp.NodeGrant.Method),
 				}
 			}
 		}
@@ -169,19 +173,46 @@ func (this *NodeAction) RunGet(params struct {
 
 	// 分组
 	var groupMap maps.Map = nil
-	if node.Group != nil {
+	if node.NodeGroup != nil {
 		groupMap = maps.Map{
-			"id":   node.Group.Id,
-			"name": node.Group.Name,
+			"id":   node.NodeGroup.Id,
+			"name": node.NodeGroup.Name,
 		}
 	}
 
 	// 区域
 	var regionMap maps.Map = nil
-	if node.Region != nil {
+	if node.NodeRegion != nil {
 		regionMap = maps.Map{
-			"id":   node.Region.Id,
-			"name": node.Region.Name,
+			"id":   node.NodeRegion.Id,
+			"name": node.NodeRegion.Name,
+		}
+	}
+
+	// 缓存硬盘 & 内存容量
+	var maxCacheDiskCapacity maps.Map = nil
+	if node.MaxCacheDiskCapacity != nil {
+		maxCacheDiskCapacity = maps.Map{
+			"count": node.MaxCacheDiskCapacity.Count,
+			"unit":  node.MaxCacheDiskCapacity.Unit,
+		}
+	} else {
+		maxCacheDiskCapacity = maps.Map{
+			"count": 0,
+			"unit":  "gb",
+		}
+	}
+
+	var maxCacheMemoryCapacity maps.Map = nil
+	if node.MaxCacheMemoryCapacity != nil {
+		maxCacheMemoryCapacity = maps.Map{
+			"count": node.MaxCacheMemoryCapacity.Count,
+			"unit":  node.MaxCacheMemoryCapacity.Unit,
+		}
+	} else {
+		maxCacheMemoryCapacity = maps.Map{
+			"count": 0,
+			"unit":  "gb",
 		}
 	}
 
@@ -199,24 +230,29 @@ func (this *NodeAction) RunGet(params struct {
 		"isOn":        node.IsOn,
 
 		"status": maps.Map{
-			"isActive":         status.IsActive,
-			"updatedAt":        status.UpdatedAt,
-			"hostname":         status.Hostname,
-			"cpuUsage":         status.CPUUsage,
-			"cpuUsageText":     fmt.Sprintf("%.2f%%", status.CPUUsage*100),
-			"memUsage":         status.MemoryUsage,
-			"memUsageText":     fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
-			"connectionCount":  status.ConnectionCount,
-			"buildVersion":     status.BuildVersion,
-			"cpuPhysicalCount": status.CPUPhysicalCount,
-			"cpuLogicalCount":  status.CPULogicalCount,
-			"load1m":           fmt.Sprintf("%.2f", status.Load1m),
-			"load5m":           fmt.Sprintf("%.2f", status.Load5m),
-			"load15m":          fmt.Sprintf("%.2f", status.Load15m),
+			"isActive":             status.IsActive,
+			"updatedAt":            status.UpdatedAt,
+			"hostname":             status.Hostname,
+			"cpuUsage":             status.CPUUsage,
+			"cpuUsageText":         fmt.Sprintf("%.2f%%", status.CPUUsage*100),
+			"memUsage":             status.MemoryUsage,
+			"memUsageText":         fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
+			"connectionCount":      status.ConnectionCount,
+			"buildVersion":         status.BuildVersion,
+			"cpuPhysicalCount":     status.CPUPhysicalCount,
+			"cpuLogicalCount":      status.CPULogicalCount,
+			"load1m":               fmt.Sprintf("%.2f", status.Load1m),
+			"load5m":               fmt.Sprintf("%.2f", status.Load5m),
+			"load15m":              fmt.Sprintf("%.2f", status.Load15m),
+			"cacheTotalDiskSize":   numberutils.FormatBytes(status.CacheTotalDiskSize),
+			"cacheTotalMemorySize": numberutils.FormatBytes(status.CacheTotalMemorySize),
 		},
 
 		"group":  groupMap,
 		"region": regionMap,
+
+		"maxCacheDiskCapacity":   maxCacheDiskCapacity,
+		"maxCacheMemoryCapacity": maxCacheMemoryCapacity,
 	}
 
 	this.Show()

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

@@ -17,13 +17,25 @@ func (this *LogsAction) Init() {
 }
 
 func (this *LogsAction) RunGet(params struct {
-	NodeId int64
+	NodeId  int64
+	DayFrom string
+	DayTo   string
+	Keyword string
+	Level   string
 }) {
 	this.Data["nodeId"] = params.NodeId
+	this.Data["dayFrom"] = params.DayFrom
+	this.Data["dayTo"] = params.DayTo
+	this.Data["keyword"] = params.Keyword
+	this.Data["level"] = params.Level
 
 	countResp, err := this.RPC().NodeLogRPC().CountNodeLogs(this.AdminContext(), &pb.CountNodeLogsRequest{
-		Role:   "node",
-		NodeId: params.NodeId,
+		Role:    "node",
+		NodeId:  params.NodeId,
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -33,10 +45,14 @@ func (this *LogsAction) RunGet(params struct {
 	page := this.NewPage(count, 20)
 
 	logsResp, err := this.RPC().NodeLogRPC().ListNodeLogs(this.AdminContext(), &pb.ListNodeLogsRequest{
-		NodeId: params.NodeId,
-		Role:   "node",
-		Offset: page.Offset,
-		Size:   page.Size,
+		NodeId:  params.NodeId,
+		Role:    "node",
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+		Offset:  page.Offset,
+		Size:    page.Size,
 	})
 
 	logs := []maps.Map{}
@@ -47,6 +63,7 @@ func (this *LogsAction) RunGet(params struct {
 			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", log.CreatedAt),
 			"level":       log.Level,
 			"isToday":     timeutil.FormatTime("Y-m-d", log.CreatedAt) == timeutil.Format("Y-m-d"),
+			"count":       log.Count,
 		})
 	}
 	this.Data["logs"] = logs

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

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

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

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

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

@@ -0,0 +1,21 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package monitor
+
+import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "node", "monitor")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	NodeId int64
+}) {
+	this.Data["nodeId"] = params.NodeId
+
+	this.Show()
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -6,7 +6,9 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses/ipaddressutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
@@ -45,7 +47,10 @@ func (this *UpdateAction) RunGet(params struct {
 	}
 
 	// IP地址
-	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{NodeId: params.NodeId})
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+		NodeId: params.NodeId,
+		Role:   nodeconfigs.NodeRoleNode,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -114,17 +119,17 @@ func (this *UpdateAction) RunGet(params struct {
 		grantMap := maps.Map{}
 		grantId := loginParams.GetInt64("grantId")
 		if grantId > 0 {
-			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: grantId})
+			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
 			if err != nil {
 				this.ErrorPage(err)
 				return
 			}
-			if grantResp.Grant != nil {
+			if grantResp.NodeGrant != nil {
 				grantMap = maps.Map{
-					"id":         grantResp.Grant.Id,
-					"name":       grantResp.Grant.Name,
-					"method":     grantResp.Grant.Method,
-					"methodName": grantutils.FindGrantMethodName(grantResp.Grant.Method),
+					"id":         grantResp.NodeGrant.Id,
+					"name":       grantResp.NodeGrant.Name,
+					"method":     grantResp.NodeGrant.Method,
+					"methodName": grantutils.FindGrantMethodName(grantResp.NodeGrant.Method),
 				}
 			}
 		}
@@ -140,32 +145,61 @@ func (this *UpdateAction) RunGet(params struct {
 
 	// 分组
 	var groupMap maps.Map = nil
-	if node.Group != nil {
+	if node.NodeGroup != nil {
 		groupMap = maps.Map{
-			"id":   node.Group.Id,
-			"name": node.Group.Name,
+			"id":   node.NodeGroup.Id,
+			"name": node.NodeGroup.Name,
 		}
 	}
 
 	// 区域
 	var regionMap maps.Map = nil
-	if node.Region != nil {
+	if node.NodeRegion != nil {
 		regionMap = maps.Map{
-			"id":   node.Region.Id,
-			"name": node.Region.Name,
+			"id":   node.NodeRegion.Id,
+			"name": node.NodeRegion.Name,
+		}
+	}
+
+	// 缓存硬盘 & 内存容量
+	var maxCacheDiskCapacity maps.Map = nil
+	if node.MaxCacheDiskCapacity != nil {
+		maxCacheDiskCapacity = maps.Map{
+			"count": node.MaxCacheDiskCapacity.Count,
+			"unit":  node.MaxCacheDiskCapacity.Unit,
+		}
+	} else {
+		maxCacheDiskCapacity = maps.Map{
+			"count": 0,
+			"unit":  "gb",
+		}
+	}
+
+	var maxCacheMemoryCapacity maps.Map = nil
+	if node.MaxCacheMemoryCapacity != nil {
+		maxCacheMemoryCapacity = maps.Map{
+			"count": node.MaxCacheMemoryCapacity.Count,
+			"unit":  node.MaxCacheMemoryCapacity.Unit,
+		}
+	} else {
+		maxCacheMemoryCapacity = maps.Map{
+			"count": 0,
+			"unit":  "gb",
 		}
 	}
 
 	this.Data["node"] = maps.Map{
-		"id":          node.Id,
-		"name":        node.Name,
-		"ipAddresses": ipAddressMaps,
-		"cluster":     clusterMap,
-		"login":       loginMap,
-		"maxCPU":      node.MaxCPU,
-		"isOn":        node.IsOn,
-		"group":       groupMap,
-		"region":      regionMap,
+		"id":                     node.Id,
+		"name":                   node.Name,
+		"ipAddresses":            ipAddressMaps,
+		"cluster":                clusterMap,
+		"login":                  loginMap,
+		"maxCPU":                 node.MaxCPU,
+		"isOn":                   node.IsOn,
+		"group":                  groupMap,
+		"region":                 regionMap,
+		"maxCacheDiskCapacity":   maxCacheDiskCapacity,
+		"maxCacheMemoryCapacity": maxCacheMemoryCapacity,
 	}
 
 	// 所有集群
@@ -190,18 +224,20 @@ func (this *UpdateAction) RunGet(params struct {
 }
 
 func (this *UpdateAction) RunPost(params struct {
-	LoginId         int64
-	NodeId          int64
-	GroupId         int64
-	RegionId        int64
-	Name            string
-	IPAddressesJSON []byte `alias:"ipAddressesJSON"`
-	ClusterId       int64
-	GrantId         int64
-	SshHost         string
-	SshPort         int
-	MaxCPU          int32
-	IsOn            bool
+	LoginId                    int64
+	NodeId                     int64
+	GroupId                    int64
+	RegionId                   int64
+	Name                       string
+	IPAddressesJSON            []byte `alias:"ipAddressesJSON"`
+	ClusterId                  int64
+	GrantId                    int64
+	SshHost                    string
+	SshPort                    int
+	MaxCPU                     int32
+	IsOn                       bool
+	MaxCacheDiskCapacityJSON   []byte
+	MaxCacheMemoryCapacityJSON []byte
 
 	DnsDomainId   int64
 	DnsRoutesJSON []byte
@@ -258,18 +294,49 @@ func (this *UpdateAction) RunPost(params struct {
 		}.AsJSON(),
 	}
 
+	// 缓存硬盘 & 内存容量
+	var pbMaxCacheDiskCapacity *pb.SizeCapacity
+	if len(params.MaxCacheDiskCapacityJSON) > 0 {
+		var sizeCapacity = &shared.SizeCapacity{}
+		err := json.Unmarshal(params.MaxCacheDiskCapacityJSON, sizeCapacity)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		pbMaxCacheDiskCapacity = &pb.SizeCapacity{
+			Count: sizeCapacity.Count,
+			Unit:  sizeCapacity.Unit,
+		}
+	}
+
+	var pbMaxCacheMemoryCapacity *pb.SizeCapacity
+	if len(params.MaxCacheMemoryCapacityJSON) > 0 {
+		var sizeCapacity = &shared.SizeCapacity{}
+		err := json.Unmarshal(params.MaxCacheMemoryCapacityJSON, sizeCapacity)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		pbMaxCacheMemoryCapacity = &pb.SizeCapacity{
+			Count: sizeCapacity.Count,
+			Unit:  sizeCapacity.Unit,
+		}
+	}
+
 	// 保存
 	_, err := this.RPC().NodeRPC().UpdateNode(this.AdminContext(), &pb.UpdateNodeRequest{
-		NodeId:        params.NodeId,
-		GroupId:       params.GroupId,
-		RegionId:      params.RegionId,
-		Name:          params.Name,
-		NodeClusterId: params.ClusterId,
-		Login:         loginInfo,
-		MaxCPU:        params.MaxCPU,
-		IsOn:          params.IsOn,
-		DnsDomainId:   params.DnsDomainId,
-		DnsRoutes:     dnsRouteCodes,
+		NodeId:                 params.NodeId,
+		NodeGroupId:            params.GroupId,
+		NodeRegionId:           params.RegionId,
+		Name:                   params.Name,
+		NodeClusterId:          params.ClusterId,
+		NodeLogin:              loginInfo,
+		MaxCPU:                 params.MaxCPU,
+		IsOn:                   params.IsOn,
+		DnsDomainId:            params.DnsDomainId,
+		DnsRoutes:              dnsRouteCodes,
+		MaxCacheDiskCapacity:   pbMaxCacheDiskCapacity,
+		MaxCacheMemoryCapacity: pbMaxCacheMemoryCapacity,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -277,14 +344,17 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	// 禁用老的IP地址
-	_, err = this.RPC().NodeIPAddressRPC().DisableAllIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllIPAddressesWithNodeIdRequest{NodeId: params.NodeId})
+	_, err = this.RPC().NodeIPAddressRPC().DisableAllIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllIPAddressesWithNodeIdRequest{
+		NodeId: params.NodeId,
+		Role:   nodeconfigs.NodeRoleNode,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
 	// 添加新的IP地址
-	err = ipaddressutils.UpdateNodeIPAddresses(this.Parent(), params.NodeId, params.IPAddressesJSON)
+	err = ipaddressutils.UpdateNodeIPAddresses(this.Parent(), params.NodeId, nodeconfigs.NodeRoleNode, params.IPAddressesJSON)
 	if err != nil {
 		this.ErrorPage(err)
 		return

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

@@ -35,13 +35,13 @@ func (this *IndexAction) RunGet(params struct {
 	// 认证
 	var grantMap interface{} = nil
 
-	if cluster.GrantId > 0 {
-		grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: cluster.GrantId})
+	if cluster.NodeGrantId > 0 {
+		grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: cluster.NodeGrantId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		grant := grantResp.Grant
+		grant := grantResp.NodeGrant
 		if grant != nil {
 			grantMap = maps.Map{
 				"id":         grant.Id,
@@ -62,7 +62,7 @@ func (this *IndexAction) RunGet(params struct {
 	this.Show()
 }
 
-// 保存设置
+// RunPost 保存设置
 func (this *IndexAction) RunPost(params struct {
 	ClusterId  int64
 	Name       string
@@ -81,7 +81,7 @@ func (this *IndexAction) RunPost(params struct {
 	_, err := this.RPC().NodeClusterRPC().UpdateNodeCluster(this.AdminContext(), &pb.UpdateNodeClusterRequest{
 		NodeClusterId: params.ClusterId,
 		Name:          params.Name,
-		GrantId:       params.GrantId,
+		NodeGrantId:   params.GrantId,
 		InstallDir:    params.InstallDir,
 	})
 	if err != nil {

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

@@ -8,6 +8,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/health"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/message"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/services"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/thresholds"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/toa"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/waf"
 	clusters "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils"
@@ -59,6 +60,13 @@ func init() {
 			GetPost("/updatePopup", new(firewallActions.UpdatePopupAction)).
 			Post("/delete", new(firewallActions.DeleteAction)).
 
+			// 阈值
+			Prefix("/clusters/cluster/settings/thresholds").
+			Get("", new(thresholds.IndexAction)).
+			GetPost("/createPopup", new(thresholds.CreatePopupAction)).
+			GetPost("/updatePopup", new(thresholds.UpdatePopupAction)).
+			Post("/delete", new(thresholds.DeleteAction)).
+
 			EndAll()
 	})
 }

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

@@ -21,7 +21,7 @@ func (this *SelectedReceiversAction) RunPost(params struct {
 	NodeId    int64
 	ServerId  int64
 }) {
-	receiversResp, err := this.RPC().MessageReceiverRPC().FindAllMessageReceivers(this.AdminContext(), &pb.FindAllMessageReceiversRequest{
+	receiversResp, err := this.RPC().MessageReceiverRPC().FindAllEnabledMessageReceivers(this.AdminContext(), &pb.FindAllEnabledMessageReceiversRequest{
 		NodeClusterId: params.ClusterId,
 		NodeId:        params.NodeId,
 		ServerId:      params.ServerId,

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

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

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

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

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

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

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

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

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

@@ -58,17 +58,17 @@ func (this *UpdateNodeSSHAction) RunGet(params struct {
 
 	// 认证信息
 	grantId := loginParams.GetInt64("grantId")
-	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: grantId})
+	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
 	if err != nil {
 		this.ErrorPage(err)
 	}
 	var grantMap maps.Map = nil
-	if grantResp.Grant != nil {
+	if grantResp.NodeGrant != nil {
 		grantMap = maps.Map{
-			"id":         grantResp.Grant.Id,
-			"name":       grantResp.Grant.Name,
-			"method":     grantResp.Grant.Method,
-			"methodName": grantutils.FindGrantMethodName(grantResp.Grant.Method),
+			"id":         grantResp.NodeGrant.Id,
+			"name":       grantResp.NodeGrant.Name,
+			"method":     grantResp.NodeGrant.Method,
+			"methodName": grantutils.FindGrantMethodName(grantResp.NodeGrant.Method),
 		}
 	}
 	this.Data["grant"] = grantMap
@@ -108,8 +108,8 @@ func (this *UpdateNodeSSHAction) RunPost(params struct {
 	}
 
 	_, err := this.RPC().NodeRPC().UpdateNodeLogin(this.AdminContext(), &pb.UpdateNodeLoginRequest{
-		NodeId: params.NodeId,
-		Login:  login,
+		NodeId:    params.NodeId,
+		NodeLogin: login,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -24,7 +24,7 @@ func (this *UpgradeRemoteAction) RunGet(params struct {
 	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "upgrade")
 
 	nodes := []maps.Map{}
-	resp, err := this.RPC().NodeRPC().FindAllUpgradeNodesWithClusterId(this.AdminContext(), &pb.FindAllUpgradeNodesWithClusterIdRequest{NodeClusterId: params.ClusterId})
+	resp, err := this.RPC().NodeRPC().FindAllUpgradeNodesWithNodeClusterId(this.AdminContext(), &pb.FindAllUpgradeNodesWithNodeClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return

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

@@ -9,20 +9,20 @@ import (
 	"strconv"
 )
 
-// 安装升级相关的左侧菜单
+// LeftMenuItemsForInstall 安装升级相关的左侧菜单
 func LeftMenuItemsForInstall(ctx context.Context, clusterId int64, selectedItem string) []maps.Map {
 	rpcClient, _ := rpc.SharedRPC()
 	countNotInstalled := int64(0)
 	countUpgrade := int64(0)
 	if rpcClient != nil {
 		{
-			resp, err := rpcClient.NodeRPC().CountAllNotInstalledNodesWithClusterId(ctx, &pb.CountAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: clusterId})
+			resp, err := rpcClient.NodeRPC().CountAllNotInstalledNodesWithNodeClusterId(ctx, &pb.CountAllNotInstalledNodesWithNodeClusterIdRequest{NodeClusterId: clusterId})
 			if err == nil {
 				countNotInstalled = resp.Count
 			}
 		}
 		{
-			resp, err := rpcClient.NodeRPC().CountAllUpgradeNodesWithClusterId(ctx, &pb.CountAllUpgradeNodesWithClusterIdRequest{NodeClusterId: clusterId})
+			resp, err := rpcClient.NodeRPC().CountAllUpgradeNodesWithNodeClusterId(ctx, &pb.CountAllUpgradeNodesWithNodeClusterIdRequest{NodeClusterId: clusterId})
 			if err == nil {
 				countUpgrade = resp.Count
 			}

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

@@ -24,10 +24,10 @@ func NewClusterHelper() *ClusterHelper {
 	return &ClusterHelper{}
 }
 
-func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) {
+func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool) {
 	action := actionPtr.Object()
 	if action.Request.Method != http.MethodGet {
-		return
+		return true
 	}
 
 	action.Data["teaMenu"] = "clusters"
@@ -67,6 +67,8 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) {
 			action.Data["leftMenuItems"] = this.createSettingMenu(cluster, secondMenuItem)
 		}
 	}
+
+	return true
 }
 
 // 设置菜单
@@ -117,10 +119,21 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, selectedIt
 		"isOn":     cluster.DnsDomainId > 0 || len(cluster.DnsName) > 0,
 	})
 	if teaconst.IsPlus {
+		hasThresholds, _ := this.checkThresholds(cluster.Id)
+		items = append(items, maps.Map{
+			"name":     "阈值设置",
+			"url":      "/clusters/cluster/settings/thresholds?clusterId=" + clusterId,
+			"isActive": selectedItem == "threshold",
+			"isOn":     hasThresholds,
+		})
+	}
+	if teaconst.IsPlus {
+		hasMessageReceivers, _ := this.checkMessages(cluster.Id)
 		items = append(items, maps.Map{
 			"name":     "消息通知",
 			"url":      "/clusters/cluster/settings/message?clusterId=" + clusterId,
 			"isActive": selectedItem == "message",
+			"isOn":     hasMessageReceivers,
 		})
 	}
 
@@ -176,3 +189,34 @@ func (this *ClusterHelper) checkFirewallActions(clusterId int64) (bool, error) {
 	}
 	return resp.Count > 0, nil
 }
+
+// 检查阈值是否已经设置
+func (this *ClusterHelper) checkThresholds(clusterId int64) (bool, error) {
+	rpcClient, err := rpc.SharedRPC()
+	if err != nil {
+		return false, err
+	}
+	resp, err := rpcClient.NodeThresholdRPC().CountAllEnabledNodeThresholds(rpcClient.Context(0), &pb.CountAllEnabledNodeThresholdsRequest{
+		Role:          "node",
+		NodeClusterId: clusterId,
+	})
+	if err != nil {
+		return false, err
+	}
+	return resp.Count > 0, nil
+}
+
+// 检查消息通知是否已经设置
+func (this *ClusterHelper) checkMessages(clusterId int64) (bool, error) {
+	rpcClient, err := rpc.SharedRPC()
+	if err != nil {
+		return false, err
+	}
+	resp, err := rpcClient.MessageReceiverRPC().CountAllEnabledMessageReceivers(rpcClient.Context(0), &pb.CountAllEnabledMessageReceiversRequest{
+		NodeClusterId: clusterId,
+	})
+	if err != nil {
+		return false, err
+	}
+	return resp.Count > 0, nil
+}

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

@@ -97,7 +97,7 @@ func (this *CreateAction) RunPost(params struct {
 
 	createResp, err := this.RPC().NodeClusterRPC().CreateNodeCluster(this.AdminContext(), &pb.CreateNodeClusterRequest{
 		Name:                 params.Name,
-		GrantId:              params.GrantId,
+		NodeGrantId:          params.GrantId,
 		InstallDir:           params.InstallDir,
 		DnsDomainId:          params.DnsDomainId,
 		DnsName:              params.DnsName,

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

@@ -64,7 +64,7 @@ func (this *CreateAction) RunPost(params struct {
 	}
 
 	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "创建SSH认证 %d", createResp.GrantId)
+	defer this.CreateLog(oplogs.LevelInfo, "创建SSH认证 %d", createResp.NodeGrantId)
 
 	this.Success()
 }

internal/web/actions/default/clusters/grants/createPopup.go

@@ -65,14 +65,14 @@ func (this *CreatePopupAction) RunPost(params struct {
 	}
 
 	this.Data["grant"] = maps.Map{
-		"id":         createResp.GrantId,
+		"id":         createResp.NodeGrantId,
 		"name":       params.Name,
 		"method":     params.Method,
 		"methodName": grantutils.FindGrantMethodName(params.Method),
 	}
 
 	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "创建SSH认证 %d", createResp.GrantId)
+	defer this.CreateLog(oplogs.LevelInfo, "创建SSH认证 %d", createResp.NodeGrantId)
 
 	this.Success()
 }

internal/web/actions/default/clusters/grants/delete.go

@@ -17,8 +17,8 @@ func (this *DeleteAction) RunPost(params struct {
 	defer this.CreateLog(oplogs.LevelInfo, "删除SSH认证 %d", params.GrantId)
 
 	// 检查是否有别的集群或节点正在使用
-	countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithGrantId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithGrantIdRequest{
-		GrantId: params.GrantId,
+	countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithNodeGrantId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithNodeGrantIdRequest{
+		NodeGrantId: params.GrantId,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -28,7 +28,7 @@ func (this *DeleteAction) RunPost(params struct {
 		this.Fail("有集群正在使用此服务，请修改后再删除")
 	}
 
-	countResp2, err := this.RPC().NodeRPC().CountAllEnabledNodesWithGrantId(this.AdminContext(), &pb.CountAllEnabledNodesWithGrantIdRequest{GrantId: params.GrantId})
+	countResp2, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGrantId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGrantIdRequest{NodeGrantId: params.GrantId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -38,7 +38,7 @@ func (this *DeleteAction) RunPost(params struct {
 	}
 
 	// 删除
-	_, err = this.RPC().NodeGrantRPC().DisableNodeGrant(this.AdminContext(), &pb.DisableNodeGrantRequest{GrantId: params.GrantId})
+	_, err = this.RPC().NodeGrantRPC().DisableNodeGrant(this.AdminContext(), &pb.DisableNodeGrantRequest{NodeGrantId: params.GrantId})
 	if err != nil {
 		this.ErrorPage(err)
 		return

internal/web/actions/default/clusters/grants/grant.go

@@ -19,19 +19,19 @@ func (this *GrantAction) Init() {
 func (this *GrantAction) RunGet(params struct {
 	GrantId int64
 }) {
-	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: params.GrantId})
+	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: params.GrantId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	if grantResp.Grant == nil {
+	if grantResp.NodeGrant == nil {
 		this.WriteString("can not find the grant")
 		return
 	}
 
 	// TODO 处理节点专用的认证
 
-	grant := grantResp.Grant
+	grant := grantResp.NodeGrant
 	this.Data["grant"] = maps.Map{
 		"id":          grant.Id,
 		"name":        grant.Name,
@@ -46,7 +46,7 @@ func (this *GrantAction) RunGet(params struct {
 
 	// 使用此认证的集群
 	clusterMaps := []maps.Map{}
-	clustersResp, err := this.RPC().NodeClusterRPC().FindAllEnabledNodeClustersWithGrantId(this.AdminContext(), &pb.FindAllEnabledNodeClustersWithGrantIdRequest{GrantId: params.GrantId})
+	clustersResp, err := this.RPC().NodeClusterRPC().FindAllEnabledNodeClustersWithNodeGrantId(this.AdminContext(), &pb.FindAllEnabledNodeClustersWithNodeGrantIdRequest{NodeGrantId: params.GrantId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -61,7 +61,7 @@ func (this *GrantAction) RunGet(params struct {
 
 	// 使用此认证的节点
 	nodeMaps := []maps.Map{}
-	nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesWithGrantId(this.AdminContext(), &pb.FindAllEnabledNodesWithGrantIdRequest{GrantId: params.GrantId})
+	nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesWithNodeGrantId(this.AdminContext(), &pb.FindAllEnabledNodesWithNodeGrantIdRequest{NodeGrantId: params.GrantId})
 	if err != nil {
 		this.ErrorPage(err)
 		return

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

@@ -15,8 +15,14 @@ func (this *IndexAction) Init() {
 	this.Nav("", "grant", "index")
 }
 
-func (this *IndexAction) RunGet(params struct{}) {
-	countResp, err := this.RPC().NodeGrantRPC().CountAllEnabledNodeGrants(this.AdminContext(), &pb.CountAllEnabledNodeGrantsRequest{})
+func (this *IndexAction) RunGet(params struct {
+	Keyword string
+}) {
+	this.Data["keyword"] = params.Keyword
+
+	countResp, err := this.RPC().NodeGrantRPC().CountAllEnabledNodeGrants(this.AdminContext(), &pb.CountAllEnabledNodeGrantsRequest{
+		Keyword: params.Keyword,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -25,17 +31,18 @@ func (this *IndexAction) RunGet(params struct{}) {
 	this.Data["page"] = page.AsHTML()
 
 	grantsResp, err := this.RPC().NodeGrantRPC().ListEnabledNodeGrants(this.AdminContext(), &pb.ListEnabledNodeGrantsRequest{
-		Offset: page.Offset,
-		Size:   page.Size,
+		Keyword: params.Keyword,
+		Offset:  page.Offset,
+		Size:    page.Size,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	grantMaps := []maps.Map{}
-	for _, grant := range grantsResp.Grants {
+	for _, grant := range grantsResp.NodeGrants {
 		// 集群数
-		countClustersResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithGrantId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithGrantIdRequest{GrantId: grant.Id})
+		countClustersResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithNodeGrantId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithNodeGrantIdRequest{NodeGrantId: grant.Id})
 		if err != nil {
 			this.ErrorPage(err)
 			return
@@ -43,7 +50,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 		countClusters := countClustersResp.Count
 
 		// 节点数
-		countNodesResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithGrantId(this.AdminContext(), &pb.CountAllEnabledNodesWithGrantIdRequest{GrantId: grant.Id})
+		countNodesResp, err := this.RPC().NodeRPC().CountAllEnabledNodesWithNodeGrantId(this.AdminContext(), &pb.CountAllEnabledNodesWithNodeGrantIdRequest{NodeGrantId: grant.Id})
 		if err != nil {
 			this.ErrorPage(err)
 			return
@@ -57,6 +64,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 				"type": grant.Method,
 				"name": grantutils.FindGrantMethodName(grant.Method),
 			},
+			"username":      grant.Username,
 			"countClusters": countClusters,
 			"countNodes":    countNodes,
 		})

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

@@ -24,6 +24,7 @@ func init() {
 			GetPost("/selectPopup", new(SelectPopupAction)).
 			GetPost("/createPopup", new(CreatePopupAction)).
 			GetPost("/updatePopup", new(UpdatePopupAction)).
+			GetPost("/test", new(TestAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/clusters/grants/selectPopup.go

@@ -23,14 +23,16 @@ func (this *SelectPopupAction) RunGet(params struct{}) {
 		this.ErrorPage(err)
 		return
 	}
-	grants := grantsResp.Grants
+	grants := grantsResp.NodeGrants
 	grantMaps := []maps.Map{}
 	for _, grant := range grants {
 		grantMaps = append(grantMaps, maps.Map{
-			"id":         grant.Id,
-			"name":       grant.Name,
-			"method":     grant.Method,
-			"methodName": grantutils.FindGrantMethodName(grant.Method),
+			"id":          grant.Id,
+			"name":        grant.Name,
+			"method":      grant.Method,
+			"methodName":  grantutils.FindGrantMethodName(grant.Method),
+			"username":    grant.Username,
+			"description": grant.Description,
 		})
 	}
 	this.Data["grants"] = grantMaps
@@ -52,12 +54,12 @@ func (this *SelectPopupAction) RunPost(params struct {
 		this.Success()
 	}
 
-	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: params.GrantId})
+	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: params.GrantId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	grant := grantResp.Grant
+	grant := grantResp.NodeGrant
 	if grant == nil {
 		this.Fail("找不到要使用的认证")
 	}

internal/web/actions/default/clusters/grants/test.go

@@ -0,0 +1,78 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package grants
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+	"strings"
+)
+
+type TestAction struct {
+	actionutils.ParentAction
+}
+
+func (this *TestAction) Init() {
+	this.Nav("", "", "test")
+}
+
+func (this *TestAction) RunGet(params struct {
+	GrantId int64
+}) {
+	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: params.GrantId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if grantResp.NodeGrant == nil {
+		this.WriteString("can not find the grant")
+		return
+	}
+
+	grant := grantResp.NodeGrant
+	this.Data["grant"] = maps.Map{
+		"id":          grant.Id,
+		"name":        grant.Name,
+		"method":      grant.Method,
+		"methodName":  grantutils.FindGrantMethodName(grant.Method),
+		"username":    grant.Username,
+		"password":    strings.Repeat("*", len(grant.Password)),
+		"privateKey":  grant.PrivateKey,
+		"description": grant.Description,
+		"su":          grant.Su,
+	}
+
+	this.Show()
+}
+
+func (this *TestAction) RunPost(params struct {
+	GrantId int64
+	Host    string
+	Port    int32
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	params.Must.
+		Field("host", params.Host).
+		Require("请输入节点主机地址").
+		Field("port", params.Port).
+		Gt(0, "请输入正确的端口号").
+		Lt(65535, "请输入正确的端口号")
+
+	resp, err := this.RPC().NodeGrantRPC().TestNodeGrant(this.AdminContext(), &pb.TestNodeGrantRequest{
+		NodeGrantId: params.GrantId,
+		Host:        params.Host,
+		Port:        params.Port,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["isOk"] = resp.IsOk
+	this.Data["error"] = resp.Error
+	this.Success()
+}

internal/web/actions/default/clusters/grants/update.go

@@ -22,19 +22,19 @@ func (this *UpdateAction) RunGet(params struct {
 }) {
 	this.Data["methods"] = grantutils.AllGrantMethods()
 
-	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: params.GrantId})
+	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: params.GrantId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	if grantResp.Grant == nil {
+	if grantResp.NodeGrant == nil {
 		this.WriteString("can not find the grant")
 		return
 	}
 
 	// TODO 处理节点专用的认证
 
-	grant := grantResp.Grant
+	grant := grantResp.NodeGrant
 	this.Data["grant"] = maps.Map{
 		"id":          grant.Id,
 		"name":        grant.Name,
@@ -84,7 +84,7 @@ func (this *UpdateAction) RunPost(params struct {
 	// TODO 检查grantId是否存在
 
 	_, err := this.RPC().NodeGrantRPC().UpdateNodeGrant(this.AdminContext(), &pb.UpdateNodeGrantRequest{
-		GrantId:     params.GrantId,
+		NodeGrantId: params.GrantId,
 		Name:        params.Name,
 		Method:      params.Method,
 		Username:    params.Username,

internal/web/actions/default/clusters/grants/updatePopup.go

@@ -22,18 +22,18 @@ func (this *UpdatePopupAction) RunGet(params struct {
 }) {
 	this.Data["methods"] = grantutils.AllGrantMethods()
 
-	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: params.GrantId})
+	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: params.GrantId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	if grantResp.Grant == nil {
+	if grantResp.NodeGrant == nil {
 		this.WriteString("找不到要操作的对象")
 		return
 	}
 
-	grant := grantResp.Grant
+	grant := grantResp.NodeGrant
 	this.Data["grant"] = maps.Map{
 		"id":          grant.Id,
 		"nodeId":      grant.NodeId,
@@ -82,7 +82,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 
 	// 执行修改
 	_, err := this.RPC().NodeGrantRPC().UpdateNodeGrant(this.AdminContext(), &pb.UpdateNodeGrantRequest{
-		GrantId:     params.GrantId,
+		NodeGrantId: params.GrantId,
 		Name:        params.Name,
 		Method:      params.Method,
 		Username:    params.Username,

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

@@ -24,9 +24,27 @@ func (this *IndexAction) RunGet(params struct {
 	Keyword    string
 	SearchType string
 }) {
+	isSearching := len(params.Keyword) > 0
 	this.Data["keyword"] = params.Keyword
 	this.Data["searchType"] = params.SearchType
-	this.Data["isSearching"] = len(params.Keyword) > 0
+	this.Data["isSearching"] = isSearching
+
+	// 常用的集群
+	latestClusterMaps := []maps.Map{}
+	if !isSearching {
+		clustersResp, err := this.RPC().NodeClusterRPC().FindLatestNodeClusters(this.AdminContext(), &pb.FindLatestNodeClustersRequest{Size: 6})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		for _, cluster := range clustersResp.NodeClusters {
+			latestClusterMaps = append(latestClusterMaps, maps.Map{
+				"id":   cluster.Id,
+				"name": cluster.Name,
+			})
+		}
+	}
+	this.Data["latestClusters"] = latestClusterMaps
 
 	// 搜索节点
 	if params.SearchType == "node" && len(params.Keyword) > 0 {
@@ -78,7 +96,7 @@ func (this *IndexAction) RunGet(params struct {
 			}
 
 			// 需要升级的节点
-			countUpgradeNodesResp, err := this.RPC().NodeRPC().CountAllUpgradeNodesWithClusterId(this.AdminContext(), &pb.CountAllUpgradeNodesWithClusterIdRequest{NodeClusterId: cluster.Id})
+			countUpgradeNodesResp, err := this.RPC().NodeRPC().CountAllUpgradeNodesWithNodeClusterId(this.AdminContext(), &pb.CountAllUpgradeNodesWithNodeClusterIdRequest{NodeClusterId: cluster.Id})
 			if err != nil {
 				this.ErrorPage(err)
 				return
@@ -168,7 +186,10 @@ func (this *IndexAction) searchNodes(keyword string) {
 		}
 
 		// IP
-		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{NodeId: node.Id})
+		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+			NodeId: node.Id,
+			Role:   nodeconfigs.NodeRoleNode,
+		})
 		if err != nil {
 			this.ErrorPage(err)
 			return
@@ -185,19 +206,19 @@ func (this *IndexAction) searchNodes(keyword string) {
 
 		// 分组
 		var groupMap maps.Map = nil
-		if node.Group != nil {
+		if node.NodeGroup != nil {
 			groupMap = maps.Map{
-				"id":   node.Group.Id,
-				"name": node.Group.Name,
+				"id":   node.NodeGroup.Id,
+				"name": node.NodeGroup.Name,
 			}
 		}
 
 		// 区域
 		var regionMap maps.Map = nil
-		if node.Region != nil {
+		if node.NodeRegion != nil {
 			regionMap = maps.Map{
-				"id":   node.Region.Id,
-				"name": node.Region.Name,
+				"id":   node.NodeRegion.Id,
+				"name": node.NodeRegion.Name,
 			}
 		}
 

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

@@ -0,0 +1,87 @@
+package logs
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+}
+
+func (this *IndexAction) RunGet(params struct {
+	DayFrom string
+	DayTo   string
+	Keyword string
+	Level   string
+}) {
+	this.Data["dayFrom"] = params.DayFrom
+	this.Data["dayTo"] = params.DayTo
+	this.Data["keyword"] = params.Keyword
+	this.Data["level"] = params.Level
+
+	countResp, err := this.RPC().NodeLogRPC().CountNodeLogs(this.AdminContext(), &pb.CountNodeLogsRequest{
+		NodeId:  0,
+		Role:    "node",
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	count := countResp.Count
+	page := this.NewPage(count)
+	this.Data["page"] = page.AsHTML()
+
+	logsResp, err := this.RPC().NodeLogRPC().ListNodeLogs(this.AdminContext(), &pb.ListNodeLogsRequest{
+		NodeId:  0,
+		Role:    "node",
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+		Offset:  page.Offset,
+		Size:    page.Size,
+	})
+
+	logs := []maps.Map{}
+	for _, log := range logsResp.NodeLogs {
+		// 节点信息
+		nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: log.NodeId})
+		if err != nil {
+			continue
+		}
+		node := nodeResp.Node
+		if node == nil || node.NodeCluster == nil {
+			continue
+		}
+
+		logs = append(logs, maps.Map{
+			"tag":         log.Tag,
+			"description": log.Description,
+			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", log.CreatedAt),
+			"level":       log.Level,
+			"isToday":     timeutil.FormatTime("Y-m-d", log.CreatedAt) == timeutil.Format("Y-m-d"),
+			"count":       log.Count,
+			"node": maps.Map{
+				"id": node.Id,
+				"cluster": maps.Map{
+					"id":   node.NodeCluster.Id,
+					"name": node.NodeCluster.Name,
+				},
+				"name": node.Name,
+			},
+		})
+	}
+	this.Data["logs"] = logs
+
+	this.Show()
+}

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

@@ -0,0 +1,19 @@
+package logs
+
+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", "log").
+			Prefix("/clusters/logs").
+			Get("", new(IndexAction)).
+			EndAll()
+	})
+}

internal/web/actions/default/clusters/regions/prices.go

@@ -77,8 +77,10 @@ func (this *PricesAction) formatBits(bits int64) string {
 		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 {
+	} 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
 }

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

@@ -92,5 +92,73 @@ func (this *IndexAction) RunGet(params struct{}) {
 		this.Data["dailyTrafficStats"] = statMaps
 	}
 
+	// 版本升级
+	if resp.NodeUpgradeInfo != nil {
+		this.Data["nodeUpgradeInfo"] = maps.Map{
+			"count":   resp.NodeUpgradeInfo.CountNodes,
+			"version": resp.NodeUpgradeInfo.NewVersion,
+		}
+	} else {
+		this.Data["nodeUpgradeInfo"] = maps.Map{
+			"count":   0,
+			"version": "",
+		}
+	}
+	if resp.MonitorNodeUpgradeInfo != nil {
+		this.Data["monitorNodeUpgradeInfo"] = maps.Map{
+			"count":   resp.MonitorNodeUpgradeInfo.CountNodes,
+			"version": resp.MonitorNodeUpgradeInfo.NewVersion,
+		}
+	} else {
+		this.Data["monitorNodeUpgradeInfo"] = maps.Map{
+			"count":   0,
+			"version": "",
+		}
+	}
+	if resp.ApiNodeUpgradeInfo != nil {
+		this.Data["apiNodeUpgradeInfo"] = maps.Map{
+			"count":   resp.ApiNodeUpgradeInfo.CountNodes,
+			"version": resp.ApiNodeUpgradeInfo.NewVersion,
+		}
+	} else {
+		this.Data["apiNodeUpgradeInfo"] = maps.Map{
+			"count":   0,
+			"version": "",
+		}
+	}
+	if resp.UserNodeUpgradeInfo != nil {
+		this.Data["userNodeUpgradeInfo"] = maps.Map{
+			"count":   resp.UserNodeUpgradeInfo.CountNodes,
+			"version": resp.UserNodeUpgradeInfo.NewVersion,
+		}
+	} else {
+		this.Data["userNodeUpgradeInfo"] = maps.Map{
+			"count":   0,
+			"version": 0,
+		}
+	}
+	if resp.AuthorityNodeUpgradeInfo != nil {
+		this.Data["authorityNodeUpgradeInfo"] = maps.Map{
+			"count":   resp.AuthorityNodeUpgradeInfo.CountNodes,
+			"version": resp.AuthorityNodeUpgradeInfo.NewVersion,
+		}
+	} else {
+		this.Data["authorityNodeUpgradeInfo"] = maps.Map{
+			"count":   0,
+			"version": "",
+		}
+	}
+	if resp.NsNodeUpgradeInfo != nil {
+		this.Data["nsNodeUpgradeInfo"] = maps.Map{
+			"count":   resp.NsNodeUpgradeInfo.CountNodes,
+			"version": resp.NsNodeUpgradeInfo.NewVersion,
+		}
+	} else {
+		this.Data["nsNodeUpgradeInfo"] = maps.Map{
+			"count":   0,
+			"version": "",
+		}
+	}
+
 	this.Show()
 }

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

@@ -1,6 +1,7 @@
 package clusters
 
 import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
@@ -62,7 +63,7 @@ func (this *ClusterAction) RunGet(params struct {
 	this.Data["dnsInfo"] = dnsMap
 
 	// 节点DNS解析记录
-	nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesDNSWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodesDNSWithClusterIdRequest{NodeClusterId: params.ClusterId})
+	nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesDNSWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodesDNSWithNodeClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -74,10 +75,14 @@ func (this *ClusterAction) RunGet(params struct {
 				// 检查是否已解析
 				isResolved := false
 				if cluster.DnsDomainId > 0 && len(cluster.DnsName) > 0 && len(node.IpAddr) > 0 {
+					recordType := "A"
+					if utils.IsIPv6(node.IpAddr) {
+						recordType = "AAAA"
+					}
 					checkResp, err := this.RPC().DNSDomainRPC().ExistDNSDomainRecord(this.AdminContext(), &pb.ExistDNSDomainRecordRequest{
 						DnsDomainId: cluster.DnsDomainId,
 						Name:        cluster.DnsName,
-						Type:        "A",
+						Type:        recordType,
 						Route:       route.Code,
 						Value:       node.IpAddr,
 					})
@@ -117,7 +122,7 @@ func (this *ClusterAction) RunGet(params struct {
 	this.Data["nodes"] = nodeMaps
 
 	// 代理服务解析记录
-	serversResp, err := this.RPC().ServerRPC().FindAllEnabledServersDNSWithClusterId(this.AdminContext(), &pb.FindAllEnabledServersDNSWithClusterIdRequest{NodeClusterId: params.ClusterId})
+	serversResp, err := this.RPC().ServerRPC().FindAllEnabledServersDNSWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledServersDNSWithNodeClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -157,5 +162,25 @@ func (this *ClusterAction) RunGet(params struct {
 	}
 	this.Data["dnsHasChanges"] = checkChangesResp.IsChanged
 
+	// 需要解决的问题
+	issuesResp, err := this.RPC().DNSRPC().FindAllDNSIssues(this.AdminContext(), &pb.FindAllDNSIssuesRequest{
+		NodeClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	issueMaps := []maps.Map{}
+	for _, issue := range issuesResp.Issues {
+		issueMaps = append(issueMaps, maps.Map{
+			"target":      issue.Target,
+			"targetId":    issue.TargetId,
+			"type":        issue.Type,
+			"description": issue.Description,
+			"params":      issue.Params,
+		})
+	}
+	this.Data["issues"] = issueMaps
+
 	this.Show()
 }

internal/web/actions/default/dns/domains/domainutils/utils.go

@@ -1,26 +1,38 @@
 package domainutils
 
 import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/dnsconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
+	"net"
 	"regexp"
 	"strings"
 )
 
-// 校验域名格式
+// ValidateDomainFormat 校验域名格式
 func ValidateDomainFormat(domain string) bool {
 	pieces := strings.Split(domain, ".")
 	for _, piece := range pieces {
-		if !regexp.MustCompile(`^[a-z0-9-]+$`).MatchString(piece) {
+		if piece == "-" ||
+			strings.HasPrefix(piece, "-") ||
+			strings.HasSuffix(piece, "-") ||
+			strings.Contains(piece, "--") ||
+			len(piece) > 63 ||
+			!regexp.MustCompile(`^[a-z0-9-]+$`).MatchString(piece) {
 			return false
 		}
 	}
 
+	// 最后一段不能是全数字
+	if regexp.MustCompile(`^(\d+)$`).MatchString(pieces[len(pieces)-1]) {
+		return false
+	}
+
 	return true
 }
 
-// 转换线路列表
+// ConvertRoutesToMaps 转换线路列表
 func ConvertRoutesToMaps(routes []*pb.DNSRoute) []maps.Map {
 	result := []maps.Map{}
 	for _, route := range routes {
@@ -32,7 +44,7 @@ func ConvertRoutesToMaps(routes []*pb.DNSRoute) []maps.Map {
 	return result
 }
 
-// 筛选线路
+// FilterRoutes 筛选线路
 func FilterRoutes(routes []*pb.DNSRoute, allRoutes []*pb.DNSRoute) []*pb.DNSRoute {
 	routeCodes := []string{}
 	for _, route := range allRoutes {
@@ -46,3 +58,84 @@ func FilterRoutes(routes []*pb.DNSRoute, allRoutes []*pb.DNSRoute) []*pb.DNSRout
 	}
 	return result
 }
+
+// ValidateRecordName 校验记录名
+func ValidateRecordName(name string) bool {
+	if name == "*" || name == "@" || len(name) == 0 {
+		return true
+	}
+
+	pieces := strings.Split(name, ".")
+	for _, piece := range pieces {
+		if piece == "-" ||
+			strings.HasPrefix(piece, "-") ||
+			strings.HasSuffix(piece, "-") ||
+			strings.Contains(piece, "--") ||
+			len(piece) > 63 ||
+			!regexp.MustCompile(`^[a-z0-9-]+$`).MatchString(piece) {
+			return false
+		}
+	}
+	return true
+}
+
+// ValidateRecordValue 校验记录值
+func ValidateRecordValue(recordType dnsconfigs.RecordType, value string) (message string, ok bool) {
+	switch recordType {
+	case dnsconfigs.RecordTypeA:
+		if !regexp.MustCompile(`^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$`).MatchString(value) {
+			message = "请输入正确格式的IP"
+			return
+		}
+		if net.ParseIP(value) == nil {
+			message = "请输入正确格式的IP"
+			return
+		}
+	case dnsconfigs.RecordTypeCNAME:
+		if strings.HasSuffix(value, ".") {
+			value = value[:len(value)-1]
+		}
+		if !strings.Contains(value, ".") || !ValidateDomainFormat(value) {
+			message = "请输入正确的域名"
+			return
+		}
+	case dnsconfigs.RecordTypeAAAA:
+		if !strings.Contains(value, ":") {
+			message = "请输入正确格式的IPv6地址"
+			return
+		}
+		if net.ParseIP(value) == nil {
+			message = "请输入正确格式的IPv6地址"
+			return
+		}
+	case dnsconfigs.RecordTypeNS:
+		if strings.HasSuffix(value, ".") {
+			value = value[:len(value)-1]
+		}
+		if !strings.Contains(value, ".") || !ValidateDomainFormat(value) {
+			message = "请输入正确的DNS服务器域名"
+			return
+		}
+	case dnsconfigs.RecordTypeMX:
+		if strings.HasSuffix(value, ".") {
+			value = value[:len(value)-1]
+		}
+		if !strings.Contains(value, ".") || !ValidateDomainFormat(value) {
+			message = "请输入正确的邮件服务器域名"
+			return
+		}
+	case dnsconfigs.RecordTypeTXT:
+		if len(value) > 512 {
+			message = "文本长度不能超出512字节"
+			return
+		}
+	}
+
+	if len(value) > 512 {
+		message = "记录值长度不能超出512字节"
+		return
+	}
+
+	ok = true
+	return
+}

internal/web/actions/default/dns/domains/domainutils/utils_test.go

@@ -0,0 +1,61 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package domainutils
+
+import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/dnsconfigs"
+	"github.com/iwind/TeaGo/assert"
+	"testing"
+)
+
+func TestValidateRecordValue(t *testing.T) {
+	a := assert.NewAssertion(t)
+
+	// A
+	{
+		_, ok := ValidateRecordValue(dnsconfigs.RecordTypeA, "1.2")
+		a.IsFalse(ok)
+	}
+	{
+		_, ok := ValidateRecordValue(dnsconfigs.RecordTypeA, "1.2.3.400")
+		a.IsFalse(ok)
+	}
+	{
+		_, ok := ValidateRecordValue(dnsconfigs.RecordTypeA, "1.2.3.4")
+		a.IsTrue(ok)
+	}
+
+	// CNAME
+	{
+		_, ok := ValidateRecordValue(dnsconfigs.RecordTypeCNAME, "example.com")
+		a.IsTrue(ok)
+	}
+	{
+		_, ok := ValidateRecordValue(dnsconfigs.RecordTypeCNAME, "example.com.")
+		a.IsTrue(ok)
+	}
+	{
+		_, ok := ValidateRecordValue(dnsconfigs.RecordTypeCNAME, "hello, world")
+		a.IsFalse(ok)
+	}
+
+	// AAAA
+	{
+		_, ok := ValidateRecordValue(dnsconfigs.RecordTypeAAAA, "1.2.3.4")
+		a.IsFalse(ok)
+	}
+	{
+		_, ok := ValidateRecordValue(dnsconfigs.RecordTypeAAAA, "2001:0db8:85a3:0000:0000:8a2e:0370:7334")
+		a.IsTrue(ok)
+	}
+
+	// NS
+	{
+		_, ok := ValidateRecordValue(dnsconfigs.RecordTypeNS, "1.2.3.4")
+		a.IsFalse(ok)
+	}
+	{
+		_, ok := ValidateRecordValue(dnsconfigs.RecordTypeNS, "example.com")
+		a.IsTrue(ok)
+	}
+}

internal/web/actions/default/dns/domains/nodesPopup.go

@@ -43,7 +43,7 @@ func (this *NodesPopupAction) RunGet(params struct {
 
 	for _, cluster := range clustersResp.NodeClusters {
 		// 节点DNS解析记录
-		nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesDNSWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodesDNSWithClusterIdRequest{NodeClusterId: cluster.Id})
+		nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesDNSWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodesDNSWithNodeClusterIdRequest{NodeClusterId: cluster.Id})
 		if err != nil {
 			this.ErrorPage(err)
 			return

internal/web/actions/default/dns/domains/serversPopup.go

@@ -41,7 +41,7 @@ func (this *ServersPopupAction) RunGet(params struct {
 		return
 	}
 	for _, cluster := range clustersResp.NodeClusters {
-		serversResp, err := this.RPC().ServerRPC().FindAllEnabledServersDNSWithClusterId(this.AdminContext(), &pb.FindAllEnabledServersDNSWithClusterIdRequest{NodeClusterId: cluster.Id})
+		serversResp, err := this.RPC().ServerRPC().FindAllEnabledServersDNSWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledServersDNSWithNodeClusterIdRequest{NodeClusterId: cluster.Id})
 		if err != nil {
 			this.ErrorPage(err)
 			return

internal/web/actions/default/dns/providers/createPopup.go

@@ -27,8 +27,9 @@ func (this *CreatePopupAction) RunGet(params struct{}) {
 	typeMaps := []maps.Map{}
 	for _, t := range typesResp.ProviderTypes {
 		typeMaps = append(typeMaps, maps.Map{
-			"name": t.Name,
-			"code": t.Code,
+			"name":        t.Name,
+			"code":        t.Code,
+			"description": t.Description,
 		})
 	}
 	this.Data["types"] = typeMaps
@@ -36,6 +37,21 @@ func (this *CreatePopupAction) RunGet(params struct{}) {
 	// 自动生成CustomHTTP私钥
 	this.Data["paramCustomHTTPSecret"] = rands.HexString(32)
 
+	// EdgeDNS集群列表
+	nsClustersResp, err := this.RPC().NSClusterRPC().FindAllEnabledNSClusters(this.AdminContext(), &pb.FindAllEnabledNSClustersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	nsClusterMaps := []maps.Map{}
+	for _, nsCluster := range nsClustersResp.NsClusters {
+		nsClusterMaps = append(nsClusterMaps, maps.Map{
+			"id":   nsCluster.Id,
+			"name": nsCluster.Name,
+		})
+	}
+	this.Data["nsClusters"] = nsClusterMaps
+
 	this.Show()
 }
 
@@ -59,6 +75,9 @@ func (this *CreatePopupAction) RunPost(params struct {
 	CloudFlareAPIKey string
 	CloudFlareEmail  string
 
+	// Local EdgeDNS
+	ParamLocalEdgeDNSClusterId int64
+
 	// CustomHTTP
 	ParamCustomHTTPURL    string
 	ParamCustomHTTPSecret string
@@ -109,6 +128,11 @@ func (this *CreatePopupAction) RunPost(params struct {
 			Email("请输入正确格式的邮箱地址")
 		apiParams["apiKey"] = params.CloudFlareAPIKey
 		apiParams["email"] = params.CloudFlareEmail
+	case "localEdgeDNS":
+		params.Must.
+			Field("ParamLocalEdgeDNSClusterId", params.ParamLocalEdgeDNSClusterId).
+			Gt(0, "请选择域名服务集群")
+		apiParams["clusterId"] = params.ParamLocalEdgeDNSClusterId
 	case "customHTTP":
 		params.Must.
 			Field("paramCustomHTTPURL", params.ParamCustomHTTPURL).

internal/web/actions/default/dns/providers/provider.go

@@ -39,12 +39,31 @@ func (this *ProviderAction) RunGet(params struct {
 		}
 	}
 
+	// 本地EdgeDNS相关
+	var localEdgeDNSMap = maps.Map{}
+	if provider.Type == "localEdgeDNS" {
+		nsClusterId := apiParams.GetInt64("clusterId")
+		nsClusterResp, err := this.RPC().NSClusterRPC().FindEnabledNSCluster(this.AdminContext(), &pb.FindEnabledNSClusterRequest{NsClusterId: nsClusterId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		nsCluster := nsClusterResp.NsCluster
+		if nsCluster != nil {
+			localEdgeDNSMap = maps.Map{
+				"id":   nsCluster.Id,
+				"name": nsCluster.Name,
+			}
+		}
+	}
+
 	this.Data["provider"] = maps.Map{
-		"id":        provider.Id,
-		"name":      provider.Name,
-		"type":      provider.Type,
-		"typeName":  provider.TypeName,
-		"apiParams": apiParams,
+		"id":           provider.Id,
+		"name":         provider.Name,
+		"type":         provider.Type,
+		"typeName":     provider.TypeName,
+		"apiParams":    apiParams,
+		"localEdgeDNS": localEdgeDNSMap,
 	}
 
 	// 域名

internal/web/actions/default/dns/providers/updatePopup.go

@@ -57,12 +57,28 @@ func (this *UpdatePopupAction) RunGet(params struct {
 	typeMaps := []maps.Map{}
 	for _, t := range typesResp.ProviderTypes {
 		typeMaps = append(typeMaps, maps.Map{
-			"name": t.Name,
-			"code": t.Code,
+			"name":        t.Name,
+			"code":        t.Code,
+			"description": t.Description,
 		})
 	}
 	this.Data["types"] = typeMaps
 
+	// EdgeDNS集群列表
+	nsClustersResp, err := this.RPC().NSClusterRPC().FindAllEnabledNSClusters(this.AdminContext(), &pb.FindAllEnabledNSClustersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	nsClusterMaps := []maps.Map{}
+	for _, nsCluster := range nsClustersResp.NsClusters {
+		nsClusterMaps = append(nsClusterMaps, maps.Map{
+			"id":   nsCluster.Id,
+			"name": nsCluster.Name,
+		})
+	}
+	this.Data["nsClusters"] = nsClusterMaps
+
 	this.Show()
 }
 
@@ -88,6 +104,9 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	CloudFlareAPIKey string
 	CloudFlareEmail  string
 
+	// Local EdgeDNS
+	ParamLocalEdgeDNSClusterId int64
+
 	// CustomHTTP
 	ParamCustomHTTPURL    string
 	ParamCustomHTTPSecret string
@@ -140,6 +159,11 @@ func (this *UpdatePopupAction) RunPost(params struct {
 			Email("请输入正确格式的邮箱地址")
 		apiParams["apiKey"] = params.CloudFlareAPIKey
 		apiParams["email"] = params.CloudFlareEmail
+	case "localEdgeDNS":
+		params.Must.
+			Field("ParamLocalEdgeDNSClusterId", params.ParamLocalEdgeDNSClusterId).
+			Gt(0, "请选择域名服务集群")
+		apiParams["clusterId"] = params.ParamLocalEdgeDNSClusterId
 	case "customHTTP":
 		params.Must.
 			Field("paramCustomHTTPURL", params.ParamCustomHTTPURL).

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

@@ -1,7 +1,6 @@
 package nodes
 
 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
@@ -13,14 +12,14 @@ type DeleteAction struct {
 func (this *DeleteAction) RunPost(params struct {
 	NodeId int64
 }) {
+	// 创建日志
+	defer this.CreateLogInfo("删除节点", params.NodeId)
+
 	_, err := this.RPC().NodeRPC().DeleteNode(this.AdminContext(), &pb.DeleteNodeRequest{NodeId: params.NodeId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "删除节点", params.NodeId)
-
 	this.Success()
 }

internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go

@@ -3,12 +3,13 @@ package ipaddressutils
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 )
 
-// 保存一组IP地址
-func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64, ipAddressesJSON []byte) error {
+// UpdateNodeIPAddresses 保存一组IP地址
+func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64, role nodeconfigs.NodeRole, ipAddressesJSON []byte) error {
 	addresses := []maps.Map{}
 	err := json.Unmarshal(ipAddressesJSON, &addresses)
 	if err != nil {
@@ -29,6 +30,7 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 		} else {
 			_, err = parentAction.RPC().NodeIPAddressRPC().CreateNodeIPAddress(parentAction.AdminContext(), &pb.CreateNodeIPAddressRequest{
 				NodeId:    nodeId,
+				Role:      role,
 				Name:      addr.GetString("name"),
 				Ip:        addr.GetString("ip"),
 				CanAccess: addr.GetBool("canAccess"),

internal/web/actions/default/nodes/nodeutils/utils.go

@@ -6,10 +6,12 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"sort"
 	"strconv"
 	"sync"
 )
 
+// MessageResult 和节点消息通讯结果定义
 type MessageResult struct {
 	NodeId   int64  `json:"nodeId"`
 	NodeName string `json:"nodeName"`
@@ -17,7 +19,7 @@ type MessageResult struct {
 	Message  string `json:"message"`
 }
 
-// 向集群发送命令消息
+// SendMessageToCluster 向集群发送命令消息
 func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg interface{}, timeoutSeconds int32) (results []*MessageResult, err error) {
 	results = []*MessageResult{}
 
@@ -32,7 +34,7 @@ func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg
 	}
 
 	// 获取所有节点
-	nodesResp, err := defaultRPCClient.NodeRPC().FindAllEnabledNodesWithClusterId(ctx, &pb.FindAllEnabledNodesWithClusterIdRequest{NodeClusterId: clusterId})
+	nodesResp, err := defaultRPCClient.NodeRPC().FindAllEnabledNodesWithNodeClusterId(ctx, &pb.FindAllEnabledNodesWithNodeClusterIdRequest{NodeClusterId: clusterId})
 	if err != nil {
 		return results, err
 	}
@@ -153,10 +155,17 @@ func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg
 	}
 	wg.Wait()
 
+	// 对结果进行排序
+	if len(results) > 0 {
+		sort.Slice(results, func(i, j int) bool {
+			return results[i].NodeId < results[j].NodeId
+		})
+	}
+
 	return
 }
 
-// 向一组节点发送命令消息
+// SendMessageToNodeIds 向一组节点发送命令消息
 func SendMessageToNodeIds(ctx context.Context, nodeIds []int64, code string, msg interface{}, timeoutSeconds int32) (results []*MessageResult, err error) {
 	results = []*MessageResult{}
 	if len(nodeIds) == 0 {
@@ -321,5 +330,12 @@ func SendMessageToNodeIds(ctx context.Context, nodeIds []int64, code string, msg
 	}
 	wg.Wait()
 
+	// 对结果进行排序
+	if len(results) > 0 {
+		sort.Slice(results, func(i, j int) bool {
+			return results[i].NodeId < results[j].NodeId
+		})
+	}
+
 	return
 }

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

@@ -0,0 +1,170 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package logs
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/lists"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+	"net"
+	"regexp"
+	"strings"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	RequestId string
+	Keyword   string
+	Day       string
+}) {
+	day := strings.ReplaceAll(params.Day, "-", "")
+	if !regexp.MustCompile(`^\d{8}$`).MatchString(day) {
+		day = timeutil.Format("Ymd")
+	}
+
+	this.Data["keyword"] = params.Keyword
+	this.Data["day"] = day[:4] + "-" + day[4:6] + "-" + day[6:]
+	this.Data["path"] = this.Request.URL.Path
+
+	var size = int64(10)
+
+	resp, err := this.RPC().NSAccessLogRPC().ListNSAccessLogs(this.AdminContext(), &pb.ListNSAccessLogsRequest{
+		RequestId:  params.RequestId,
+		NsNodeId:   0,
+		NsDomainId: 0,
+		NsRecordId: 0,
+		Size:       size,
+		Day:        day,
+		Keyword:    params.Keyword,
+		Reverse:    false,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	ipList := []string{}
+	nodeIds := []int64{}
+	domainIds := []int64{}
+	if len(resp.NsAccessLogs) == 0 {
+		this.Data["accessLogs"] = []interface{}{}
+	} else {
+		this.Data["accessLogs"] = resp.NsAccessLogs
+		for _, accessLog := range resp.NsAccessLogs {
+			// IP
+			if len(accessLog.RemoteAddr) > 0 {
+				// 去掉端口
+				ip, _, err := net.SplitHostPort(accessLog.RemoteAddr)
+				if err == nil {
+					accessLog.RemoteAddr = ip
+					if !lists.ContainsString(ipList, ip) {
+						ipList = append(ipList, ip)
+					}
+				}
+			}
+
+			// 节点
+			if !lists.ContainsInt64(nodeIds, accessLog.NsNodeId) {
+				nodeIds = append(nodeIds, accessLog.NsNodeId)
+			}
+
+			// 域名
+			if !lists.ContainsInt64(domainIds, accessLog.NsDomainId) {
+				domainIds = append(domainIds, accessLog.NsDomainId)
+			}
+		}
+	}
+	this.Data["hasMore"] = resp.HasMore
+	this.Data["nextRequestId"] = resp.RequestId
+
+	// 上一个requestId
+	this.Data["hasPrev"] = false
+	this.Data["lastRequestId"] = ""
+	if len(params.RequestId) > 0 {
+		this.Data["hasPrev"] = true
+		prevResp, err := this.RPC().NSAccessLogRPC().ListNSAccessLogs(this.AdminContext(), &pb.ListNSAccessLogsRequest{
+			RequestId:  params.RequestId,
+			NsNodeId:   0,
+			NsDomainId: 0,
+			NsRecordId: 0,
+			Day:        day,
+			Keyword:    params.Keyword,
+			Size:       size,
+			Reverse:    true,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if int64(len(prevResp.NsAccessLogs)) == size {
+			this.Data["lastRequestId"] = prevResp.RequestId
+		}
+	}
+
+	// 根据IP查询区域
+	regionMap := map[string]string{} // ip => region
+	if len(ipList) > 0 {
+		resp, err := this.RPC().IPLibraryRPC().LookupIPRegions(this.AdminContext(), &pb.LookupIPRegionsRequest{IpList: ipList})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if resp.IpRegionMap != nil {
+			for ip, region := range resp.IpRegionMap {
+				regionMap[ip] = region.Summary
+			}
+		}
+	}
+	this.Data["regions"] = regionMap
+
+	// 节点信息
+	nodeMap := map[int64]interface{}{} // node id => { ... }
+	for _, nodeId := range nodeIds {
+		nodeResp, err := this.RPC().NSNodeRPC().FindEnabledNSNode(this.AdminContext(), &pb.FindEnabledNSNodeRequest{NsNodeId: nodeId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		node := nodeResp.NsNode
+		if node != nil {
+			nodeMap[node.Id] = maps.Map{
+				"id":   node.Id,
+				"name": node.Name,
+				"cluster": maps.Map{
+					"id":   node.NsCluster.Id,
+					"name": node.NsCluster.Name,
+				},
+			}
+		}
+	}
+	this.Data["nodes"] = nodeMap
+
+	// 域名信息
+	domainMap := map[int64]interface{}{} // domain id => { ... }
+	for _, domainId := range domainIds {
+		domainResp, err := this.RPC().NSDomainRPC().FindEnabledNSDomain(this.AdminContext(), &pb.FindEnabledNSDomainRequest{NsDomainId: domainId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		domain := domainResp.NsDomain
+		if domain != nil {
+			domainMap[domain.Id] = maps.Map{
+				"id":   domain.Id,
+				"name": domain.Name,
+			}
+		}
+	}
+	this.Data["domains"] = domainMap
+
+	this.Show()
+}

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

@@ -0,0 +1,19 @@
+package logs
+
+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.AdminModuleCodeNS)).
+			Data("teaMenu", "ns").
+			Data("teaSubMenu", "accessLog").
+			Prefix("/ns/clusters/accessLogs").
+			Get("", new(IndexAction)).
+			EndAll()
+	})
+}

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

@@ -0,0 +1,108 @@
+package cluster
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+// CreateNodeAction 创建节点
+type CreateNodeAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreateNodeAction) Init() {
+	this.Nav("", "node", "create")
+	this.SecondMenu("nodes")
+}
+
+func (this *CreateNodeAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	this.Show()
+}
+
+func (this *CreateNodeAction) RunPost(params struct {
+	Name            string
+	IpAddressesJSON []byte
+	ClusterId       int64
+
+	Must *actions.Must
+}) {
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入节点名称")
+
+	if len(params.IpAddressesJSON) == 0 {
+		this.Fail("请至少添加一个IP地址")
+	}
+
+	// 检查cluster
+	if params.ClusterId <= 0 {
+		this.Fail("请选择所在集群")
+	}
+	clusterResp, err := this.RPC().NSClusterRPC().FindEnabledNSCluster(this.AdminContext(), &pb.FindEnabledNSClusterRequest{NsClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if clusterResp.NsCluster == nil {
+		this.Fail("选择的集群不存在")
+	}
+
+	// IP地址
+	ipAddresses := []maps.Map{}
+	if len(params.IpAddressesJSON) > 0 {
+		err := json.Unmarshal(params.IpAddressesJSON, &ipAddresses)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+	if len(ipAddresses) == 0 {
+		this.Fail("请至少输入一个IP地址")
+	}
+
+	// 保存
+	createResp, err := this.RPC().NSNodeRPC().CreateNSNode(this.AdminContext(), &pb.CreateNSNodeRequest{
+		Name:          params.Name,
+		NodeClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	nodeId := createResp.NsNodeId
+
+	// IP地址
+	for _, address := range ipAddresses {
+		addressId := address.GetInt64("id")
+		if addressId > 0 {
+			_, err = this.RPC().NodeIPAddressRPC().UpdateNodeIPAddressNodeId(this.AdminContext(), &pb.UpdateNodeIPAddressNodeIdRequest{
+				AddressId: addressId,
+				NodeId:    nodeId,
+			})
+		} else {
+			_, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
+				NodeId:    nodeId,
+				Role:      nodeconfigs.NodeRoleDNS,
+				Name:      address.GetString("name"),
+				Ip:        address.GetString("ip"),
+				CanAccess: address.GetBool("canAccess"),
+			})
+		}
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	// 创建日志
+	defer this.CreateLog(oplogs.LevelInfo, "创建域名服务节点 %d", nodeId)
+
+	this.Success()
+}

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

@@ -0,0 +1,38 @@
+package cluster
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type DeleteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteAction) Init() {
+	this.Nav("", "delete", "index")
+	this.SecondMenu("nodes")
+}
+
+func (this *DeleteAction) RunGet(params struct{}) {
+	this.Show()
+}
+
+func (this *DeleteAction) RunPost(params struct {
+	ClusterId int64
+}) {
+	// 创建日志
+	defer this.CreateLog(oplogs.LevelInfo, "删除域名服务集群 %d", params.ClusterId)
+
+	// TODO 如果有用户在使用此集群，就不能删除
+
+	// 删除
+	_, err := this.RPC().NSClusterRPC().DeleteNSCluster(this.AdminContext(), &pb.DeleteNSCluster{NsClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/ns/clusters/cluster/deleteNode.go

@@ -0,0 +1,26 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package cluster
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type DeleteNodeAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteNodeAction) RunPost(params struct {
+	NodeId int64
+}) {
+	defer this.CreateLogInfo("删除域名服务节点 %d", params.NodeId)
+
+	_, err := this.RPC().NSNodeRPC().DeleteNSNode(this.AdminContext(), &pb.DeleteNSNodeRequest{NsNodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,139 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package cluster
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
+	"time"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "node", "index")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ClusterId      int64
+	InstalledState int
+	ActiveState    int
+	Keyword        string
+}) {
+	this.Data["installState"] = params.InstalledState
+	this.Data["activeState"] = params.ActiveState
+	this.Data["keyword"] = params.Keyword
+
+	countAllResp, err := this.RPC().NSNodeRPC().CountAllEnabledNSNodesMatch(this.AdminContext(), &pb.CountAllEnabledNSNodesMatchRequest{
+		NsClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["countAll"] = countAllResp.Count
+
+	countResp, err := this.RPC().NSNodeRPC().CountAllEnabledNSNodesMatch(this.AdminContext(), &pb.CountAllEnabledNSNodesMatchRequest{
+		NsClusterId:  params.ClusterId,
+		InstallState: types.Int32(params.InstalledState),
+		ActiveState:  types.Int32(params.ActiveState),
+		Keyword:      params.Keyword,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	page := this.NewPage(countResp.Count)
+	this.Data["page"] = page.AsHTML()
+
+	nodesResp, err := this.RPC().NSNodeRPC().ListEnabledNSNodesMatch(this.AdminContext(), &pb.ListEnabledNSNodesMatchRequest{
+		Offset:       page.Offset,
+		Size:         page.Size,
+		NsClusterId:  params.ClusterId,
+		InstallState: types.Int32(params.InstalledState),
+		ActiveState:  types.Int32(params.ActiveState),
+		Keyword:      params.Keyword,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	nodeMaps := []maps.Map{}
+	for _, node := range nodesResp.NsNodes {
+		// 状态
+		status := &nodeconfigs.NodeStatus{}
+		if len(node.StatusJSON) > 0 {
+			err = json.Unmarshal(node.StatusJSON, &status)
+			if err != nil {
+				logs.Error(err)
+				continue
+			}
+			status.IsActive = status.IsActive && time.Now().Unix()-status.UpdatedAt <= 60 // N秒之内认为活跃
+		}
+
+		// IP
+		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+			NodeId: node.Id,
+			Role:   nodeconfigs.NodeRoleDNS,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		ipAddresses := []maps.Map{}
+		for _, addr := range ipAddressesResp.Addresses {
+			ipAddresses = append(ipAddresses, maps.Map{
+				"id":        addr.Id,
+				"name":      addr.Name,
+				"ip":        addr.Ip,
+				"canAccess": addr.CanAccess,
+			})
+		}
+
+		nodeMaps = append(nodeMaps, maps.Map{
+			"id":          node.Id,
+			"name":        node.Name,
+			"isInstalled": node.IsInstalled,
+			"isOn":        node.IsOn,
+			"isUp":        node.IsUp,
+			"installStatus": maps.Map{
+				"isRunning":  node.InstallStatus.IsRunning,
+				"isFinished": node.InstallStatus.IsFinished,
+				"isOk":       node.InstallStatus.IsOk,
+				"error":      node.InstallStatus.Error,
+			},
+			"status": maps.Map{
+				"isActive":     status.IsActive,
+				"updatedAt":    status.UpdatedAt,
+				"hostname":     status.Hostname,
+				"cpuUsage":     status.CPUUsage,
+				"cpuUsageText": fmt.Sprintf("%.2f%%", status.CPUUsage*100),
+				"memUsage":     status.MemoryUsage,
+				"memUsageText": fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
+			},
+			"ipAddresses": ipAddresses,
+		})
+	}
+	this.Data["nodes"] = nodeMaps
+
+	// 记录最近访问
+	_, err = this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{
+		ItemType: "nsCluster",
+		ItemId:   params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Show()
+}

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

@@ -0,0 +1,36 @@
+package cluster
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/clusters/cluster/node"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/clusters/clusterutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNS)).
+			Helper(new(clusterutils.ClusterHelper)).
+			Data("teaMenu", "ns").
+			Data("teaSubMenu", "cluster").
+			Prefix("/ns/clusters/cluster").
+			Get("", new(IndexAction)).
+			GetPost("/delete", new(DeleteAction)).
+			GetPost("/createNode", new(CreateNodeAction)).
+			Post("/deleteNode", new(DeleteNodeAction)).
+			Get("/upgradeRemote", new(UpgradeRemoteAction)).
+
+			// 节点相关
+			Prefix("/ns/clusters/cluster/node").
+			Get("", new(node.IndexAction)).
+			Get("/logs", new(node.LogsAction)).
+			GetPost("/update", new(node.UpdateAction)).
+			GetPost("/install", new(node.InstallAction)).
+			Post("/status", new(node.StatusAction)).
+			Post("/updateInstallStatus", new(node.UpdateInstallStatusAction)).
+
+			EndAll()
+	})
+}

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

@@ -0,0 +1,137 @@
+package node
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	"time"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "node", "node")
+	this.SecondMenu("nodes")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	NodeId int64
+}) {
+	this.Data["nodeId"] = params.NodeId
+
+	nodeResp, err := this.RPC().NSNodeRPC().FindEnabledNSNode(this.AdminContext(), &pb.FindEnabledNSNodeRequest{NsNodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	node := nodeResp.NsNode
+	if node == nil {
+		this.WriteString("找不到要操作的节点")
+		return
+	}
+
+	var clusterMap maps.Map = nil
+	if node.NsCluster != nil {
+		clusterId := node.NsCluster.Id
+		clusterResp, err := this.RPC().NSClusterRPC().FindEnabledNSCluster(this.AdminContext(), &pb.FindEnabledNSClusterRequest{NsClusterId: clusterId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		cluster := clusterResp.NsCluster
+		if cluster != nil {
+			clusterMap = maps.Map{
+				"id":         cluster.Id,
+				"name":       cluster.Name,
+				"installDir": cluster.InstallDir,
+			}
+		}
+	}
+
+	// IP地址
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+		NodeId: params.NodeId,
+		Role:   nodeconfigs.NodeRoleDNS,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	ipAddressMaps := []maps.Map{}
+	for _, addr := range ipAddressesResp.Addresses {
+		ipAddressMaps = append(ipAddressMaps, maps.Map{
+			"id":        addr.Id,
+			"name":      addr.Name,
+			"ip":        addr.Ip,
+			"canAccess": addr.CanAccess,
+		})
+	}
+
+	// 运行状态
+	status := &nodeconfigs.NodeStatus{}
+	if len(node.StatusJSON) > 0 {
+		err = json.Unmarshal(node.StatusJSON, &status)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		status.IsActive = status.IsActive && time.Now().Unix()-status.UpdatedAt <= 60 // N秒之内认为活跃
+	}
+
+	// 检查是否有新版本
+	if len(status.OS) > 0 {
+		checkVersionResp, err := this.RPC().NSNodeRPC().CheckNSNodeLatestVersion(this.AdminContext(), &pb.CheckNSNodeLatestVersionRequest{
+			Os:             status.OS,
+			Arch:           status.Arch,
+			CurrentVersion: status.BuildVersion,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		this.Data["shouldUpgrade"] = checkVersionResp.HasNewVersion
+		this.Data["newVersion"] = checkVersionResp.NewVersion
+	} else {
+		this.Data["shouldUpgrade"] = false
+		this.Data["newVersion"] = ""
+	}
+
+	this.Data["node"] = maps.Map{
+		"id":          node.Id,
+		"name":        node.Name,
+		"ipAddresses": ipAddressMaps,
+		"cluster":     clusterMap,
+		"installDir":  node.InstallDir,
+		"isInstalled": node.IsInstalled,
+		"uniqueId":    node.UniqueId,
+		"secret":      node.Secret,
+		"isOn":        node.IsOn,
+
+		"status": maps.Map{
+			"isActive":             status.IsActive,
+			"updatedAt":            status.UpdatedAt,
+			"hostname":             status.Hostname,
+			"cpuUsage":             status.CPUUsage,
+			"cpuUsageText":         fmt.Sprintf("%.2f%%", status.CPUUsage*100),
+			"memUsage":             status.MemoryUsage,
+			"memUsageText":         fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
+			"connectionCount":      status.ConnectionCount,
+			"buildVersion":         status.BuildVersion,
+			"cpuPhysicalCount":     status.CPUPhysicalCount,
+			"cpuLogicalCount":      status.CPULogicalCount,
+			"load1m":               fmt.Sprintf("%.2f", status.Load1m),
+			"load5m":               fmt.Sprintf("%.2f", status.Load5m),
+			"load15m":              fmt.Sprintf("%.2f", status.Load15m),
+			"cacheTotalDiskSize":   numberutils.FormatBytes(status.CacheTotalDiskSize),
+			"cacheTotalMemorySize": numberutils.FormatBytes(status.CacheTotalMemorySize),
+		},
+	}
+
+	this.Show()
+}

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

@@ -0,0 +1,117 @@
+package node
+
+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"
+	"strings"
+)
+
+// InstallAction 安装节点
+type InstallAction struct {
+	actionutils.ParentAction
+}
+
+func (this *InstallAction) Init() {
+	this.Nav("", "node", "install")
+	this.SecondMenu("nodes")
+}
+
+func (this *InstallAction) RunGet(params struct {
+	NodeId int64
+}) {
+	this.Data["nodeId"] = params.NodeId
+
+	// 节点
+	nodeResp, err := this.RPC().NSNodeRPC().FindEnabledNSNode(this.AdminContext(), &pb.FindEnabledNSNodeRequest{NsNodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	node := nodeResp.NsNode
+	if node == nil {
+		this.WriteString("找不到要操作的节点")
+		return
+	}
+
+	// 安装信息
+	if node.InstallStatus != nil {
+		this.Data["installStatus"] = maps.Map{
+			"isRunning":  node.InstallStatus.IsRunning,
+			"isFinished": node.InstallStatus.IsFinished,
+			"isOk":       node.InstallStatus.IsOk,
+			"updatedAt":  node.InstallStatus.UpdatedAt,
+			"error":      node.InstallStatus.Error,
+		}
+	} else {
+		this.Data["installStatus"] = nil
+	}
+
+	// 集群
+	var clusterMap maps.Map = nil
+	if node.NsCluster != nil {
+		clusterId := node.NsCluster.Id
+		clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: clusterId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		cluster := clusterResp.NodeCluster
+		if cluster != nil {
+			clusterMap = maps.Map{
+				"id":         cluster.Id,
+				"name":       cluster.Name,
+				"installDir": cluster.InstallDir,
+			}
+		}
+	}
+
+	// API节点列表
+	apiNodesResp, err := this.RPC().APINodeRPC().FindAllEnabledAPINodes(this.AdminContext(), &pb.FindAllEnabledAPINodesRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	apiNodes := apiNodesResp.Nodes
+	apiEndpoints := []string{}
+	for _, apiNode := range apiNodes {
+		if !apiNode.IsOn {
+			continue
+		}
+		apiEndpoints = append(apiEndpoints, apiNode.AccessAddrs...)
+	}
+	this.Data["apiEndpoints"] = "\"" + strings.Join(apiEndpoints, "\", \"") + "\""
+
+	this.Data["node"] = maps.Map{
+		"id":          node.Id,
+		"name":        node.Name,
+		"installDir":  node.InstallDir,
+		"isInstalled": node.IsInstalled,
+		"uniqueId":    node.UniqueId,
+		"secret":      node.Secret,
+		"cluster":     clusterMap,
+	}
+
+	this.Show()
+}
+
+// RunPost 开始安装
+func (this *InstallAction) RunPost(params struct {
+	NodeId int64
+
+	Must *actions.Must
+}) {
+	// 创建日志
+	defer this.CreateLogInfo("安装节点 %d", params.NodeId)
+
+	_, err := this.RPC().NSNodeRPC().InstallNSNode(this.AdminContext(), &pb.InstallNSNodeRequest{
+		NsNodeId: params.NodeId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,75 @@
+package node
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+type LogsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *LogsAction) Init() {
+	this.Nav("", "node", "log")
+	this.SecondMenu("nodes")
+}
+
+func (this *LogsAction) RunGet(params struct {
+	NodeId  int64
+	DayFrom string
+	DayTo   string
+	Keyword string
+	Level   string
+}) {
+	this.Data["nodeId"] = params.NodeId
+	this.Data["dayFrom"] = params.DayFrom
+	this.Data["dayTo"] = params.DayTo
+	this.Data["keyword"] = params.Keyword
+	this.Data["level"] = params.Level
+
+	countResp, err := this.RPC().NodeLogRPC().CountNodeLogs(this.AdminContext(), &pb.CountNodeLogsRequest{
+		Role:    nodeconfigs.NodeRoleDNS,
+		NodeId:  params.NodeId,
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	count := countResp.Count
+	page := this.NewPage(count, 20)
+
+	logsResp, err := this.RPC().NodeLogRPC().ListNodeLogs(this.AdminContext(), &pb.ListNodeLogsRequest{
+		NodeId:  params.NodeId,
+		Role:    nodeconfigs.NodeRoleDNS,
+		DayFrom: params.DayFrom,
+		DayTo:   params.DayTo,
+		Keyword: params.Keyword,
+		Level:   params.Level,
+		Offset:  page.Offset,
+		Size:    page.Size,
+	})
+
+	logs := []maps.Map{}
+	for _, log := range logsResp.NodeLogs {
+		logs = append(logs, maps.Map{
+			"tag":         log.Tag,
+			"description": log.Description,
+			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", log.CreatedAt),
+			"level":       log.Level,
+			"isToday":     timeutil.FormatTime("Y-m-d", log.CreatedAt) == timeutil.Format("Y-m-d"),
+			"count":       log.Count,
+		})
+	}
+	this.Data["logs"] = logs
+
+	this.Data["page"] = page.AsHTML()
+
+	this.Show()
+}

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

@@ -0,0 +1,46 @@
+package node
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+// StatusAction 节点状态
+type StatusAction struct {
+	actionutils.ParentAction
+}
+
+func (this *StatusAction) RunPost(params struct {
+	NodeId int64
+}) {
+	// 节点
+	nodeResp, err := this.RPC().NSNodeRPC().FindEnabledNSNode(this.AdminContext(), &pb.FindEnabledNSNodeRequest{NsNodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	node := nodeResp.NsNode
+	if node == nil {
+		this.WriteString("找不到要操作的节点")
+		return
+	}
+
+	// 安装信息
+	if node.InstallStatus != nil {
+		this.Data["installStatus"] = maps.Map{
+			"isRunning":  node.InstallStatus.IsRunning,
+			"isFinished": node.InstallStatus.IsFinished,
+			"isOk":       node.InstallStatus.IsOk,
+			"updatedAt":  node.InstallStatus.UpdatedAt,
+			"error":      node.InstallStatus.Error,
+			"errorCode":  node.InstallStatus.ErrorCode,
+		}
+	} else {
+		this.Data["installStatus"] = nil
+	}
+
+	this.Data["isInstalled"] = node.IsInstalled
+
+	this.Success()
+}

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

@@ -0,0 +1,172 @@
+package node
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses/ipaddressutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type UpdateAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateAction) Init() {
+	this.Nav("", "node", "update")
+	this.SecondMenu("nodes")
+}
+
+func (this *UpdateAction) RunGet(params struct {
+	NodeId int64
+}) {
+	this.Data["nodeId"] = params.NodeId
+
+	nodeResp, err := this.RPC().NSNodeRPC().FindEnabledNSNode(this.AdminContext(), &pb.FindEnabledNSNodeRequest{NsNodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	node := nodeResp.NsNode
+	if node == nil {
+		this.WriteString("找不到要操作的节点")
+		return
+	}
+
+	var clusterMap maps.Map = nil
+	if node.NsCluster != nil {
+		clusterMap = maps.Map{
+			"id":   node.NsCluster.Id,
+			"name": node.NsCluster.Name,
+		}
+	}
+
+	// IP地址
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+		NodeId: params.NodeId,
+		Role:   nodeconfigs.NodeRoleDNS,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	ipAddressMaps := []maps.Map{}
+	for _, addr := range ipAddressesResp.Addresses {
+		ipAddressMaps = append(ipAddressMaps, maps.Map{
+			"id":        addr.Id,
+			"name":      addr.Name,
+			"ip":        addr.Ip,
+			"canAccess": addr.CanAccess,
+		})
+	}
+
+	this.Data["node"] = maps.Map{
+		"id":          node.Id,
+		"name":        node.Name,
+		"ipAddresses": ipAddressMaps,
+		"cluster":     clusterMap,
+		"isOn":        node.IsOn,
+	}
+
+	// 所有集群
+	resp, err := this.RPC().NSClusterRPC().FindAllEnabledNSClusters(this.AdminContext(), &pb.FindAllEnabledNSClustersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+	}
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	clusterMaps := []maps.Map{}
+	for _, cluster := range resp.NsClusters {
+		clusterMaps = append(clusterMaps, maps.Map{
+			"id":   cluster.Id,
+			"name": cluster.Name,
+		})
+	}
+	this.Data["clusters"] = clusterMaps
+
+	this.Show()
+}
+
+func (this *UpdateAction) RunPost(params struct {
+	LoginId         int64
+	NodeId          int64
+	Name            string
+	IPAddressesJSON []byte `alias:"ipAddressesJSON"`
+	ClusterId       int64
+	IsOn            bool
+
+	Must *actions.Must
+}) {
+	// 创建日志
+	defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d", params.NodeId)
+
+	if params.NodeId <= 0 {
+		this.Fail("要操作的节点不存在")
+	}
+
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入节点名称")
+
+	// 检查cluster
+	if params.ClusterId <= 0 {
+		this.Fail("请选择所在集群")
+	}
+	clusterResp, err := this.RPC().NSClusterRPC().FindEnabledNSCluster(this.AdminContext(), &pb.FindEnabledNSClusterRequest{NsClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if clusterResp.NsCluster == nil {
+		this.Fail("选择的集群不存在")
+	}
+
+	// IP地址
+	ipAddresses := []maps.Map{}
+	if len(params.IPAddressesJSON) > 0 {
+		err := json.Unmarshal(params.IPAddressesJSON, &ipAddresses)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+	if len(ipAddresses) == 0 {
+		this.Fail("请至少输入一个IP地址")
+	}
+
+	// 保存
+	_, err = this.RPC().NSNodeRPC().UpdateNSNode(this.AdminContext(), &pb.UpdateNSNodeRequest{
+		NsNodeId:    params.NodeId,
+		Name:        params.Name,
+		NsClusterId: params.ClusterId,
+		IsOn:        params.IsOn,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 禁用老的IP地址
+	_, err = this.RPC().NodeIPAddressRPC().DisableAllIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllIPAddressesWithNodeIdRequest{
+		NodeId: params.NodeId,
+		Role:   nodeconfigs.NodeRoleDNS,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 添加新的IP地址
+	err = ipaddressutils.UpdateNodeIPAddresses(this.Parent(), params.NodeId, nodeconfigs.NodeRoleDNS, params.IPAddressesJSON)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/ns/clusters/cluster/node/updateInstallStatus.go

@@ -0,0 +1,30 @@
+package node
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type UpdateInstallStatusAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateInstallStatusAction) RunPost(params struct {
+	NodeId      int64
+	IsInstalled bool
+}) {
+	// 创建日志
+	defer this.CreateLog(oplogs.LevelInfo, "修改节点安装状态 %d", params.NodeId)
+
+	_, err := this.RPC().NSNodeRPC().UpdateNSNodeIsInstalled(this.AdminContext(), &pb.UpdateNSNodeIsInstalledRequest{
+		NsNodeId:    params.NodeId,
+		IsInstalled: params.IsInstalled,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,73 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package cluster
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/dnsconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "")
+	this.SecondMenu("accessLog")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	accessLogResp, err := this.RPC().NSClusterRPC().FindNSClusterAccessLog(this.AdminContext(), &pb.FindNSClusterAccessLogRequest{NsClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	accessLogRef := &dnsconfigs.AccessLogRef{}
+	if len(accessLogResp.AccessLogJSON) > 0 {
+		err = json.Unmarshal(accessLogResp.AccessLogJSON, accessLogRef)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+	this.Data["accessLogRef"] = accessLogRef
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	ClusterId     int64
+	AccessLogJSON []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改域名服务集群 %d 访问日志配置", params.ClusterId)
+
+	ref := &dnsconfigs.AccessLogRef{}
+	err := json.Unmarshal(params.AccessLogJSON, ref)
+	if err != nil {
+		this.Fail("数据格式错误：" + err.Error())
+	}
+	err = ref.Init()
+	if err != nil {
+		this.Fail("数据格式错误：" + err.Error())
+	}
+
+	_, err = this.RPC().NSClusterRPC().UpdateNSClusterAccessLog(this.AdminContext(), &pb.UpdateNSClusterAccessLogRequest{
+		NsClusterId:   params.ClusterId,
+		AccessLogJSON: params.AccessLogJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,21 @@
+package cluster
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/clusters/clusterutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNS)).
+			Helper(new(clusterutils.ClusterHelper)).
+			Data("teaMenu", "ns").
+			Data("teaSubMenu", "cluster").
+			Prefix("/ns/clusters/cluster/settings/accessLog").
+			GetPost("", new(IndexAction)).
+			EndAll()
+	})
+}

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

@@ -0,0 +1,69 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package cluster
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "")
+	this.SecondMenu("basic")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	clusterResp, err := this.RPC().NSClusterRPC().FindEnabledNSCluster(this.AdminContext(), &pb.FindEnabledNSClusterRequest{NsClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	cluster := clusterResp.NsCluster
+	if cluster == nil {
+		this.NotFound("nsCluster", params.ClusterId)
+		return
+	}
+
+	this.Data["cluster"] = maps.Map{
+		"id":   cluster.Id,
+		"name": cluster.Name,
+		"isOn": cluster.IsOn,
+	}
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	ClusterId int64
+	Name      string
+	IsOn      bool
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改域名服务集群基本信息 %d", params.ClusterId)
+
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入集群名称")
+
+	_, err := this.RPC().NSClusterRPC().UpdateNSCluster(this.AdminContext(), &pb.UpdateNSClusterRequest{
+		NsClusterId: params.ClusterId,
+		Name:        params.Name,
+		IsOn:        params.IsOn,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,21 @@
+package cluster
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/clusters/clusterutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNS)).
+			Helper(new(clusterutils.ClusterHelper)).
+			Data("teaMenu", "ns").
+			Data("teaSubMenu", "cluster").
+			Prefix("/ns/clusters/cluster/settings").
+			GetPost("", new(IndexAction)).
+			EndAll()
+	})
+}

internal/web/actions/default/ns/clusters/cluster/upgradeRemote.go

@@ -0,0 +1,17 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package cluster
+
+import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+
+type UpgradeRemoteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpgradeRemoteAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UpgradeRemoteAction) RunGet(params struct{}) {
+	this.Show()
+}

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

@@ -0,0 +1,92 @@
+package clusterutils
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"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/logs"
+	"github.com/iwind/TeaGo/maps"
+	"net/http"
+	"strconv"
+)
+
+// ClusterHelper 单个集群的帮助
+type ClusterHelper struct {
+}
+
+func NewClusterHelper() *ClusterHelper {
+	return &ClusterHelper{}
+}
+
+func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool) {
+	action := actionPtr.Object()
+	if action.Request.Method != http.MethodGet {
+		return true
+	}
+
+	action.Data["teaMenu"] = "ns"
+
+	selectedTabbar := action.Data.GetString("mainTab")
+	clusterId := action.ParamInt64("clusterId")
+	clusterIdString := strconv.FormatInt(clusterId, 10)
+	action.Data["clusterId"] = clusterId
+
+	if clusterId > 0 {
+		rpcClient, err := rpc.SharedRPC()
+		if err != nil {
+			logs.Error(err)
+			return
+		}
+		clusterResp, err := rpcClient.NSClusterRPC().FindEnabledNSCluster(actionPtr.(rpc.ContextInterface).AdminContext(), &pb.FindEnabledNSClusterRequest{
+			NsClusterId: clusterId,
+		})
+		if err != nil {
+			logs.Error(err)
+			return
+		}
+		cluster := clusterResp.NsCluster
+		if cluster == nil {
+			action.WriteString("can not find ns cluster")
+			return
+		}
+
+		tabbar := actionutils.NewTabbar()
+		tabbar.Add("集群列表", "", "/ns/clusters", "", false)
+		tabbar.Add("集群节点", "", "/ns/clusters/cluster?clusterId="+clusterIdString, "server", selectedTabbar == "node")
+		tabbar.Add("集群设置", "", "/ns/clusters/cluster/settings?clusterId="+clusterIdString, "setting", selectedTabbar == "setting")
+		tabbar.Add("删除集群", "", "/ns/clusters/cluster/delete?clusterId="+clusterIdString, "trash", selectedTabbar == "delete")
+
+		{
+			m := tabbar.Add("当前集群："+cluster.Name, "", "/ns/clusters/cluster?clusterId="+clusterIdString, "", false)
+			m["right"] = true
+		}
+		actionutils.SetTabbar(action, tabbar)
+
+		// 左侧菜单
+		secondMenuItem := action.Data.GetString("secondMenuItem")
+		switch selectedTabbar {
+		case "setting":
+			action.Data["leftMenuItems"] = this.createSettingMenu(cluster, secondMenuItem)
+		}
+	}
+
+	return true
+}
+
+// 设置菜单
+func (this *ClusterHelper) createSettingMenu(cluster *pb.NSCluster, selectedItem string) (items []maps.Map) {
+	clusterId := numberutils.FormatInt64(cluster.Id)
+	items = append(items, maps.Map{
+		"name":     "基础设置",
+		"url":      "/ns/clusters/cluster/settings?clusterId=" + clusterId,
+		"isActive": selectedItem == "basic",
+	})
+	items = append(items, maps.Map{
+		"name":     "访问日志",
+		"url":      "/ns/clusters/cluster/settings/accessLog?clusterId=" + clusterId,
+		"isActive": selectedItem == "accessLog",
+	})
+	return
+}