优化细节

.gitignore

@@ -1,2 +1,3 @@
 *_plus.go
-*-plus.sh
+*-plus.sh
+*@plus.js

build/build-demo.sh

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

build/build.sh

@@ -65,6 +65,8 @@ function build() {
 	# delete hidden files
 	find $DIST -name ".DS_Store" -delete
 	find $DIST -name ".gitignore" -delete
+	find $DIST -name "*.less" -delete
+	find $DIST -name "*.css.map" -delete
 
 	# zip
 	echo "zip files ..."

internal/configloaders/admin_module.go

@@ -182,7 +182,7 @@ func AllModuleMaps() []maps.Map {
 	}
 	if teaconst.IsPlus {
 		m = append(m, maps.Map{
-			"name": "自建DNS",
+			"name": "智能DNS",
 			"code": AdminModuleCodeNS,
 			"url":  "/ns",
 		})

internal/const/const.go

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

internal/rpc/rpc_client.go

@@ -99,6 +99,14 @@ func (this *RPCClient) NodeIPAddressRPC() pb.NodeIPAddressServiceClient {
 	return pb.NewNodeIPAddressServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) NodeIPAddressLogRPC() pb.NodeIPAddressLogServiceClient {
+	return pb.NewNodeIPAddressLogServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NodeIPAddressThresholdRPC() pb.NodeIPAddressThresholdServiceClient {
+	return pb.NewNodeIPAddressThresholdServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) NodeValueRPC() pb.NodeValueServiceClient {
 	return pb.NewNodeValueServiceClient(this.pickConn())
 }
@@ -296,6 +304,18 @@ func (this *RPCClient) IPListRPC() pb.IPListServiceClient {
 	return pb.NewIPListServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) ReportNodeRPC() pb.ReportNodeServiceClient {
+	return pb.NewReportNodeServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ReportNodeGroupRPC() pb.ReportNodeGroupServiceClient {
+	return pb.NewReportNodeGroupServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ReportResultRPC() pb.ReportResultServiceClient {
+	return pb.NewReportResultServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) IPItemRPC() pb.IPItemServiceClient {
 	return pb.NewIPItemServiceClient(this.pickConn())
 }
@@ -344,6 +364,14 @@ func (this *RPCClient) ACMETaskRPC() pb.ACMETaskServiceClient {
 	return pb.NewACMETaskServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) ACMEProviderRPC() pb.ACMEProviderServiceClient {
+	return pb.NewACMEProviderServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ACMEProviderAccountRPC() pb.ACMEProviderAccountServiceClient {
+	return pb.NewACMEProviderAccountServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) UserRPC() pb.UserServiceClient {
 	return pb.NewUserServiceClient(this.pickConn())
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,182 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/iwind/TeaGo/maps"
-	"github.com/iwind/TeaGo/types"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-	"strconv"
-)
-
-type IndexAction struct {
-	actionutils.ParentAction
-}
-
-func (this *IndexAction) Init() {
-	this.Nav("", "board", "")
-}
-
-func (this *IndexAction) RunGet(params struct {
-	ClusterId int64
-}) {
-	if !teaconst.IsPlus {
-		this.RedirectURL("/clusters/cluster?clusterId=" + strconv.FormatInt(params.ClusterId, 10))
-		return
-	}
-
-	resp, err := this.RPC().ServerStatBoardRPC().ComposeServerStatNodeClusterBoard(this.AdminContext(), &pb.ComposeServerStatNodeClusterBoardRequest{NodeClusterId: params.ClusterId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["board"] = maps.Map{
-		"countUsers":         resp.CountUsers,
-		"countActiveNodes":   resp.CountActiveNodes,
-		"countInactiveNodes": resp.CountInactiveNodes,
-		"countServers":       resp.CountServers,
-	}
-
-	// 24小时流量趋势
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.HourlyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"bytes":               stat.Bytes,
-				"cachedBytes":         stat.CachedBytes,
-				"countRequests":       stat.CountRequests,
-				"countCachedRequests": stat.CountCachedRequests,
-				"countAttackRequests": stat.CountAttackRequests,
-				"attackBytes":         stat.AttackBytes,
-				"day":                 stat.Hour[4:6] + "月" + stat.Hour[6:8] + "日",
-				"hour":                stat.Hour[8:],
-			})
-		}
-		this.Data["hourlyStats"] = statMaps
-	}
-
-	// 15天流量趋势
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.DailyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"bytes":               stat.Bytes,
-				"cachedBytes":         stat.CachedBytes,
-				"countRequests":       stat.CountRequests,
-				"countCachedRequests": stat.CountCachedRequests,
-				"countAttackRequests": stat.CountAttackRequests,
-				"attackBytes":         stat.AttackBytes,
-				"day":                 stat.Day[4:6] + "月" + stat.Day[6:] + "日",
-			})
-		}
-		this.Data["dailyStats"] = statMaps
-	}
-
-	// 节点排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopNodeStats {
-			statMaps = append(statMaps, maps.Map{
-				"nodeId":        stat.NodeId,
-				"nodeName":      stat.NodeName,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topNodeStats"] = statMaps
-	}
-
-	// 域名排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopDomainStats {
-			statMaps = append(statMaps, maps.Map{
-				"serverId":      stat.ServerId,
-				"domain":        stat.Domain,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topDomainStats"] = statMaps
-	}
-
-	// CPU
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.CpuNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["cpuValues"] = statMaps
-	}
-
-	// Memory
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.MemoryNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["memoryValues"] = statMaps
-	}
-
-	// Load
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.LoadNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["loadValues"] = statMaps
-	}
-
-	// 指标
-	{
-		var chartMaps = []maps.Map{}
-		for _, chart := range resp.MetricDataCharts {
-			var statMaps = []maps.Map{}
-			for _, stat := range chart.MetricStats {
-				statMaps = append(statMaps, maps.Map{
-					"keys":  stat.Keys,
-					"time":  stat.Time,
-					"value": stat.Value,
-					"count": stat.SumCount,
-					"total": stat.SumTotal,
-				})
-			}
-			chartMaps = append(chartMaps, maps.Map{
-				"chart": maps.Map{
-					"id":       chart.MetricChart.Id,
-					"name":     chart.MetricChart.Name,
-					"widthDiv": chart.MetricChart.WidthDiv,
-					"isOn":     chart.MetricChart.IsOn,
-					"maxItems": chart.MetricChart.MaxItems,
-					"type":     chart.MetricChart.Type,
-				},
-				"item": maps.Map{
-					"id":            chart.MetricChart.MetricItem.Id,
-					"name":          chart.MetricChart.MetricItem.Name,
-					"period":        chart.MetricChart.MetricItem.Period,
-					"periodUnit":    chart.MetricChart.MetricItem.PeriodUnit,
-					"valueType":     serverconfigs.FindMetricValueType(chart.MetricChart.MetricItem.Category, chart.MetricChart.MetricItem.Value),
-					"valueTypeName": serverconfigs.FindMetricValueName(chart.MetricChart.MetricItem.Category, chart.MetricChart.MetricItem.Value),
-					"keys":          chart.MetricChart.MetricItem.Keys,
-				},
-				"stats": statMaps,
-			})
-		}
-		this.Data["metricCharts"] = chartMaps
-	}
-
-	this.Show()
-}

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

@@ -95,6 +95,7 @@ func (this *CreateBatchAction) RunPost(params struct {
 			Name:      "IP地址",
 			Ip:        ip,
 			CanAccess: true,
+			IsUp:      true,
 		})
 		if err != nil {
 			this.ErrorPage(err)

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

@@ -167,25 +167,49 @@ func (this *CreateNodeAction) RunPost(params struct {
 	nodeId := createResp.NodeId
 
 	// IP地址
-	for _, address := range ipAddresses {
-		addressId := address.GetInt64("id")
-		if addressId > 0 {
+	for _, addr := range ipAddresses {
+		addrId := addr.GetInt64("id")
+		if addrId > 0 {
 			_, err = this.RPC().NodeIPAddressRPC().UpdateNodeIPAddressNodeId(this.AdminContext(), &pb.UpdateNodeIPAddressNodeIdRequest{
-				AddressId: addressId,
-				NodeId:    nodeId,
+				NodeIPAddressId: addrId,
+				NodeId:          nodeId,
 			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
 		} else {
-			_, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
+			createResp, err := this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
 				NodeId:    nodeId,
 				Role:      nodeconfigs.NodeRoleNode,
-				Name:      address.GetString("name"),
-				Ip:        address.GetString("ip"),
-				CanAccess: address.GetBool("canAccess"),
+				Name:      addr.GetString("name"),
+				Ip:        addr.GetString("ip"),
+				CanAccess: addr.GetBool("canAccess"),
+				IsUp:      addr.GetBool("isUp"),
 			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			addrId = createResp.NodeIPAddressId
 		}
-		if err != nil {
-			this.ErrorPage(err)
-			return
+
+		// 阈值
+		var thresholds = addr.GetSlice("thresholds")
+		if len(thresholds) > 0 {
+			thresholdsJSON, err := json.Marshal(thresholds)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			_, err = this.RPC().NodeIPAddressThresholdRPC().UpdateAllNodeIPAddressThresholds(this.AdminContext(), &pb.UpdateAllNodeIPAddressThresholdsRequest{
+				NodeIPAddressId:             addrId,
+				NodeIPAddressThresholdsJSON: thresholdsJSON,
+			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
 		}
 	}
 

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

@@ -2,11 +2,13 @@ package cluster
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/boards"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/groups"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node"
-	nodeboards "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/boards"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/thresholds"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/settings/cache"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/settings/dns"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/settings/ssh"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/settings/system"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/settings/thresholds"
 	clusters "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
@@ -44,9 +46,14 @@ func init() {
 			Post("/start", new(node.StartAction)).
 			Post("/stop", new(node.StopAction)).
 			Post("/up", new(node.UpAction)).
-			Get("/thresholds", new(thresholds.IndexAction)).
 			Get("/detail", new(node.DetailAction)).
-			GetPost("/boards", new(nodeboards.IndexAction)).
+			GetPost("/updateDNSPopup", new(node.UpdateDNSPopupAction)).
+			Post("/syncDomain", new(node.SyncDomainAction)).
+			GetPost("/settings/cache", new(cache.IndexAction)).
+			GetPost("/settings/dns", new(dns.IndexAction)).
+			GetPost("/settings/system", new(system.IndexAction)).
+			GetPost("/settings/ssh", new(ssh.IndexAction)).
+			GetPost("/settings/thresholds", new(thresholds.IndexAction)).
 
 			// 分组相关
 			Prefix("/clusters/cluster/groups").
@@ -56,10 +63,6 @@ func init() {
 			Post("/delete", new(groups.DeleteAction)).
 			Post("/sort", new(groups.SortAction)).
 			GetPost("/selectPopup", new(groups.SelectPopupAction)).
-
-			// 看板相关
-			Prefix("/clusters/cluster/boards").
-			Get("", new(boards.IndexAction)).
 			EndAll()
 	})
 }

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

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

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

@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses/ipaddressutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
@@ -68,7 +69,7 @@ func (this *DetailAction) RunGet(params struct {
 	}
 
 	// IP地址
-	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
 		NodeId: params.NodeId,
 		Role:   nodeconfigs.NodeRoleNode,
 	})
@@ -76,14 +77,23 @@ func (this *DetailAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	var ipAddresses = ipAddressesResp.Addresses
+	var ipAddresses = ipAddressesResp.NodeIPAddresses
 	ipAddressMaps := []maps.Map{}
-	for _, addr := range ipAddressesResp.Addresses {
+	for _, addr := range ipAddressesResp.NodeIPAddresses {
+		thresholds, err := ipaddressutils.InitNodeIPAddressThresholds(this.Parent(), addr.Id)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
 		ipAddressMaps = append(ipAddressMaps, maps.Map{
-			"id":        addr.Id,
-			"name":      addr.Name,
-			"ip":        addr.Ip,
-			"canAccess": addr.CanAccess,
+			"id":         addr.Id,
+			"name":       addr.Name,
+			"ip":         addr.Ip,
+			"canAccess":  addr.CanAccess,
+			"isOn":       addr.IsOn,
+			"isUp":       addr.IsUp,
+			"thresholds": thresholds,
 		})
 	}
 
@@ -121,7 +131,7 @@ func (this *DetailAction) RunGet(params struct {
 		}
 
 		for _, addr := range ipAddresses {
-			if !addr.CanAccess {
+			if !addr.CanAccess || !addr.IsUp || !addr.IsOn {
 				continue
 			}
 			for _, route := range dnsInfo.Routes {

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

@@ -20,7 +20,7 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct {
 	NodeId int64
 }) {
-	err := nodeutils.InitNodeInfo(this, params.NodeId)
+	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
 	if err != nil {
 		this.ErrorPage(err)
 		return

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

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

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

@@ -25,7 +25,7 @@ func (this *LogsAction) RunGet(params struct {
 	Level   string
 }) {
 	// 初始化节点信息（用于菜单）
-	err := nodeutils.InitNodeInfo(this, params.NodeId)
+	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
 	if err != nil {
 		this.ErrorPage(err)
 		return

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

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

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

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

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

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

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

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

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

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

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

@@ -15,22 +15,22 @@ type IndexAction struct {
 }
 
 func (this *IndexAction) Init() {
-	this.Nav("", "node", "threshold")
+	this.Nav("", "", "update")
+	this.SecondMenu("threshold")
 }
 
 func (this *IndexAction) RunGet(params struct {
 	ClusterId int64
 	NodeId    int64
 }) {
-	this.Data["nodeId"] = params.NodeId
-
-	// 初始化节点信息（用于菜单）
-	err := nodeutils.InitNodeInfo(this, params.NodeId)
+	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
+	this.Data["nodeId"] = params.NodeId
+
 	// 列出所有阈值
 	thresholdsResp, err := this.RPC().NodeThresholdRPC().FindAllEnabledNodeThresholds(this.AdminContext(), &pb.FindAllEnabledNodeThresholdsRequest{
 		Role:          "node",

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

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

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

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

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

@@ -4,11 +4,10 @@ import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses/ipaddressutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
@@ -19,12 +18,18 @@ type UpdateAction struct {
 
 func (this *UpdateAction) Init() {
 	this.Nav("", "node", "update")
-	this.SecondMenu("nodes")
+	this.SecondMenu("basic")
 }
 
 func (this *UpdateAction) RunGet(params struct {
 	NodeId int64
 }) {
+	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Data["nodeId"] = params.NodeId
 
 	nodeResp, err := this.RPC().NodeRPC().FindEnabledNode(this.AdminContext(), &pb.FindEnabledNodeRequest{NodeId: params.NodeId})
@@ -47,7 +52,7 @@ func (this *UpdateAction) RunGet(params struct {
 	}
 
 	// IP地址
-	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
 		NodeId: params.NodeId,
 		Role:   nodeconfigs.NodeRoleNode,
 	})
@@ -56,114 +61,24 @@ func (this *UpdateAction) RunGet(params struct {
 		return
 	}
 	ipAddressMaps := []maps.Map{}
-	for _, addr := range ipAddressesResp.Addresses {
+	for _, addr := range ipAddressesResp.NodeIPAddresses {
+		thresholds, err := ipaddressutils.InitNodeIPAddressThresholds(this.Parent(), addr.Id)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
 		ipAddressMaps = append(ipAddressMaps, maps.Map{
-			"id":        addr.Id,
-			"name":      addr.Name,
-			"ip":        addr.Ip,
-			"canAccess": addr.CanAccess,
+			"id":         addr.Id,
+			"name":       addr.Name,
+			"ip":         addr.Ip,
+			"canAccess":  addr.CanAccess,
+			"isOn":       addr.IsOn,
+			"isUp":       addr.IsUp,
+			"thresholds": thresholds,
 		})
 	}
 
-	// DNS相关
-	var clusters = []*pb.NodeCluster{node.NodeCluster}
-	clusters = append(clusters, node.SecondaryNodeClusters...)
-	var allDNSRouteMaps = map[int64][]maps.Map{} // domain id => routes
-	var routeMaps = map[int64][]maps.Map{}       // domain id => routes
-	for _, cluster := range clusters {
-		dnsInfoResp, err := this.RPC().NodeRPC().FindEnabledNodeDNS(this.AdminContext(), &pb.FindEnabledNodeDNSRequest{
-			NodeId:        params.NodeId,
-			NodeClusterId: cluster.Id,
-		})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		var dnsInfo = dnsInfoResp.Node
-		if dnsInfo.DnsDomainId <= 0 || len(dnsInfo.DnsDomainName) == 0 {
-			continue
-		}
-		var domainId = dnsInfo.DnsDomainId
-		var domainName = dnsInfo.DnsDomainName
-		if len(dnsInfo.Routes) > 0 {
-			for _, route := range dnsInfo.Routes {
-				routeMaps[domainId] = append(routeMaps[domainId], maps.Map{
-					"domainId":   domainId,
-					"domainName": domainName,
-					"code":       route.Code,
-					"name":       route.Name,
-				})
-			}
-		}
-
-		// 所有线路选项
-		routesResp, err := this.RPC().DNSDomainRPC().FindAllDNSDomainRoutes(this.AdminContext(), &pb.FindAllDNSDomainRoutesRequest{DnsDomainId: dnsInfoResp.Node.DnsDomainId})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		for _, route := range routesResp.Routes {
-			allDNSRouteMaps[domainId] = append(allDNSRouteMaps[domainId], maps.Map{
-				"domainId":   domainId,
-				"domainName": domainName,
-				"name":       route.Name,
-				"code":       route.Code,
-			})
-		}
-	}
-
-	var domainRoutes = []maps.Map{}
-	for _, m := range routeMaps {
-		domainRoutes = append(domainRoutes, m...)
-	}
-	this.Data["dnsRoutes"] = domainRoutes
-
-	var allDomainRoutes = []maps.Map{}
-	for _, m := range allDNSRouteMaps {
-		allDomainRoutes = append(allDomainRoutes, m...)
-	}
-	this.Data["allDNSRoutes"] = allDomainRoutes
-
-	// 登录信息
-	var loginMap maps.Map = nil
-	if node.NodeLogin != nil {
-		loginParams := maps.Map{}
-		if len(node.NodeLogin.Params) > 0 {
-			err = json.Unmarshal(node.NodeLogin.Params, &loginParams)
-			if err != nil {
-				this.ErrorPage(err)
-				return
-			}
-		}
-
-		grantMap := maps.Map{}
-		grantId := loginParams.GetInt64("grantId")
-		if grantId > 0 {
-			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
-			if err != nil {
-				this.ErrorPage(err)
-				return
-			}
-			if grantResp.NodeGrant != nil {
-				grantMap = maps.Map{
-					"id":         grantResp.NodeGrant.Id,
-					"name":       grantResp.NodeGrant.Name,
-					"method":     grantResp.NodeGrant.Method,
-					"methodName": grantutils.FindGrantMethodName(grantResp.NodeGrant.Method),
-					"username":   grantResp.NodeGrant.Username,
-				}
-			}
-		}
-
-		loginMap = maps.Map{
-			"id":     node.NodeLogin.Id,
-			"name":   node.NodeLogin.Name,
-			"type":   node.NodeLogin.Type,
-			"params": loginParams,
-			"grant":  grantMap,
-		}
-	}
-
 	// 分组
 	var groupMap maps.Map = nil
 	if node.NodeGroup != nil {
@@ -182,45 +97,14 @@ func (this *UpdateAction) RunGet(params struct {
 		}
 	}
 
-	// 缓存硬盘 & 内存容量
-	var maxCacheDiskCapacity maps.Map = nil
-	if node.MaxCacheDiskCapacity != nil {
-		maxCacheDiskCapacity = maps.Map{
-			"count": node.MaxCacheDiskCapacity.Count,
-			"unit":  node.MaxCacheDiskCapacity.Unit,
-		}
-	} else {
-		maxCacheDiskCapacity = maps.Map{
-			"count": 0,
-			"unit":  "gb",
-		}
-	}
-
-	var maxCacheMemoryCapacity maps.Map = nil
-	if node.MaxCacheMemoryCapacity != nil {
-		maxCacheMemoryCapacity = maps.Map{
-			"count": node.MaxCacheMemoryCapacity.Count,
-			"unit":  node.MaxCacheMemoryCapacity.Unit,
-		}
-	} else {
-		maxCacheMemoryCapacity = maps.Map{
-			"count": 0,
-			"unit":  "gb",
-		}
-	}
-
 	var m = maps.Map{
-		"id":                     node.Id,
-		"name":                   node.Name,
-		"ipAddresses":            ipAddressMaps,
-		"cluster":                clusterMap,
-		"login":                  loginMap,
-		"maxCPU":                 node.MaxCPU,
-		"isOn":                   node.IsOn,
-		"group":                  groupMap,
-		"region":                 regionMap,
-		"maxCacheDiskCapacity":   maxCacheDiskCapacity,
-		"maxCacheMemoryCapacity": maxCacheMemoryCapacity,
+		"id":          node.Id,
+		"name":        node.Name,
+		"ipAddresses": ipAddressMaps,
+		"cluster":     clusterMap,
+		"isOn":        node.IsOn,
+		"group":       groupMap,
+		"region":      regionMap,
 	}
 
 	if node.NodeCluster != nil {
@@ -251,24 +135,15 @@ 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"`
-	PrimaryClusterId           int64
-	SecondaryClusterIds        []byte
-	GrantId                    int64
-	SshHost                    string
-	SshPort                    int
-	MaxCPU                     int32
-	IsOn                       bool
-	MaxCacheDiskCapacityJSON   []byte
-	MaxCacheMemoryCapacityJSON []byte
-
-	DnsDomainId   int64
-	DnsRoutesJSON []byte
+	LoginId             int64
+	NodeId              int64
+	GroupId             int64
+	RegionId            int64
+	Name                string
+	IPAddressesJSON     []byte `alias:"ipAddressesJSON"`
+	PrimaryClusterId    int64
+	SecondaryClusterIds []byte
+	IsOn                bool
 
 	Must *actions.Must
 }) {
@@ -310,56 +185,6 @@ func (this *UpdateAction) RunPost(params struct {
 		this.Fail("请至少输入一个IP地址")
 	}
 
-	dnsRouteCodes := []string{}
-	if len(params.DnsRoutesJSON) > 0 {
-		err := json.Unmarshal(params.DnsRoutesJSON, &dnsRouteCodes)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-	}
-
-	// TODO 检查登录授权
-	loginInfo := &pb.NodeLogin{
-		Id:   params.LoginId,
-		Name: "SSH",
-		Type: "ssh",
-		Params: maps.Map{
-			"grantId": params.GrantId,
-			"host":    params.SshHost,
-			"port":    params.SshPort,
-		}.AsJSON(),
-	}
-
-	// 缓存硬盘 & 内存容量
-	var pbMaxCacheDiskCapacity *pb.SizeCapacity
-	if len(params.MaxCacheDiskCapacityJSON) > 0 {
-		var sizeCapacity = &shared.SizeCapacity{}
-		err := json.Unmarshal(params.MaxCacheDiskCapacityJSON, sizeCapacity)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		pbMaxCacheDiskCapacity = &pb.SizeCapacity{
-			Count: sizeCapacity.Count,
-			Unit:  sizeCapacity.Unit,
-		}
-	}
-
-	var pbMaxCacheMemoryCapacity *pb.SizeCapacity
-	if len(params.MaxCacheMemoryCapacityJSON) > 0 {
-		var sizeCapacity = &shared.SizeCapacity{}
-		err := json.Unmarshal(params.MaxCacheMemoryCapacityJSON, sizeCapacity)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		pbMaxCacheMemoryCapacity = &pb.SizeCapacity{
-			Count: sizeCapacity.Count,
-			Unit:  sizeCapacity.Unit,
-		}
-	}
-
 	// 保存
 	_, err := this.RPC().NodeRPC().UpdateNode(this.AdminContext(), &pb.UpdateNodeRequest{
 		NodeId:                  params.NodeId,
@@ -368,13 +193,7 @@ func (this *UpdateAction) RunPost(params struct {
 		Name:                    params.Name,
 		NodeClusterId:           params.PrimaryClusterId,
 		SecondaryNodeClusterIds: secondaryClusterIds,
-		NodeLogin:               loginInfo,
-		MaxCPU:                  params.MaxCPU,
 		IsOn:                    params.IsOn,
-		DnsDomainId:             params.DnsDomainId,
-		DnsRoutes:               dnsRouteCodes,
-		MaxCacheDiskCapacity:    pbMaxCacheDiskCapacity,
-		MaxCacheMemoryCapacity:  pbMaxCacheMemoryCapacity,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -382,7 +201,7 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	// 禁用老的IP地址
-	_, err = this.RPC().NodeIPAddressRPC().DisableAllIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllIPAddressesWithNodeIdRequest{
+	_, err = this.RPC().NodeIPAddressRPC().DisableAllNodeIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllNodeIPAddressesWithNodeIdRequest{
 		NodeId: params.NodeId,
 		Role:   nodeconfigs.NodeRoleNode,
 	})

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

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

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

@@ -41,6 +41,15 @@ func (this *NodesAction) RunGet(params struct {
 	this.Data["activeState"] = params.ActiveState
 	this.Data["keyword"] = params.Keyword
 
+	// 集群是否已经设置了线路
+	clusterDNSResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeClusterDNS(this.AdminContext(), &pb.FindEnabledNodeClusterDNSRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["hasClusterDNS"] = clusterDNSResp.Domain != nil
+
+	// 数量
 	countAllResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
 		NodeClusterId: params.ClusterId,
 	})
@@ -114,7 +123,7 @@ func (this *NodesAction) RunGet(params struct {
 		}
 
 		// IP
-		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+		ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
 			NodeId: node.Id,
 			Role:   nodeconfigs.NodeRoleNode,
 		})
@@ -123,12 +132,14 @@ func (this *NodesAction) RunGet(params struct {
 			return
 		}
 		ipAddresses := []maps.Map{}
-		for _, addr := range ipAddressesResp.Addresses {
+		for _, addr := range ipAddressesResp.NodeIPAddresses {
 			ipAddresses = append(ipAddresses, maps.Map{
 				"id":        addr.Id,
 				"name":      addr.Name,
 				"ip":        addr.Ip,
 				"canAccess": addr.CanAccess,
+				"isUp":      addr.IsUp,
+				"isOn":      addr.IsOn,
 			})
 		}
 

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

@@ -46,6 +46,13 @@ func (this *IndexAction) RunGet(params struct {
 		this.Data["domainName"] = dnsInfoResp.Domain.Name
 	}
 
+	if len(dnsInfoResp.CnameRecords) == 0 {
+		this.Data["cnameRecords"] = []string{}
+	} else {
+		this.Data["cnameRecords"] = dnsInfoResp.CnameRecords
+	}
+	this.Data["ttl"] = dnsInfoResp.Ttl
+
 	this.Show()
 }
 
@@ -56,6 +63,8 @@ func (this *IndexAction) RunPost(params struct {
 	DnsName         string
 	NodesAutoSync   bool
 	ServersAutoSync bool
+	CnameRecords    []string
+	Ttl             int32
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -97,6 +106,8 @@ func (this *IndexAction) RunPost(params struct {
 		DnsDomainId:     params.DnsDomainId,
 		NodesAutoSync:   params.NodesAutoSync,
 		ServersAutoSync: params.ServersAutoSync,
+		CnameRecords:    params.CnameRecords,
+		Ttl:             params.Ttl,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -45,6 +45,7 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext
 			action.WriteString("can not find cluster")
 			return
 		}
+		action.Data["currentClusterName"] = cluster.Name
 
 		clusterInfo, err := dao.SharedNodeClusterDAO.FindEnabledNodeClusterConfigInfo(ctx, clusterId)
 		if err != nil {

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

@@ -19,6 +19,7 @@ func (this *CreateAction) Init() {
 }
 
 func (this *CreateAction) RunGet(params struct{}) {
+	// 是否有域名
 	hasDomainsResp, err := this.RPC().DNSDomainRPC().ExistAvailableDomains(this.AdminContext(), &pb.ExistAvailableDomainsRequest{})
 	if err != nil {
 		this.ErrorPage(err)
@@ -53,13 +54,6 @@ func (this *CreateAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入集群名称")
 
-	if params.CachePolicyId <= 0 {
-		this.Fail("请选择或者创建缓存策略")
-	}
-	if params.HttpFirewallPolicyId <= 0 {
-		this.Fail("请选择或者创建WAF策略")
-	}
-
 	// 检查DNS名称
 	if len(params.DnsName) > 0 {
 		if !domainutils.ValidateDomainFormat(params.DnsName) {
@@ -113,5 +107,7 @@ func (this *CreateAction) RunPost(params struct {
 	// 创建日志
 	defer this.CreateLog(oplogs.LevelInfo, "创建节点集群：%d", createResp.NodeClusterId)
 
+	this.Data["clusterId"] = createResp.NodeClusterId
+
 	this.Success()
 }

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

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

internal/web/actions/default/clusters/monitors/groups/options.go

@@ -0,0 +1,32 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package groups
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type OptionsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *OptionsAction) RunPost(params struct{}) {
+	resp, err := this.RPC().ReportNodeGroupRPC().FindAllEnabledReportNodeGroups(this.AdminContext(), &pb.FindAllEnabledReportNodeGroupsRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var groupMaps = []maps.Map{}
+	for _, group := range resp.ReportNodeGroups {
+		groupMaps = append(groupMaps, maps.Map{
+			"id":   group.Id,
+			"name": group.Name,
+		})
+	}
+	this.Data["groups"] = groupMaps
+
+	this.Success()
+}

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

@@ -20,21 +20,28 @@ func (this *SelectPopupAction) Init() {
 
 func (this *SelectPopupAction) RunGet(params struct {
 	SelectedClusterIds string
+	Keyword            string
 }) {
+	this.Data["keyword"] = params.Keyword
+
 	var selectedIds = utils.SplitNumbers(params.SelectedClusterIds)
 
-	countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{})
+	countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{
+		Keyword: params.Keyword,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	var count = countResp.Count
 	var page = this.NewPage(count)
+	page.Size = 6
 	this.Data["page"] = page.AsHTML()
 
 	clustersResp, err := this.RPC().NodeClusterRPC().ListEnabledNodeClusters(this.AdminContext(), &pb.ListEnabledNodeClustersRequest{
-		Offset: page.Offset,
-		Size:   page.Size,
+		Keyword: params.Keyword,
+		Offset:  page.Offset,
+		Size:    page.Size,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/dashboard/boards/dns.go

@@ -1,133 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-	"github.com/iwind/TeaGo/types"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-)
-
-type DnsAction struct {
-	actionutils.ParentAction
-}
-
-func (this *DnsAction) Init() {
-	this.Nav("", "", "dns")
-}
-
-func (this *DnsAction) RunGet(params struct{}) {
-	if !teaconst.IsPlus {
-		this.RedirectURL("/dashboard")
-		return
-	}
-
-	resp, err := this.RPC().NSRPC().ComposeNSBoard(this.AdminContext(), &pb.ComposeNSBoardRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["board"] = maps.Map{
-		"countDomains":      resp.CountNSDomains,
-		"countRecords":      resp.CountNSRecords,
-		"countClusters":     resp.CountNSClusters,
-		"countNodes":        resp.CountNSNodes,
-		"countOfflineNodes": resp.CountOfflineNSNodes,
-	}
-
-	// 流量排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.HourlyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"day":           stat.Hour[4:6] + "月" + stat.Hour[6:8] + "日",
-				"hour":          stat.Hour[8:],
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["hourlyStats"] = statMaps
-	}
-
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.DailyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"day":           stat.Day[4:6] + "月" + stat.Day[6:] + "日",
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["dailyStats"] = statMaps
-	}
-
-	// 域名排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopNSDomainStats {
-			statMaps = append(statMaps, maps.Map{
-				"domainId":      stat.NsDomainId,
-				"domainName":    stat.NsDomainName,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topDomainStats"] = statMaps
-	}
-
-	// 节点排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopNSNodeStats {
-			statMaps = append(statMaps, maps.Map{
-				"clusterId":     stat.NsClusterId,
-				"nodeId":        stat.NsNodeId,
-				"nodeName":      stat.NsNodeName,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topNodeStats"] = statMaps
-	}
-
-	// CPU
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.CpuNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["cpuValues"] = statMaps
-	}
-
-	// Memory
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.MemoryNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["memoryValues"] = statMaps
-	}
-
-	// Load
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.LoadNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["loadValues"] = statMaps
-	}
-
-	this.Show()
-}

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

@@ -1,249 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/iwind/TeaGo/maps"
-	"regexp"
-)
-
-type IndexAction struct {
-	actionutils.ParentAction
-}
-
-func (this *IndexAction) Init() {
-	this.Nav("", "", "index")
-}
-
-func (this *IndexAction) RunGet(params struct{}) {
-	if !teaconst.IsPlus {
-		this.RedirectURL("/dashboard")
-		return
-	}
-
-	// 取得用户的权限
-	module, ok := configloaders.FindFirstAdminModule(this.AdminId())
-	if ok {
-		if module != "dashboard" {
-			for _, m := range configloaders.AllModuleMaps() {
-				if m.GetString("code") == module {
-					this.RedirectURL(m.GetString("url"))
-					return
-				}
-			}
-		}
-	}
-
-	// 读取看板数据
-	resp, err := this.RPC().AdminRPC().ComposeAdminDashboard(this.AdminContext(), &pb.ComposeAdminDashboardRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["dashboard"] = maps.Map{
-		"countServers":      resp.CountServers,
-		"countNodeClusters": resp.CountNodeClusters,
-		"countNodes":        resp.CountNodes,
-		"countUsers":        resp.CountUsers,
-		"countAPINodes":     resp.CountAPINodes,
-		"countDBNodes":      resp.CountDBNodes,
-		"countUserNodes":    resp.CountUserNodes,
-
-		"canGoServers":  configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeServer),
-		"canGoNodes":    configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeNode),
-		"canGoSettings": configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeSetting),
-		"canGoUsers":    configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeUser),
-	}
-
-	// 今日流量
-	todayTrafficBytes := int64(0)
-	if len(resp.DailyTrafficStats) > 0 {
-		todayTrafficBytes = resp.DailyTrafficStats[len(resp.DailyTrafficStats)-1].Bytes
-	}
-	todayTrafficString := numberutils.FormatBytes(todayTrafficBytes)
-	result := regexp.MustCompile(`^(?U)(.+)([a-zA-Z]+)$`).FindStringSubmatch(todayTrafficString)
-	if len(result) > 2 {
-		this.Data["todayTraffic"] = result[1]
-		this.Data["todayTrafficUnit"] = result[2]
-	} else {
-		this.Data["todayTraffic"] = todayTrafficString
-		this.Data["todayTrafficUnit"] = ""
-	}
-
-	// 24小时流量趋势
-	{
-		statMaps := []maps.Map{}
-		for _, stat := range resp.HourlyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"bytes":               stat.Bytes,
-				"cachedBytes":         stat.CachedBytes,
-				"countRequests":       stat.CountRequests,
-				"countCachedRequests": stat.CountCachedRequests,
-				"countAttackRequests": stat.CountAttackRequests,
-				"attackBytes":         stat.AttackBytes,
-				"day":                 stat.Hour[4:6] + "月" + stat.Hour[6:8] + "日",
-				"hour":                stat.Hour[8:],
-			})
-		}
-		this.Data["hourlyTrafficStats"] = statMaps
-	}
-
-	// 15天流量趋势
-	{
-		statMaps := []maps.Map{}
-		for _, stat := range resp.DailyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"bytes":               stat.Bytes,
-				"cachedBytes":         stat.CachedBytes,
-				"countRequests":       stat.CountRequests,
-				"countCachedRequests": stat.CountCachedRequests,
-				"countAttackRequests": stat.CountAttackRequests,
-				"attackBytes":         stat.AttackBytes,
-				"day":                 stat.Day[4:6] + "月" + stat.Day[6:] + "日",
-			})
-		}
-		this.Data["dailyTrafficStats"] = statMaps
-	}
-
-	// 节点排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopNodeStats {
-			statMaps = append(statMaps, maps.Map{
-				"nodeId":        stat.NodeId,
-				"nodeName":      stat.NodeName,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topNodeStats"] = statMaps
-	}
-
-	// 域名排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopDomainStats {
-			statMaps = append(statMaps, maps.Map{
-				"serverId":      stat.ServerId,
-				"domain":        stat.Domain,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topDomainStats"] = statMaps
-	}
-
-	// 版本升级
-	if resp.NodeUpgradeInfo != nil {
-		this.Data["nodeUpgradeInfo"] = maps.Map{
-			"count":   resp.NodeUpgradeInfo.CountNodes,
-			"version": resp.NodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["nodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
-	if resp.MonitorNodeUpgradeInfo != nil {
-		this.Data["monitorNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.MonitorNodeUpgradeInfo.CountNodes,
-			"version": resp.MonitorNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["monitorNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
-	if resp.ApiNodeUpgradeInfo != nil {
-		this.Data["apiNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.ApiNodeUpgradeInfo.CountNodes,
-			"version": resp.ApiNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["apiNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
-	if resp.UserNodeUpgradeInfo != nil {
-		this.Data["userNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.UserNodeUpgradeInfo.CountNodes,
-			"version": resp.UserNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["userNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": 0,
-		}
-	}
-	if resp.AuthorityNodeUpgradeInfo != nil {
-		this.Data["authorityNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.AuthorityNodeUpgradeInfo.CountNodes,
-			"version": resp.AuthorityNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["authorityNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
-	if resp.NsNodeUpgradeInfo != nil {
-		this.Data["nsNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.NsNodeUpgradeInfo.CountNodes,
-			"version": resp.NsNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["nsNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
-
-	// 指标
-	{
-		var chartMaps = []maps.Map{}
-		for _, chart := range resp.MetricDataCharts {
-			var statMaps = []maps.Map{}
-			for _, stat := range chart.MetricStats {
-				statMaps = append(statMaps, maps.Map{
-					"keys":  stat.Keys,
-					"time":  stat.Time,
-					"value": stat.Value,
-					"count": stat.SumCount,
-					"total": stat.SumTotal,
-				})
-			}
-			chartMaps = append(chartMaps, maps.Map{
-				"chart": maps.Map{
-					"id":       chart.MetricChart.Id,
-					"name":     chart.MetricChart.Name,
-					"widthDiv": chart.MetricChart.WidthDiv,
-					"isOn":     chart.MetricChart.IsOn,
-					"maxItems": chart.MetricChart.MaxItems,
-					"type":     chart.MetricChart.Type,
-				},
-				"item": maps.Map{
-					"id":            chart.MetricChart.MetricItem.Id,
-					"name":          chart.MetricChart.MetricItem.Name,
-					"period":        chart.MetricChart.MetricItem.Period,
-					"periodUnit":    chart.MetricChart.MetricItem.PeriodUnit,
-					"valueType":     serverconfigs.FindMetricValueType(chart.MetricChart.MetricItem.Category, chart.MetricChart.MetricItem.Value),
-					"valueTypeName": serverconfigs.FindMetricValueName(chart.MetricChart.MetricItem.Category, chart.MetricChart.MetricItem.Value),
-					"keys":          chart.MetricChart.MetricItem.Keys,
-				},
-				"stats": statMaps,
-			})
-		}
-		this.Data["metricCharts"] = chartMaps
-	}
-
-	this.Show()
-}

internal/web/actions/default/dashboard/boards/user.go

@@ -1,103 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-	"github.com/iwind/TeaGo/types"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-)
-
-type UserAction struct {
-	actionutils.ParentAction
-}
-
-func (this *UserAction) Init() {
-	this.Nav("", "", "user")
-}
-
-func (this *UserAction) RunGet(params struct{}) {
-	if !teaconst.IsPlus {
-		this.RedirectURL("/dashboard")
-		return
-	}
-
-	resp, err := this.RPC().UserRPC().ComposeUserGlobalBoard(this.AdminContext(), &pb.ComposeUserGlobalBoardRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["board"] = maps.Map{
-		"totalUsers":            resp.TotalUsers,
-		"countTodayUsers":       resp.CountTodayUsers,
-		"countWeeklyUsers":      resp.CountWeeklyUsers,
-		"countUserNodes":        resp.CountUserNodes,
-		"countOfflineUserNodes": resp.CountOfflineUserNodes,
-	}
-
-	{
-		statMaps := []maps.Map{}
-		for _, stat := range resp.DailyStats {
-			statMaps = append(statMaps, maps.Map{
-				"day":   stat.Day,
-				"count": stat.Count,
-			})
-		}
-		this.Data["dailyStats"] = statMaps
-	}
-
-	// CPU
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.CpuNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["cpuValues"] = statMaps
-	}
-
-	// Memory
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.MemoryNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["memoryValues"] = statMaps
-	}
-
-	// Load
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.LoadNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["loadValues"] = statMaps
-	}
-
-	// 流量排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"userId":        stat.UserId,
-				"userName":      stat.UserName,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topTrafficStats"] = statMaps
-	}
-
-	this.Show()
-}

internal/web/actions/default/dashboard/boards/waf.go

@@ -1,76 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-)
-
-type WafAction struct {
-	actionutils.ParentAction
-}
-
-func (this *WafAction) Init() {
-	this.Nav("", "", "waf")
-}
-
-func (this *WafAction) RunGet(params struct{}) {
-	if !teaconst.IsPlus {
-		this.RedirectURL("/dashboard")
-		return
-	}
-
-	resp, err := this.RPC().FirewallRPC().ComposeFirewallGlobalBoard(this.AdminContext(), &pb.ComposeFirewallGlobalBoardRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["board"] = maps.Map{
-		"countDailyLogs":    resp.CountDailyLogs,
-		"countDailyBlocks":  resp.CountDailyBlocks,
-		"countDailyCaptcha": resp.CountDailyCaptcha,
-		"countWeeklyBlocks": resp.CountWeeklyBlocks,
-	}
-
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.HourlyStats {
-			statMaps = append(statMaps, maps.Map{
-				"hour":         stat.Hour,
-				"countLogs":    stat.CountLogs,
-				"countCaptcha": stat.CountCaptcha,
-				"countBlocks":  stat.CountBlocks,
-			})
-		}
-		this.Data["hourlyStats"] = statMaps
-	}
-
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.DailyStats {
-			statMaps = append(statMaps, maps.Map{
-				"day":          stat.Day,
-				"countLogs":    stat.CountLogs,
-				"countCaptcha": stat.CountCaptcha,
-				"countBlocks":  stat.CountBlocks,
-			})
-		}
-		this.Data["dailyStats"] = statMaps
-	}
-
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.HttpFirewallRuleGroups {
-			statMaps = append(statMaps, maps.Map{
-				"name":  stat.HttpFirewallRuleGroup.Name,
-				"count": stat.Count,
-			})
-		}
-		this.Data["groupStats"] = statMaps
-	}
-
-	this.Show()
-}

internal/web/actions/default/dashboard/boards/wafLogs.go

@@ -1,28 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package boards
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-)
-
-type WafLogsAction struct {
-	actionutils.ParentAction
-}
-
-func (this *WafLogsAction) RunPost(params struct{}) {
-	resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
-		HasFirewallPolicy: true,
-		Reverse:           false,
-		Day:               timeutil.Format("Ymd"),
-		Size:              5,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["accessLogs"] = resp.HttpAccessLogs
-	this.Success()
-}

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

@@ -40,20 +40,31 @@ func (this *IndexAction) RunGet(params struct{}) {
 		}
 	}
 
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct{}) {
 	// 读取看板数据
-	resp, err := this.RPC().AdminRPC().ComposeAdminDashboard(this.AdminContext(), &pb.ComposeAdminDashboardRequest{})
+	resp, err := this.RPC().AdminRPC().ComposeAdminDashboard(this.AdminContext(), &pb.ComposeAdminDashboardRequest{
+		ApiVersion: teaconst.APINodeVersion,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	this.Data["dashboard"] = maps.Map{
-		"countServers":      resp.CountServers,
-		"countNodeClusters": resp.CountNodeClusters,
-		"countNodes":        resp.CountNodes,
-		"countUsers":        resp.CountUsers,
-		"countAPINodes":     resp.CountAPINodes,
-		"countDBNodes":      resp.CountDBNodes,
-		"countUserNodes":    resp.CountUserNodes,
+		"defaultClusterId": resp.DefaultNodeClusterId,
+
+		"countServers":          resp.CountServers,
+		"countNodeClusters":     resp.CountNodeClusters,
+		"countNodes":            resp.CountNodes,
+		"countOfflineNodes":     resp.CountOfflineNodes,
+		"countUsers":            resp.CountUsers,
+		"countAPINodes":         resp.CountAPINodes,
+		"countOfflineAPINodes":  resp.CountOfflineAPINodes,
+		"countDBNodes":          resp.CountDBNodes,
+		"countUserNodes":        resp.CountUserNodes,
+		"countOfflineUserNodes": resp.CountOfflineUserNodes,
 
 		"canGoServers":  configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeServer),
 		"canGoNodes":    configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeNode),
@@ -81,8 +92,14 @@ func (this *IndexAction) RunGet(params struct{}) {
 		statMaps := []maps.Map{}
 		for _, stat := range resp.HourlyTrafficStats {
 			statMaps = append(statMaps, maps.Map{
-				"bytes": stat.Bytes,
-				"hour":  stat.Hour[8:],
+				"bytes":               stat.Bytes,
+				"cachedBytes":         stat.CachedBytes,
+				"countRequests":       stat.CountRequests,
+				"countCachedRequests": stat.CountCachedRequests,
+				"countAttackRequests": stat.CountAttackRequests,
+				"attackBytes":         stat.AttackBytes,
+				"day":                 stat.Hour[4:6] + "月" + stat.Hour[6:8] + "日",
+				"hour":                stat.Hour[8:],
 			})
 		}
 		this.Data["hourlyTrafficStats"] = statMaps
@@ -93,8 +110,13 @@ func (this *IndexAction) RunGet(params struct{}) {
 		statMaps := []maps.Map{}
 		for _, stat := range resp.DailyTrafficStats {
 			statMaps = append(statMaps, maps.Map{
-				"bytes": stat.Bytes,
-				"day":   stat.Day[4:6] + "月" + stat.Day[6:] + "日",
+				"bytes":               stat.Bytes,
+				"cachedBytes":         stat.CachedBytes,
+				"countRequests":       stat.CountRequests,
+				"countCachedRequests": stat.CountCachedRequests,
+				"countAttackRequests": stat.CountAttackRequests,
+				"attackBytes":         stat.AttackBytes,
+				"day":                 stat.Day[4:6] + "月" + stat.Day[6:] + "日",
 			})
 		}
 		this.Data["dailyTrafficStats"] = statMaps
@@ -168,6 +190,20 @@ func (this *IndexAction) RunGet(params struct{}) {
 		}
 	}
 
+	// 域名排行
+	{
+		var statMaps = []maps.Map{}
+		for _, stat := range resp.TopDomainStats {
+			statMaps = append(statMaps, maps.Map{
+				"serverId":      stat.ServerId,
+				"domain":        stat.Domain,
+				"countRequests": stat.CountRequests,
+				"bytes":         stat.Bytes,
+			})
+		}
+		this.Data["topDomainStats"] = statMaps
+	}
+
 	// 指标
 	{
 		var chartMaps = []maps.Map{}
@@ -206,5 +242,5 @@ func (this *IndexAction) RunGet(params struct{}) {
 		this.Data["metricCharts"] = chartMaps
 	}
 
-	this.Show()
+	this.Success()
 }

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

@@ -2,7 +2,6 @@ package dashboard
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dashboard/boards"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
 )
@@ -13,15 +12,6 @@ func init() {
 			Data("teaMenu", "dashboard").
 			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeCommon)).
 			GetPost("", new(IndexAction)).
-
-			// 看板
-			Prefix("/dashboard/boards").
-			Get("", new(boards.IndexAction)).
-			Get("/waf", new(boards.WafAction)).
-			Post("/wafLogs", new(boards.WafLogsAction)).
-			Get("/dns", new(boards.DnsAction)).
-			Get("/user", new(boards.UserAction)).
-
 			EndAll()
 	})
 }

internal/web/actions/default/db/clean.go

@@ -3,28 +3,35 @@ package db
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/db/dbnodeutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
 
-type CleanPopupAction struct {
+type CleanAction struct {
 	actionutils.ParentAction
 }
 
-func (this *CleanPopupAction) Init() {
-	this.Nav("", "", "")
+func (this *CleanAction) Init() {
+	this.Nav("", "", "clean")
 }
 
-func (this *CleanPopupAction) RunGet(params struct {
+func (this *CleanAction) RunGet(params struct {
 	NodeId int64
 }) {
+	_, err := dbnodeutils.InitNode(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Data["nodeId"] = params.NodeId
 
 	this.Show()
 }
 
-func (this *CleanPopupAction) RunPost(params struct {
+func (this *CleanAction) RunPost(params struct {
 	NodeId int64
 
 	Must *actions.Must
@@ -33,8 +40,7 @@ func (this *CleanPopupAction) RunPost(params struct {
 		DbNodeId: params.NodeId,
 	})
 	if err != nil {
-		this.ErrorPage(err)
-		return
+		this.Fail("查询数据时出错了：" + err.Error())
 	}
 
 	tableMaps := []maps.Map{}

internal/web/actions/default/db/dbnodeutils/utils.go

@@ -0,0 +1,34 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package dbnodeutils
+
+import (
+	"errors"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
+)
+
+// InitNode 初始化指标信息
+func InitNode(parent *actionutils.ParentAction, nodeId int64) (*pb.DBNode, error) {
+	client, err := rpc.SharedRPC()
+	if err != nil {
+		return nil, err
+	}
+
+	resp, err := client.DBNodeRPC().FindEnabledDBNode(parent.AdminContext(), &pb.FindEnabledDBNodeRequest{DbNodeId: nodeId})
+	if err != nil {
+		return nil, err
+	}
+	var node = resp.DbNode
+	if node == nil {
+		return nil, errors.New("not found db node with id '" + types.String(nodeId) + "'")
+	}
+	parent.Data["node"] = maps.Map{
+		"id":   node.Id,
+		"name": node.Name,
+	}
+	return node, nil
+}

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

@@ -42,9 +42,10 @@ func (this *IndexAction) RunGet(params struct{}) {
 			"port":     node.Port,
 			"database": node.Database,
 			"status": maps.Map{
-				"isOk":  node.Status.IsOk,
-				"error": node.Status.Error,
-				"size":  numberutils.FormatBytes(node.Status.Size),
+				"isOk":    node.Status.IsOk,
+				"error":   node.Status.Error,
+				"size":    numberutils.FormatBytes(node.Status.Size),
+				"version": node.Status.Version,
 			},
 		})
 	}

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

@@ -16,12 +16,14 @@ func init() {
 			Prefix("/db").
 			Get("", new(IndexAction)).
 			GetPost("/createPopup", new(CreatePopupAction)).
-			GetPost("/updatePopup", new(UpdatePopupAction)).
+			GetPost("/update", new(UpdateAction)).
 			Post("/delete", new(DeleteAction)).
-			GetPost("/cleanPopup", new(CleanPopupAction)).
+			GetPost("/clean", new(CleanAction)).
 			Post("/deleteTable", new(DeleteTableAction)).
 			Post("/truncateTable", new(TruncateTableAction)).
-
+			Get("/node", new(NodeAction)).
+			Get("/logs", new(LogsAction)).
+			Post("/status", new(StatusAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/db/logs.go

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

internal/web/actions/default/db/node.go

@@ -0,0 +1,41 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package db
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/db/dbnodeutils"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type NodeAction struct {
+	actionutils.ParentAction
+}
+
+func (this *NodeAction) Init() {
+	this.Nav("", "", "node")
+}
+
+func (this *NodeAction) RunGet(params struct {
+	NodeId int64
+}) {
+	node, err := dbnodeutils.InitNode(this.Parent(), params.NodeId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["node"] = maps.Map{
+		"id":          node.Id,
+		"isOn":        node.IsOn,
+		"name":        node.Name,
+		"database":    node.Database,
+		"host":        node.Host,
+		"port":        node.Port,
+		"username":    node.Username,
+		"password":    node.Password,
+		"description": node.Description,
+	}
+
+	this.Show()
+}

internal/web/actions/default/db/status.go

@@ -0,0 +1,38 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package db
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type StatusAction struct {
+	actionutils.ParentAction
+}
+
+func (this *StatusAction) RunPost(params struct {
+	NodeId int64
+}) {
+	statusResp, err := this.RPC().DBNodeRPC().CheckDBNodeStatus(this.AdminContext(), &pb.CheckDBNodeStatusRequest{DbNodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var status = statusResp.DbNodeStatus
+	if status != nil {
+		this.Data["status"] = maps.Map{
+			"isOk":    status.IsOk,
+			"error":   status.Error,
+			"size":    numberutils.FormatBytes(status.Size),
+			"version": status.Version,
+		}
+	} else {
+		this.Data["status"] = nil
+	}
+
+	this.Success()
+}

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

@@ -8,15 +8,15 @@ import (
 	"github.com/iwind/TeaGo/maps"
 )
 
-type UpdatePopupAction struct {
+type UpdateAction struct {
 	actionutils.ParentAction
 }
 
-func (this *UpdatePopupAction) Init() {
-	this.Nav("", "", "")
+func (this *UpdateAction) Init() {
+	this.Nav("", "", "update")
 }
 
-func (this *UpdatePopupAction) RunGet(params struct {
+func (this *UpdateAction) RunGet(params struct {
 	NodeId int64
 }) {
 	nodeResp, err := this.RPC().DBNodeRPC().FindEnabledDBNode(this.AdminContext(), &pb.FindEnabledDBNodeRequest{DbNodeId: params.NodeId})
@@ -46,7 +46,7 @@ func (this *UpdatePopupAction) RunGet(params struct {
 	this.Show()
 }
 
-func (this *UpdatePopupAction) RunPost(params struct {
+func (this *UpdateAction) RunPost(params struct {
 	NodeId int64
 
 	Name     string

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

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
 )
 
 type ClusterAction struct {
@@ -40,6 +41,7 @@ func (this *ClusterAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
+	var defaultRoute = dnsResp.DefaultRoute
 	domainName := ""
 	dnsMap := maps.Map{
 		"dnsName":          dnsResp.Name,
@@ -60,6 +62,12 @@ func (this *ClusterAction) RunGet(params struct {
 		dnsMap["providerTypeName"] = dnsResp.Provider.TypeName
 	}
 
+	if len(dnsResp.CnameRecords) > 0 {
+		dnsMap["cnameRecords"] = dnsResp.CnameRecords
+	} else {
+		dnsMap["cnameRecords"] = []string{}
+	}
+
 	this.Data["dnsInfo"] = dnsMap
 
 	// 节点DNS解析记录
@@ -106,6 +114,26 @@ func (this *ClusterAction) RunGet(params struct {
 				})
 			}
 		} else {
+			// 默认线路
+			var isResolved = false
+			if len(defaultRoute) > 0 {
+				recordType := "A"
+				if utils.IsIPv6(node.IpAddr) {
+					recordType = "AAAA"
+				}
+				checkResp, err := this.RPC().DNSDomainRPC().ExistDNSDomainRecord(this.AdminContext(), &pb.ExistDNSDomainRecordRequest{
+					DnsDomainId: cluster.DnsDomainId,
+					Name:        cluster.DnsName,
+					Type:        recordType,
+					Route:       defaultRoute,
+					Value:       node.IpAddr,
+				})
+				if err != nil {
+					this.ErrorPage(err)
+					return
+				}
+				isResolved = checkResp.IsOk
+			}
 			nodeMaps = append(nodeMaps, maps.Map{
 				"id":     node.Id,
 				"name":   node.Name,
@@ -115,7 +143,7 @@ func (this *ClusterAction) RunGet(params struct {
 					"code": "",
 				},
 				"clusterId":  node.NodeClusterId,
-				"isResolved": false,
+				"isResolved": isResolved,
 			})
 		}
 	}
@@ -182,5 +210,60 @@ func (this *ClusterAction) RunGet(params struct {
 	}
 	this.Data["issues"] = issueMaps
 
+	// 当前正在执行的任务
+	resp, err := this.RPC().DNSTaskRPC().FindAllDoingDNSTasks(this.AdminContext(), &pb.FindAllDoingDNSTasksRequest{
+		NodeClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	taskMaps := []maps.Map{}
+	for _, task := range resp.DnsTasks {
+		var clusterMap maps.Map = nil
+		var nodeMap maps.Map = nil
+		var serverMap maps.Map = nil
+		var domainMap maps.Map = nil
+
+		if task.NodeCluster != nil {
+			clusterMap = maps.Map{
+				"id":   task.NodeCluster.Id,
+				"name": task.NodeCluster.Name,
+			}
+		}
+		if task.Node != nil {
+			nodeMap = maps.Map{
+				"id":   task.Node.Id,
+				"name": task.Node.Name,
+			}
+		}
+		if task.Server != nil {
+			serverMap = maps.Map{
+				"id":   task.Server.Id,
+				"name": task.Server.Name,
+			}
+		}
+		if task.DnsDomain != nil {
+			domainMap = maps.Map{
+				"id":   task.DnsDomain.Id,
+				"name": task.DnsDomain.Name,
+			}
+		}
+
+		taskMaps = append(taskMaps, maps.Map{
+			"id":          task.Id,
+			"type":        task.Type,
+			"isDone":      task.IsDone,
+			"isOk":        task.IsOk,
+			"error":       task.Error,
+			"updatedTime": timeutil.FormatTime("Y-m-d H:i:s", task.UpdatedAt),
+			"cluster":     clusterMap,
+			"node":        nodeMap,
+			"server":      serverMap,
+			"domain":      domainMap,
+		})
+	}
+	this.Data["tasks"] = taskMaps
+
 	this.Show()
 }

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

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

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

@@ -34,6 +34,7 @@ func init() {
 			GetPost("/updatePopup", new(providers.UpdatePopupAction)).
 			Post("/delete", new(providers.DeleteAction)).
 			Get("/provider", new(providers.ProviderAction)).
+			Post("/syncDomains", new(providers.SyncDomainsAction)).
 			EndData().
 
 			// 域名
@@ -55,8 +56,8 @@ func init() {
 			Data("teaSubMenu", "issue").
 			GetPost("", new(issues.IndexAction)).
 			GetPost("/updateNodePopup", new(issues.UpdateNodePopupAction)).
+			Post("/syncDomain", new(issues.SyncDomainAction)).
 			EndData().
-
 			EndAll()
 	})
 }

internal/web/actions/default/dns/issues/syncDomain.go

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

internal/web/actions/default/dns/issues/updateNodePopup.go

@@ -85,10 +85,12 @@ func (this *UpdateNodePopupAction) RunPost(params struct {
 	defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId)
 
 	routes := []string{}
-	err := json.Unmarshal(params.DnsRoutesJSON, &routes)
-	if err != nil {
-		this.ErrorPage(err)
-		return
+	if len(params.DnsRoutesJSON) > 0 {
+		err := json.Unmarshal(params.DnsRoutesJSON, &routes)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
 	}
 
 	params.Must.
@@ -100,7 +102,7 @@ func (this *UpdateNodePopupAction) RunPost(params struct {
 	}
 
 	// 执行修改
-	_, err = this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{
+	_, err := this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{
 		NodeId:      params.NodeId,
 		IpAddr:      params.IpAddr,
 		DnsDomainId: params.DomainId,

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

@@ -15,9 +15,14 @@ func (this *IndexAction) Init() {
 	this.Nav("", "", "")
 }
 
-func (this *IndexAction) RunGet(params struct{}) {
+func (this *IndexAction) RunGet(params struct {
+	Keyword string
+}) {
+	this.Data["keyword"] = params.Keyword
+
 	countResp, err := this.RPC().DNSProviderRPC().CountAllEnabledDNSProviders(this.AdminContext(), &pb.CountAllEnabledDNSProvidersRequest{
 		AdminId: this.AdminId(),
+		Keyword: params.Keyword,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -29,6 +34,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 
 	providersResp, err := this.RPC().DNSProviderRPC().ListEnabledDNSProviders(this.AdminContext(), &pb.ListEnabledDNSProvidersRequest{
 		AdminId: this.AdminId(),
+		Keyword: params.Keyword,
 		Offset:  page.Offset,
 		Size:    page.Size,
 	})

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

@@ -82,6 +82,7 @@ func (this *ProviderAction) RunGet(params struct {
 			"id":                 domain.Id,
 			"name":               domain.Name,
 			"isOn":               domain.IsOn,
+			"isUp":               domain.IsUp,
 			"dataUpdatedTime":    dataUpdatedTime,
 			"countRoutes":        len(domain.Routes),
 			"countServerRecords": domain.CountServerRecords,

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

@@ -0,0 +1,25 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package providers
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type SyncDomainsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SyncDomainsAction) RunPost(params struct {
+	ProviderId int64
+}) {
+	resp, err := this.RPC().DNSDomainRPC().SyncDNSDomainsFromProvider(this.AdminContext(), &pb.SyncDNSDomainsFromProviderRequest{DnsProviderId: params.ProviderId})
+	if err != nil {
+		this.Fail("更新域名失败：" + err.Error())
+	}
+
+	this.Data["hasChanges"] = resp.HasChanges
+
+	this.Success()
+}

internal/web/actions/default/dns/updateClusterPopup.go

@@ -9,7 +9,7 @@ import (
 	"github.com/iwind/TeaGo/maps"
 )
 
-// 修改集群的DNS设置
+// UpdateClusterPopupAction 修改集群的DNS设置
 type UpdateClusterPopupAction struct {
 	actionutils.ParentAction
 }
@@ -46,6 +46,14 @@ func (this *UpdateClusterPopupAction) RunGet(params struct {
 		this.Data["providerId"] = 0
 	}
 
+	if len(dnsResp.CnameRecords) == 0 {
+		this.Data["cnameRecords"] = []string{}
+	} else {
+		this.Data["cnameRecords"] = dnsResp.CnameRecords
+	}
+
+	this.Data["ttl"] = dnsResp.Ttl
+
 	// 所有服务商
 	providerTypesResp, err := this.RPC().DNSProviderRPC().FindAllDNSProviderTypes(this.AdminContext(), &pb.FindAllDNSProviderTypesRequest{})
 	if err != nil {
@@ -70,6 +78,8 @@ func (this *UpdateClusterPopupAction) RunPost(params struct {
 	DomainId        int64
 	NodesAutoSync   bool
 	ServersAutoSync bool
+	CnameRecords    []string
+	Ttl             int32
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -103,6 +113,8 @@ func (this *UpdateClusterPopupAction) RunPost(params struct {
 		DnsDomainId:     params.DomainId,
 		NodesAutoSync:   params.NodesAutoSync,
 		ServersAutoSync: params.ServersAutoSync,
+		CnameRecords:    params.CnameRecords,
+		Ttl:             params.Ttl,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/nodes/ipAddresses/createPopup.go

@@ -1,7 +1,10 @@
 package ipAddresses
 
 import (
+	"encoding/json"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 	"net"
@@ -15,33 +18,46 @@ func (this *CreatePopupAction) Init() {
 	this.Nav("", "", "")
 }
 
-func (this *CreatePopupAction) RunGet(params struct{}) {
+func (this *CreatePopupAction) RunGet(params struct {
+	SupportThresholds bool
+}) {
+	this.Data["supportThresholds"] = params.SupportThresholds
+
 	this.Show()
 }
 
 func (this *CreatePopupAction) RunPost(params struct {
-	IP        string `alias:"ip"`
-	CanAccess bool
-	Name      string
+	IP             string `alias:"ip"`
+	CanAccess      bool
+	Name           string
+	IsUp           bool
+	ThresholdsJSON []byte
 
 	Must *actions.Must
 }) {
-	// TODO 严格校验IP地址
-
-	ip := net.ParseIP(params.IP)
-	if len(ip) == 0 {
-		this.Fail("请输入正确的IP")
-	}
-
 	params.Must.
 		Field("ip", params.IP).
 		Require("请输入IP地址")
 
+	ip := net.ParseIP(params.IP)
+	if len(ip) == 0 {
+		this.FailField("ip", "请输入正确的IP")
+	}
+
+	// 阈值设置
+	var thresholds = []*nodeconfigs.IPAddressThresholdConfig{}
+	if teaconst.IsPlus && len(params.ThresholdsJSON) > 0 {
+		_ = json.Unmarshal(params.ThresholdsJSON, &thresholds)
+	}
+
 	this.Data["ipAddress"] = maps.Map{
-		"name":      params.Name,
-		"canAccess": params.CanAccess,
-		"ip":        params.IP,
-		"id":        0,
+		"name":       params.Name,
+		"canAccess":  params.CanAccess,
+		"ip":         params.IP,
+		"id":         0,
+		"isOn":       true,
+		"isUp":       params.IsUp,
+		"thresholds": thresholds,
 	}
 	this.Success()
 }

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

@@ -18,22 +18,49 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 	for _, addr := range addresses {
 		addrId := addr.GetInt64("id")
 		if addrId > 0 {
+			var isOn = false
+			if !addr.Has("isOn") { // 兼容老版本
+				isOn = true
+			} else {
+				isOn = addr.GetBool("isOn")
+			}
+
 			_, err = parentAction.RPC().NodeIPAddressRPC().UpdateNodeIPAddress(parentAction.AdminContext(), &pb.UpdateNodeIPAddressRequest{
-				AddressId: addrId,
-				Ip:        addr.GetString("ip"),
-				Name:      addr.GetString("name"),
-				CanAccess: addr.GetBool("canAccess"),
+				NodeIPAddressId: addrId,
+				Ip:              addr.GetString("ip"),
+				Name:            addr.GetString("name"),
+				CanAccess:       addr.GetBool("canAccess"),
+				IsOn:            isOn,
+				IsUp:            addr.GetBool("isUp"),
 			})
 			if err != nil {
 				return err
 			}
 		} else {
-			_, err = parentAction.RPC().NodeIPAddressRPC().CreateNodeIPAddress(parentAction.AdminContext(), &pb.CreateNodeIPAddressRequest{
+			createResp, err := parentAction.RPC().NodeIPAddressRPC().CreateNodeIPAddress(parentAction.AdminContext(), &pb.CreateNodeIPAddressRequest{
 				NodeId:    nodeId,
 				Role:      role,
 				Name:      addr.GetString("name"),
 				Ip:        addr.GetString("ip"),
 				CanAccess: addr.GetBool("canAccess"),
+				IsUp:      addr.GetBool("isUp"),
+			})
+			if err != nil {
+				return err
+			}
+			addrId = createResp.NodeIPAddressId
+		}
+
+		// 保存阈值
+		var thresholds = addr.GetSlice("thresholds")
+		if len(thresholds) > 0 {
+			thresholdsJSON, err := json.Marshal(thresholds)
+			if err != nil {
+				return err
+			}
+			_, err = parentAction.RPC().NodeIPAddressThresholdRPC().UpdateAllNodeIPAddressThresholds(parentAction.AdminContext(), &pb.UpdateAllNodeIPAddressThresholdsRequest{
+				NodeIPAddressId:             addrId,
+				NodeIPAddressThresholdsJSON: thresholdsJSON,
 			})
 			if err != nil {
 				return err
@@ -42,3 +69,35 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 	}
 	return nil
 }
+
+// InitNodeIPAddressThresholds 初始化IP阈值
+func InitNodeIPAddressThresholds(parentAction *actionutils.ParentAction, addrId int64) ([]*nodeconfigs.IPAddressThresholdConfig, error) {
+	thresholdsResp, err := parentAction.RPC().NodeIPAddressThresholdRPC().FindAllEnabledNodeIPAddressThresholds(parentAction.AdminContext(), &pb.FindAllEnabledNodeIPAddressThresholdsRequest{NodeIPAddressId: addrId})
+	if err != nil {
+		return nil, err
+	}
+	var thresholds = []*nodeconfigs.IPAddressThresholdConfig{}
+	if len(thresholdsResp.NodeIPAddressThresholds) > 0 {
+		for _, pbThreshold := range thresholdsResp.NodeIPAddressThresholds {
+			var threshold = &nodeconfigs.IPAddressThresholdConfig{
+				Id:      pbThreshold.Id,
+				Items:   []*nodeconfigs.IPAddressThresholdItemConfig{},
+				Actions: []*nodeconfigs.IPAddressThresholdActionConfig{},
+			}
+			if len(pbThreshold.ItemsJSON) > 0 {
+				err = json.Unmarshal(pbThreshold.ItemsJSON, &threshold.Items)
+				if err != nil {
+					return nil, err
+				}
+			}
+			if len(pbThreshold.ActionsJSON) > 0 {
+				err = json.Unmarshal(pbThreshold.ActionsJSON, &threshold.Actions)
+				if err != nil {
+					return nil, err
+				}
+			}
+			thresholds = append(thresholds, threshold)
+		}
+	}
+	return thresholds, nil
+}

internal/web/actions/default/nodes/ipAddresses/updatePopup.go

@@ -1,7 +1,11 @@
 package ipAddresses
 
 import (
+	"encoding/json"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 	"net"
@@ -16,35 +20,61 @@ func (this *UpdatePopupAction) Init() {
 }
 
 func (this *UpdatePopupAction) RunGet(params struct {
-	AddressId int64
+	AddressId         int64
+	SupportThresholds bool
 }) {
+	this.Data["supportThresholds"] = params.SupportThresholds
+
 	this.Show()
 }
 
 func (this *UpdatePopupAction) RunPost(params struct {
-	AddressId int64
-	IP        string `alias:"ip"`
-	Name      string
-	CanAccess bool
+	AddressId      int64
+	IP             string `alias:"ip"`
+	Name           string
+	CanAccess      bool
+	IsOn           bool
+	IsUp           bool
+	ThresholdsJSON []byte
 
 	Must *actions.Must
 }) {
-	// TODO 严格校验IP地址
-
 	params.Must.
 		Field("ip", params.IP).
 		Require("请输入IP地址")
 
+	// 获取IP地址信息
+	var isUp = params.IsUp
+	if params.AddressId > 0 {
+		addressResp, err := this.RPC().NodeIPAddressRPC().FindEnabledNodeIPAddress(this.AdminContext(), &pb.FindEnabledNodeIPAddressRequest{NodeIPAddressId: params.AddressId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		var address = addressResp.NodeIPAddress
+		if address == nil {
+			this.Fail("找不到要修改的地址")
+		}
+	}
+
 	ip := net.ParseIP(params.IP)
 	if len(ip) == 0 {
 		this.Fail("请输入正确的IP")
 	}
 
+	var thresholds = []*nodeconfigs.IPAddressThresholdConfig{}
+	if teaconst.IsPlus && len(params.ThresholdsJSON) > 0 {
+		_ = json.Unmarshal(params.ThresholdsJSON, &thresholds)
+	}
+
 	this.Data["ipAddress"] = maps.Map{
-		"name":      params.Name,
-		"ip":        params.IP,
-		"id":        params.AddressId,
-		"canAccess": params.CanAccess,
+		"name":       params.Name,
+		"ip":         params.IP,
+		"id":         params.AddressId,
+		"canAccess":  params.CanAccess,
+		"isOn":       params.IsOn,
+		"isUp":       isUp,
+		"thresholds": thresholds,
 	}
 
 	this.Success()

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

@@ -120,6 +120,9 @@ func (this *IndexAction) RunGet(params struct {
 		}
 		if resp.IpRegionMap != nil {
 			for ip, region := range resp.IpRegionMap {
+				if len(region.Isp) > 0 {
+					region.Summary += " | " + region.Isp
+				}
 				regionMap[ip] = region.Summary
 			}
 		}

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

@@ -79,20 +79,21 @@ func (this *CreateNodeAction) RunPost(params struct {
 	nodeId := createResp.NsNodeId
 
 	// IP地址
-	for _, address := range ipAddresses {
-		addressId := address.GetInt64("id")
+	for _, addrMap := range ipAddresses {
+		addressId := addrMap.GetInt64("id")
 		if addressId > 0 {
 			_, err = this.RPC().NodeIPAddressRPC().UpdateNodeIPAddressNodeId(this.AdminContext(), &pb.UpdateNodeIPAddressNodeIdRequest{
-				AddressId: addressId,
-				NodeId:    nodeId,
+				NodeIPAddressId: 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"),
+				Name:      addrMap.GetString("name"),
+				Ip:        addrMap.GetString("ip"),
+				CanAccess: addrMap.GetBool("canAccess"),
+				IsUp:      addrMap.GetBool("isUp"),
 			})
 		}
 		if err != nil {

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

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

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

@@ -56,7 +56,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 
 	// IP地址
-	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
 		NodeId: params.NodeId,
 		Role:   nodeconfigs.NodeRoleDNS,
 	})
@@ -65,12 +65,14 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 	ipAddressMaps := []maps.Map{}
-	for _, addr := range ipAddressesResp.Addresses {
+	for _, addr := range ipAddressesResp.NodeIPAddresses {
 		ipAddressMaps = append(ipAddressMaps, maps.Map{
 			"id":        addr.Id,
 			"name":      addr.Name,
 			"ip":        addr.Ip,
 			"canAccess": addr.CanAccess,
+			"isOn":      addr.IsOn,
+			"isUp":      addr.IsUp,
 		})
 	}
 

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

@@ -46,7 +46,7 @@ func (this *UpdateAction) RunGet(params struct {
 	}
 
 	// IP地址
-	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
 		NodeId: params.NodeId,
 		Role:   nodeconfigs.NodeRoleDNS,
 	})
@@ -55,12 +55,14 @@ func (this *UpdateAction) RunGet(params struct {
 		return
 	}
 	ipAddressMaps := []maps.Map{}
-	for _, addr := range ipAddressesResp.Addresses {
+	for _, addr := range ipAddressesResp.NodeIPAddresses {
 		ipAddressMaps = append(ipAddressMaps, maps.Map{
 			"id":        addr.Id,
 			"name":      addr.Name,
 			"ip":        addr.Ip,
 			"canAccess": addr.CanAccess,
+			"isOn":      addr.IsOn,
+			"isUp":      addr.IsUp,
 		})
 	}
 
@@ -211,7 +213,7 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	// 禁用老的IP地址
-	_, err = this.RPC().NodeIPAddressRPC().DisableAllIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllIPAddressesWithNodeIdRequest{
+	_, err = this.RPC().NodeIPAddressRPC().DisableAllNodeIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllNodeIPAddressesWithNodeIdRequest{
 		NodeId: params.NodeId,
 		Role:   nodeconfigs.NodeRoleDNS,
 	})

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

@@ -1,6 +1,6 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package cluster
+package accessLog
 
 import (
 	"encoding/json"

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

@@ -1,4 +1,4 @@
-package cluster
+package accessLog
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"

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

@@ -0,0 +1,68 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package recursion
+
+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("recursion")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	this.Data["clusterId"] = params.ClusterId
+
+	resp, err := this.RPC().NSClusterRPC().FindNSClusterRecursionConfig(this.AdminContext(), &pb.FindNSClusterRecursionConfigRequest{NsClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var config = &dnsconfigs.RecursionConfig{}
+	if len(resp.RecursionJSON) > 0 {
+		err = json.Unmarshal(resp.RecursionJSON, config)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	} else {
+		config.UseLocalHosts = true
+	}
+	this.Data["config"] = config
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	ClusterId     int64
+	RecursionJSON []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改DNS集群 %d 的递归DNS设置", params.ClusterId)
+
+	// TODO 校验域名
+
+	_, err := this.RPC().NSClusterRPC().UpdateNSClusterRecursionConfig(this.AdminContext(), &pb.UpdateNSClusterRecursionConfigRequest{
+		NsClusterId:   params.ClusterId,
+		RecursionJSON: params.RecursionJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Success()
+}

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

@@ -0,0 +1,21 @@
+package recursion
+
+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/recursion").
+			GetPost("", new(IndexAction)).
+			EndAll()
+	})
+}

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

@@ -78,15 +78,21 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext
 // 设置菜单
 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
+	return []maps.Map{
+		{
+			"name":     "基础设置",
+			"url":      "/ns/clusters/cluster/settings?clusterId=" + clusterId,
+			"isActive": selectedItem == "basic",
+		},
+		{
+			"name":     "访问日志",
+			"url":      "/ns/clusters/cluster/settings/accessLog?clusterId=" + clusterId,
+			"isActive": selectedItem == "accessLog",
+		},
+		{
+			"name":     "递归DNS",
+			"url":      "/ns/clusters/cluster/settings/recursion?clusterId=" + clusterId,
+			"isActive": selectedItem == "recursion",
+		},
+	}
 }

internal/web/actions/default/ns/domains/index.go

@@ -12,7 +12,7 @@ type IndexAction struct {
 }
 
 func (this *IndexAction) Init() {
-	this.FirstMenu("domain")
+	this.Nav("", "", "index")
 }
 
 func (this *IndexAction) RunGet(params struct {

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

@@ -1,127 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package ns
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-	"github.com/iwind/TeaGo/types"
-	timeutil "github.com/iwind/TeaGo/utils/time"
-)
-
-type IndexAction struct {
-	actionutils.ParentAction
-}
-
-func (this *IndexAction) Init() {
-	this.Nav("", "", "dns")
-}
-
-func (this *IndexAction) RunGet(params struct{}) {
-	resp, err := this.RPC().NSRPC().ComposeNSBoard(this.AdminContext(), &pb.ComposeNSBoardRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	this.Data["board"] = maps.Map{
-		"countDomains":      resp.CountNSDomains,
-		"countRecords":      resp.CountNSRecords,
-		"countClusters":     resp.CountNSClusters,
-		"countNodes":        resp.CountNSNodes,
-		"countOfflineNodes": resp.CountOfflineNSNodes,
-	}
-
-	// 流量排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.HourlyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"day":           stat.Hour[4:6] + "月" + stat.Hour[6:8] + "日",
-				"hour":          stat.Hour[8:],
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["hourlyStats"] = statMaps
-	}
-
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.DailyTrafficStats {
-			statMaps = append(statMaps, maps.Map{
-				"day":           stat.Day[4:6] + "月" + stat.Day[6:] + "日",
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["dailyStats"] = statMaps
-	}
-
-	// 域名排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopNSDomainStats {
-			statMaps = append(statMaps, maps.Map{
-				"domainId":      stat.NsDomainId,
-				"domainName":    stat.NsDomainName,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topDomainStats"] = statMaps
-	}
-
-	// 节点排行
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.TopNSNodeStats {
-			statMaps = append(statMaps, maps.Map{
-				"clusterId":     stat.NsClusterId,
-				"nodeId":        stat.NsNodeId,
-				"nodeName":      stat.NsNodeName,
-				"countRequests": stat.CountRequests,
-				"bytes":         stat.Bytes,
-			})
-		}
-		this.Data["topNodeStats"] = statMaps
-	}
-
-	// CPU
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.CpuNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["cpuValues"] = statMaps
-	}
-
-	// Memory
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.MemoryNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["memoryValues"] = statMaps
-	}
-
-	// Load
-	{
-		var statMaps = []maps.Map{}
-		for _, stat := range resp.LoadNodeValues {
-			statMaps = append(statMaps, maps.Map{
-				"time":  timeutil.FormatTime("H:i", stat.CreatedAt),
-				"value": types.Float32(string(stat.ValueJSON)),
-			})
-		}
-		this.Data["loadValues"] = statMaps
-	}
-
-	this.Show()
-}

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

@@ -1,52 +0,0 @@
-package ns
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/domains"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/domains/keys"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/domains/records"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/ns/settings"
-	"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").
-			Prefix("/ns").
-			Get("", new(IndexAction)).
-
-			// 域名相关
-			Prefix("/ns/domains").
-			Data("teaSubMenu", "domain").
-			Get("", new(domains.IndexAction)).
-			GetPost("/create", new(domains.CreateAction)).
-			Post("/delete", new(domains.DeleteAction)).
-			Get("/domain", new(domains.DomainAction)).
-			GetPost("/update", new(domains.UpdateAction)).
-			GetPost("/tsig", new(domains.TsigAction)).
-
-			// 域名密钥
-			Prefix("/ns/domains/keys").
-			Data("teaSubMenu", "domain").
-			Get("", new(keys.IndexAction)).
-			GetPost("/createPopup", new(keys.CreatePopupAction)).
-			GetPost("/updatePopup", new(keys.UpdatePopupAction)).
-			Post("/delete", new(keys.DeleteAction)).
-			Post("/generateSecret", new(keys.GenerateSecretAction)).
-
-			// 记录相关
-			Prefix("/ns/domains/records").
-			Get("", new(records.IndexAction)).
-			GetPost("/createPopup", new(records.CreatePopupAction)).
-			GetPost("/updatePopup", new(records.UpdatePopupAction)).
-			Post("/delete", new(records.DeleteAction)).
-
-			// 设置
-			Prefix("/ns/settings").
-			Get("", new(settings.IndexAction)).
-			EndAll()
-	})
-}

internal/web/actions/default/ns/test/nodeOptions.go

@@ -28,7 +28,7 @@ func (this *NodeOptionsAction) RunPost(params struct {
 			continue
 		}
 
-		addressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+		addressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
 			NodeId: node.Id,
 			Role:   nodeconfigs.NodeRoleDNS,
 		})
@@ -36,7 +36,7 @@ func (this *NodeOptionsAction) RunPost(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		var addresses = addressesResp.Addresses
+		var addresses = addressesResp.NodeIPAddresses
 		if len(addresses) == 0 {
 			continue
 		}

internal/web/actions/default/servers/addPortPopup.go

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
 	"regexp"
 	"strings"
 )
@@ -18,9 +19,10 @@ func (this *AddPortPopupAction) Init() {
 }
 
 func (this *AddPortPopupAction) RunGet(params struct {
-	ServerType string
-	Protocol   string
-	From       string
+	ServerType   string
+	Protocol     string
+	From         string
+	SupportRange bool
 }) {
 	this.Data["from"] = params.From
 
@@ -36,10 +38,14 @@ func (this *AddPortPopupAction) RunGet(params struct {
 	}
 	this.Data["protocols"] = protocols
 
+	this.Data["supportRange"] = params.SupportRange
+
 	this.Show()
 }
 
 func (this *AddPortPopupAction) RunPost(params struct {
+	SupportRange bool
+
 	Protocol string
 	Address  string
 
@@ -50,26 +56,69 @@ func (this *AddPortPopupAction) RunPost(params struct {
 		"protocol":  params.Protocol,
 		"host":      "",
 		"portRange": "",
+		"minPort":   0,
+		"maxPort":   0,
 	}
 
-	// TODO 判断端口不能小于1
-	// TODO 判断端口号不能大于65535
-
-	digitRegexp := regexp.MustCompile(`^\d+$`)
-	if digitRegexp.MatchString(params.Address) {
-		addr["portRange"] = params.Address
-	} else if strings.Contains(params.Address, ":") {
+	var portRegexp = regexp.MustCompile(`^\d+$`)
+	if portRegexp.MatchString(params.Address) { // 单个端口
+		addr["portRange"] = this.checkPort(params.Address)
+	} else if params.SupportRange && regexp.MustCompile(`^\d+\s*-\s*\d+$`).MatchString(params.Address) { // Port1-Port2
+		addr["portRange"], addr["minPort"], addr["maxPort"] = this.checkPortRange(params.Address)
+	} else if strings.Contains(params.Address, ":") { // IP:Port
 		index := strings.LastIndex(params.Address, ":")
 		addr["host"] = strings.TrimSpace(params.Address[:index])
 		port := strings.TrimSpace(params.Address[index+1:])
-		if !digitRegexp.MatchString(port) {
-			this.Fail("端口只能是一个数字")
+		if portRegexp.MatchString(port) {
+			addr["portRange"] = this.checkPort(port)
+		} else if params.SupportRange && regexp.MustCompile(`^\d+\s*-\s*\d+$`).MatchString(port) { // Port1-Port2
+			addr["portRange"], addr["minPort"], addr["maxPort"] = this.checkPortRange(port)
+		} else {
+			this.FailField("address", "请输入正确的端口或者网络地址")
 		}
-		addr["portRange"] = port
 	} else {
-		this.Fail("请输入正确的端口或者网络地址")
+		this.FailField("address", "请输入正确的端口或者网络地址")
 	}
 
 	this.Data["address"] = addr
 	this.Success()
 }
+
+func (this *AddPortPopupAction) checkPort(port string) (portRange string) {
+	var intPort = types.Int(port)
+	if intPort < 1 {
+		this.FailField("address", "端口号不能小于1")
+	}
+	if intPort > 65535 {
+		this.FailField("address", "端口号不能大于65535")
+	}
+	return port
+}
+
+func (this *AddPortPopupAction) checkPortRange(port string) (portRange string, minPort int, maxPort int) {
+	var pieces = strings.Split(port, "-")
+	var piece1 = strings.TrimSpace(pieces[0])
+	var piece2 = strings.TrimSpace(pieces[1])
+	var port1 = types.Int(piece1)
+	var port2 = types.Int(piece2)
+
+	if port1 < 1 {
+		this.FailField("address", "端口号不能小于1")
+	}
+	if port1 > 65535 {
+		this.FailField("address", "端口号不能大于65535")
+	}
+
+	if port2 < 1 {
+		this.FailField("address", "端口号不能小于1")
+	}
+	if port2 > 65535 {
+		this.FailField("address", "端口号不能大于65535")
+	}
+
+	if port1 > port2 {
+		port1, port2 = port2, port1
+	}
+
+	return types.String(port1) + "-" + types.String(port2), port1, port2
+}

internal/web/actions/default/servers/certs/acme/accounts/createPopup.go

@@ -0,0 +1,100 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package accounts
+
+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 CreatePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *CreatePopupAction) RunGet(params struct {
+	ProviderCode string
+}) {
+	this.Data["providerCode"] = params.ProviderCode
+
+	// 服务商列表
+	providersResp, err := this.RPC().ACMEProviderRPC().FindAllACMEProviders(this.AdminContext(), &pb.FindAllACMEProvidersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var providerMaps = []maps.Map{}
+	for _, provider := range providersResp.AcmeProviders {
+		providerMaps = append(providerMaps, maps.Map{
+			"name":           provider.Name,
+			"code":           provider.Code,
+			"description":    provider.Description,
+			"requireEAB":     provider.RequireEAB,
+			"eabDescription": provider.EabDescription,
+		})
+	}
+
+	this.Data["providers"] = providerMaps
+
+	this.Show()
+}
+
+func (this *CreatePopupAction) RunPost(params struct {
+	Name         string
+	ProviderCode string
+	EabKid       string
+	EabKey       string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	var accountId int64
+	defer func() {
+		this.CreateLogInfo("创建ACME服务商账号 %d", accountId)
+	}()
+
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入账号名称").
+		Field("providerCode", params.ProviderCode).
+		Require("请选择服务商")
+
+	providerResp, err := this.RPC().ACMEProviderRPC().FindACMEProviderWithCode(this.AdminContext(), &pb.FindACMEProviderWithCodeRequest{AcmeProviderCode: params.ProviderCode})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var provider = providerResp.AcmeProvider
+	if provider == nil {
+		this.Fail("请选择服务商")
+	}
+
+	if provider.RequireEAB {
+		params.Must.
+			Field("eabKid", params.EabKid).
+			Require("请输入EAB Kid").
+			Field("eabKey", params.EabKey).
+			Require("请输入EAB HMAC Key")
+	}
+
+	createResp, err := this.RPC().ACMEProviderAccountRPC().CreateACMEProviderAccount(this.AdminContext(), &pb.CreateACMEProviderAccountRequest{
+		Name:         params.Name,
+		ProviderCode: params.ProviderCode,
+		EabKid:       params.EabKid,
+		EabKey:       params.EabKey,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	accountId = createResp.AcmeProviderAccountId
+
+	this.Success()
+}

internal/web/actions/default/servers/certs/acme/accounts/delete.go

@@ -0,0 +1,26 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package accounts
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type DeleteAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteAction) RunPost(params struct {
+	AccountId int64
+}) {
+	defer this.CreateLogInfo("删除ACME服务商账号 %d", params.AccountId)
+
+	_, err := this.RPC().ACMEProviderAccountRPC().DeleteACMEProviderAccount(this.AdminContext(), &pb.DeleteACMEProviderAccountRequest{AcmeProviderAccountId: params.AccountId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/certs/acme/accounts/index.go

@@ -0,0 +1,61 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package accounts
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "", "account")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+	countResp, err := this.RPC().ACMEProviderAccountRPC().CountAllEnabledACMEProviderAccounts(this.AdminContext(), &pb.CountAllEnabledACMEProviderAccountsRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var count = countResp.Count
+	var page = this.NewPage(count)
+	this.Data["page"] = page.AsHTML()
+
+	accountsResp, err := this.RPC().ACMEProviderAccountRPC().ListEnabledACMEProviderAccounts(this.AdminContext(), &pb.ListEnabledACMEProviderAccountsRequest{
+		Offset: page.Offset,
+		Size:   page.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var accountMaps = []maps.Map{}
+	for _, account := range accountsResp.AcmeProviderAccounts {
+		var providerMap maps.Map
+		if account.AcmeProvider != nil {
+			providerMap = maps.Map{
+				"name":       account.AcmeProvider.Name,
+				"code":       account.AcmeProvider.Code,
+				"requireEAB": account.AcmeProvider.RequireEAB,
+			}
+		}
+
+		accountMaps = append(accountMaps, maps.Map{
+			"id":       account.Id,
+			"isOn":     account.IsOn,
+			"name":     account.Name,
+			"eabKid":   account.EabKid,
+			"eabKey":   account.EabKey,
+			"provider": providerMap,
+		})
+	}
+	this.Data["accounts"] = accountMaps
+
+	this.Show()
+}

internal/web/actions/default/servers/certs/acme/accounts/updatePopup.go

@@ -0,0 +1,108 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package accounts
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type UpdatePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UpdatePopupAction) RunGet(params struct {
+	AccountId int64
+}) {
+	// 账号信息
+	accountResp, err := this.RPC().ACMEProviderAccountRPC().FindEnabledACMEProviderAccount(this.AdminContext(), &pb.FindEnabledACMEProviderAccountRequest{AcmeProviderAccountId: params.AccountId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var account = accountResp.AcmeProviderAccount
+	if account == nil {
+		this.NotFound("ACMEProviderAccount", params.AccountId)
+		return
+	}
+
+	var providerMap maps.Map
+	if account.AcmeProvider != nil {
+		providerMap = maps.Map{
+			"name":           account.AcmeProvider.Name,
+			"code":           account.AcmeProvider.Code,
+			"description":    account.AcmeProvider.Description,
+			"eabDescription": account.AcmeProvider.EabDescription,
+			"requireEAB":     account.AcmeProvider.RequireEAB,
+		}
+	}
+
+	this.Data["account"] = maps.Map{
+		"id":           account.Id,
+		"name":         account.Name,
+		"isOn":         account.IsOn,
+		"providerCode": account.ProviderCode,
+		"eabKid":       account.EabKid,
+		"eabKey":       account.EabKey,
+		"provider":     providerMap,
+	}
+
+	this.Show()
+}
+
+func (this *UpdatePopupAction) RunPost(params struct {
+	AccountId    int64
+	Name         string
+	ProviderCode string
+	EabKid       string
+	EabKey       string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改ACME服务商账号 %d", params.AccountId)
+
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入账号名称").
+		Field("providerCode", params.ProviderCode).
+		Require("请选择服务商")
+
+	providerResp, err := this.RPC().ACMEProviderRPC().FindACMEProviderWithCode(this.AdminContext(), &pb.FindACMEProviderWithCodeRequest{AcmeProviderCode: params.ProviderCode})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var provider = providerResp.AcmeProvider
+	if provider == nil {
+		this.Fail("请选择服务商")
+	}
+
+	if provider.RequireEAB {
+		params.Must.
+			Field("eabKid", params.EabKid).
+			Require("请输入EAB Kid").
+			Field("eabKey", params.EabKey).
+			Require("请输入EAB HMAC Key")
+	}
+
+	_, err = this.RPC().ACMEProviderAccountRPC().UpdateACMEProviderAccount(this.AdminContext(), &pb.UpdateACMEProviderAccountRequest{
+		AcmeProviderAccountId: params.AccountId,
+		Name:                  params.Name,
+		EabKid:                params.EabKid,
+		EabKey:                params.EabKey,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/certs/acme/create.go

@@ -35,15 +35,31 @@ func (this *CreateAction) RunGet(params struct{}) {
 		}
 
 		userMaps = append(userMaps, maps.Map{
-			"id":          user.Id,
-			"description": description,
-			"email":       user.Email,
+			"id":           user.Id,
+			"description":  description,
+			"email":        user.Email,
+			"providerCode": user.AcmeProviderCode,
 		})
 	}
 	this.Data["users"] = userMaps
 
+	// 证书服务商
+	providersResp, err := this.RPC().ACMEProviderRPC().FindAllACMEProviders(this.AdminContext(), &pb.FindAllACMEProvidersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var providerMaps = []maps.Map{}
+	for _, provider := range providersResp.AcmeProviders {
+		providerMaps = append(providerMaps, maps.Map{
+			"name": provider.Name,
+			"code": provider.Code,
+		})
+	}
+	this.Data["providers"] = providerMaps
+
 	// 域名解析服务商
-	providersResp, err := this.RPC().DNSProviderRPC().FindAllEnabledDNSProviders(this.AdminContext(), &pb.FindAllEnabledDNSProvidersRequest{
+	dnsProvidersResp, err := this.RPC().DNSProviderRPC().FindAllEnabledDNSProviders(this.AdminContext(), &pb.FindAllEnabledDNSProvidersRequest{
 		AdminId: this.AdminId(),
 		UserId:  0,
 	})
@@ -51,15 +67,15 @@ func (this *CreateAction) RunGet(params struct{}) {
 		this.ErrorPage(err)
 		return
 	}
-	providerMaps := []maps.Map{}
-	for _, provider := range providersResp.DnsProviders {
-		providerMaps = append(providerMaps, maps.Map{
+	dnsProviderMaps := []maps.Map{}
+	for _, provider := range dnsProvidersResp.DnsProviders {
+		dnsProviderMaps = append(dnsProviderMaps, maps.Map{
 			"id":       provider.Id,
 			"name":     provider.Name,
 			"typeName": provider.TypeName,
 		})
 	}
-	this.Data["providers"] = providerMaps
+	this.Data["dnsProviders"] = dnsProviderMaps
 
 	this.Show()
 }

internal/web/actions/default/servers/certs/acme/index.go

@@ -136,6 +136,26 @@ func (this *IndexAction) RunGet(params struct {
 		if task.AcmeUser == nil {
 			continue
 		}
+
+		// 服务商
+		var providerMap maps.Map
+		if task.AcmeUser.AcmeProvider != nil {
+			providerMap = maps.Map{
+				"name": task.AcmeUser.AcmeProvider.Name,
+				"code": task.AcmeUser.AcmeProvider.Code,
+			}
+		}
+
+		// 账号
+		var accountMap maps.Map
+		if task.AcmeUser.AcmeProviderAccount != nil {
+			accountMap = maps.Map{
+				"id":   task.AcmeUser.AcmeProviderAccount.Id,
+				"name": task.AcmeUser.AcmeProviderAccount.Name,
+			}
+		}
+
+		// DNS服务商
 		dnsProviderMap := maps.Map{}
 		if task.AuthType == "dns" && task.DnsProvider != nil {
 			dnsProviderMap = maps.Map{
@@ -170,8 +190,10 @@ func (this *IndexAction) RunGet(params struct {
 			"id":       task.Id,
 			"authType": task.AuthType,
 			"acmeUser": maps.Map{
-				"id":    task.AcmeUser.Id,
-				"email": task.AcmeUser.Email,
+				"id":       task.AcmeUser.Id,
+				"email":    task.AcmeUser.Email,
+				"provider": providerMap,
+				"account":  accountMap,
 			},
 			"dnsProvider": dnsProviderMap,
 			"dnsDomain":   task.DnsDomain,

internal/web/actions/default/servers/certs/acme/users/accountsWithCode.go

@@ -0,0 +1,33 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package users
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type AccountsWithCodeAction struct {
+	actionutils.ParentAction
+}
+
+func (this *AccountsWithCodeAction) RunPost(params struct {
+	Code string
+}) {
+	accountsResp, err := this.RPC().ACMEProviderAccountRPC().FindAllACMEProviderAccountsWithProviderCode(this.AdminContext(), &pb.FindAllACMEProviderAccountsWithProviderCodeRequest{AcmeProviderCode: params.Code})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var accountMaps = []maps.Map{}
+	for _, account := range accountsResp.AcmeProviderAccounts {
+		accountMaps = append(accountMaps, maps.Map{
+			"id":   account.Id,
+			"name": account.Name,
+		})
+	}
+	this.Data["accounts"] = accountMaps
+
+	this.Success()
+}

internal/web/actions/default/servers/certs/acme/users/createPopup.go

@@ -16,12 +16,30 @@ func (this *CreatePopupAction) Init() {
 }
 
 func (this *CreatePopupAction) RunGet(params struct{}) {
+	// 服务商
+	providersResp, err := this.RPC().ACMEProviderRPC().FindAllACMEProviders(this.AdminContext(), &pb.FindAllACMEProvidersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var providerMaps = []maps.Map{}
+	for _, provider := range providersResp.AcmeProviders {
+		providerMaps = append(providerMaps, maps.Map{
+			"code":       provider.Code,
+			"name":       provider.Name,
+			"requireEAB": provider.RequireEAB,
+		})
+	}
+	this.Data["providers"] = providerMaps
+
 	this.Show()
 }
 
 func (this *CreatePopupAction) RunPost(params struct {
-	Email       string
-	Description string
+	Email        string
+	ProviderCode string
+	AccountId    int64
+	Description  string
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -29,11 +47,44 @@ func (this *CreatePopupAction) RunPost(params struct {
 	params.Must.
 		Field("email", params.Email).
 		Require("请输入邮箱").
-		Email("请输入正确的邮箱格式")
+		Email("请输入正确的邮箱格式").
+		Field("providerCode", params.ProviderCode).
+		Require("请选择所属服务商")
+
+	providerResp, err := this.RPC().ACMEProviderRPC().FindACMEProviderWithCode(this.AdminContext(), &pb.FindACMEProviderWithCodeRequest{
+		AcmeProviderCode: params.ProviderCode,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if providerResp.AcmeProvider == nil {
+		this.Fail("找不到要选择的证书")
+	}
+	if providerResp.AcmeProvider.RequireEAB {
+		if params.AccountId <= 0 {
+			this.Fail("此服务商要求必须选择或创建服务商账号")
+		}
+
+		// 同一个账号只能有一个用户
+		countResp, err := this.RPC().ACMEUserRPC().
+			CountACMEUsers(this.AdminContext(), &pb.CountAcmeUsersRequest{
+				AcmeProviderAccountId: params.AccountId,
+			})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if countResp.Count > 0 {
+			this.Fail("此服务商账号已被别的用户使用，请换成别的账号")
+		}
+	}
 
 	createResp, err := this.RPC().ACMEUserRPC().CreateACMEUser(this.AdminContext(), &pb.CreateACMEUserRequest{
-		Email:       params.Email,
-		Description: params.Description,
+		Email:                 params.Email,
+		Description:           params.Description,
+		AcmeProviderCode:      params.ProviderCode,
+		AcmeProviderAccountId: params.AccountId,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -42,9 +93,10 @@ func (this *CreatePopupAction) RunPost(params struct {
 
 	// 返回数据
 	this.Data["acmeUser"] = maps.Map{
-		"id":          createResp.AcmeUserId,
-		"description": params.Description,
-		"email":       params.Email,
+		"id":           createResp.AcmeUserId,
+		"description":  params.Description,
+		"email":        params.Email,
+		"providerCode": params.ProviderCode,
 	}
 
 	// 日志

internal/web/actions/default/servers/certs/acme/users/index.go

@@ -40,11 +40,31 @@ func (this *IndexAction) RunGet(params struct{}) {
 	}
 	userMaps := []maps.Map{}
 	for _, user := range usersResp.AcmeUsers {
+		// 服务商
+		var providerMap maps.Map
+		if user.AcmeProvider != nil {
+			providerMap = maps.Map{
+				"name": user.AcmeProvider.Name,
+				"code": user.AcmeProvider.Code,
+			}
+		}
+
+		// 账号
+		var accountMap maps.Map
+		if user.AcmeProviderAccount != nil {
+			accountMap = maps.Map{
+				"id":   user.AcmeProviderAccount.Id,
+				"name": user.AcmeProviderAccount.Name,
+			}
+		}
+
 		userMaps = append(userMaps, maps.Map{
 			"id":          user.Id,
 			"email":       user.Email,
 			"description": user.Description,
 			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", user.CreatedAt),
+			"provider":    providerMap,
+			"account":     accountMap,
 		})
 	}
 	this.Data["users"] = userMaps

internal/web/actions/default/servers/certs/acme/users/updatePopup.go

@@ -29,10 +29,30 @@ func (this *UpdatePopupAction) RunGet(params struct {
 		return
 	}
 
+	// 服务商
+	var providerMap maps.Map
+	if user.AcmeProvider != nil {
+		providerMap = maps.Map{
+			"name": user.AcmeProvider.Name,
+			"code": user.AcmeProvider.Code,
+		}
+	}
+
+	// 账号
+	var accountMap maps.Map
+	if user.AcmeProviderAccount != nil {
+		accountMap = maps.Map{
+			"id":   user.AcmeProviderAccount.Id,
+			"name": user.AcmeProviderAccount.Name,
+		}
+	}
+
 	this.Data["user"] = maps.Map{
 		"id":          user.Id,
 		"email":       user.Email,
 		"description": user.Description,
+		"provider":    providerMap,
+		"account":     accountMap,
 	}
 
 	this.Show()

internal/web/actions/default/servers/certs/init.go

@@ -3,6 +3,7 @@ package certs
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/certs/acme"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/certs/acme/accounts"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/certs/acme/users"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
@@ -13,9 +14,7 @@ func init() {
 		server.
 			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeServer)).
 			Helper(NewHelper()).
-
 			Data("teaSubMenu", "cert").
-
 			Prefix("/servers/certs").
 			Data("leftMenuItem", "cert").
 			Get("", new(IndexAction)).
@@ -31,7 +30,7 @@ func init() {
 			Get("/selectPopup", new(SelectPopupAction)).
 			Get("/datajs", new(DatajsAction)).
 
-			// ACME
+			// ACME任务
 			Prefix("/servers/certs/acme").
 			Data("leftMenuItem", "acme").
 			Get("", new(acme.IndexAction)).
@@ -40,13 +39,23 @@ func init() {
 			GetPost("/updateTaskPopup", new(acme.UpdateTaskPopupAction)).
 			Post("/deleteTask", new(acme.DeleteTaskAction)).
 
+			// ACME用户
 			Prefix("/servers/certs/acme/users").
 			Get("", new(users.IndexAction)).
 			GetPost("/createPopup", new(users.CreatePopupAction)).
 			GetPost("/updatePopup", new(users.UpdatePopupAction)).
 			Post("/delete", new(users.DeleteAction)).
 			GetPost("/selectPopup", new(users.SelectPopupAction)).
+			Post("/accountsWithCode", new(users.AccountsWithCodeAction)).
 
+			// ACME账号
+			Prefix("/servers/certs/acme/accounts").
+			Get("", new(accounts.IndexAction)).
+			GetPost("/createPopup", new(accounts.CreatePopupAction)).
+			GetPost("/updatePopup", new(accounts.UpdatePopupAction)).
+			Post("/delete", new(accounts.DeleteAction)).
+
+			//
 			EndAll()
 	})
 }

internal/web/actions/default/servers/certs/updatePopup.go

@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
 	"github.com/iwind/TeaGo/actions"
+	timeutil "github.com/iwind/TeaGo/utils/time"
 )
 
 type UpdatePopupAction struct {
@@ -45,6 +46,8 @@ func (this *UpdatePopupAction) RunGet(params struct {
 func (this *UpdatePopupAction) RunPost(params struct {
 	CertId int64
 
+	TextMode bool
+
 	Name        string
 	IsCA        bool
 	Description string
@@ -53,6 +56,9 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	CertFile *actions.File
 	KeyFile  *actions.File
 
+	CertText string
+	KeyText  string
+
 	Must *actions.Must
 }) {
 	// 创建日志
@@ -82,18 +88,31 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入证书说明")
 
-	if params.CertFile != nil {
-		certConfig.CertData, err = params.CertFile.Read()
-		if err != nil {
-			this.Fail("读取证书文件内容错误，请重新上传")
+	if params.TextMode {
+		if len(params.CertText) > 0 {
+			certConfig.CertData = []byte(params.CertText)
 		}
-	}
 
-	if !params.IsCA {
-		if params.KeyFile != nil {
-			certConfig.KeyData, err = params.KeyFile.Read()
+		if !params.IsCA {
+			if len(params.KeyText) > 0 {
+				certConfig.KeyData = []byte(params.KeyText)
+			}
+		}
+	} else {
+
+		if params.CertFile != nil {
+			certConfig.CertData, err = params.CertFile.Read()
 			if err != nil {
-				this.Fail("读取密钥文件内容错误，请重新上传")
+				this.FailField("certFile", "读取证书文件内容错误，请重新上传")
+			}
+		}
+
+		if !params.IsCA {
+			if params.KeyFile != nil {
+				certConfig.KeyData, err = params.KeyFile.Read()
+				if err != nil {
+					this.FailField("keyFile", "读取私钥文件内容错误，请重新上传")
+				}
 			}
 		}
 	}
@@ -109,6 +128,10 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		}
 	}
 
+	if len(timeutil.Format("Y", certConfig.TimeEnd())) != 4 {
+		this.Fail("证书格式错误：无法读取到证书有效期")
+	}
+
 	// 保存
 	_, err = this.RPC().SSLCertRPC().UpdateSSLCert(this.AdminContext(), &pb.UpdateSSLCertRequest{
 		SslCertId:   params.CertId,

internal/web/actions/default/servers/certs/uploadPopup.go

@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
 	"github.com/iwind/TeaGo/actions"
+	timeutil "github.com/iwind/TeaGo/utils/time"
 )
 
 type UploadPopupAction struct {
@@ -22,6 +23,7 @@ func (this *UploadPopupAction) RunGet(params struct{}) {
 }
 
 func (this *UploadPopupAction) RunPost(params struct {
+	TextMode    bool
 	Name        string
 	IsCA        bool
 	Description string
@@ -30,6 +32,9 @@ func (this *UploadPopupAction) RunPost(params struct {
 	CertFile *actions.File
 	KeyFile  *actions.File
 
+	CertText string
+	KeyText  string
+
 	Must *actions.Must
 }) {
 	params.Must.
@@ -39,22 +44,37 @@ func (this *UploadPopupAction) RunPost(params struct {
 	certData := []byte{}
 	keyData := []byte{}
 
-	if params.CertFile == nil {
-		this.Fail("请选择要上传的证书文件")
-	}
-	var err error
-	certData, err = params.CertFile.Read()
-	if err != nil {
-		this.Fail("读取证书文件内容错误，请重新上传")
-	}
+	if params.TextMode {
+		if len(params.CertText) == 0 {
+			this.FailField("certText", "请输入证书内容")
+		}
 
-	if !params.IsCA {
-		if params.KeyFile == nil {
-			this.Fail("请选择要上传的私钥文件")
-		} else {
-			keyData, err = params.KeyFile.Read()
-			if err != nil {
-				this.Fail("读取密钥文件内容错误，请重新上传")
+		if !params.IsCA {
+			if len(params.KeyText) == 0 {
+				this.FailField("keyText", "请输入私钥内容")
+			}
+		}
+
+		certData = []byte(params.CertText)
+		keyData = []byte(params.KeyText)
+	} else {
+		if params.CertFile == nil {
+			this.FailField("certFile", "请选择要上传的证书文件")
+		}
+		var err error
+		certData, err = params.CertFile.Read()
+		if err != nil {
+			this.FailField("certFile", "读取证书文件内容错误，请重新上传")
+		}
+
+		if !params.IsCA {
+			if params.KeyFile == nil {
+				this.FailField("keyFile", "请选择要上传的私钥文件")
+			} else {
+				keyData, err = params.KeyFile.Read()
+				if err != nil {
+					this.FailField("keyFile", "读取密钥文件内容错误，请重新上传")
+				}
 			}
 		}
 	}
@@ -65,7 +85,7 @@ func (this *UploadPopupAction) RunPost(params struct {
 		CertData: certData,
 		KeyData:  keyData,
 	}
-	err = sslConfig.Init()
+	err := sslConfig.Init()
 	if err != nil {
 		if params.IsCA {
 			this.Fail("证书校验错误：" + err.Error())
@@ -73,6 +93,9 @@ func (this *UploadPopupAction) RunPost(params struct {
 			this.Fail("证书或密钥校验错误：" + err.Error())
 		}
 	}
+	if len(timeutil.Format("Y", sslConfig.TimeEnd())) != 4 {
+		this.Fail("证书格式错误：无法读取到证书有效期")
+	}
 
 	// 保存
 	createResp, err := this.RPC().SSLCertRPC().CreateSSLCert(this.AdminContext(), &pb.CreateSSLCertRequest{

internal/web/actions/default/servers/components/cache/init.go

@@ -28,7 +28,7 @@ func init() {
 			Post("/testWrite", new(TestWriteAction)).
 			Get("/selectPopup", new(SelectPopupAction)).
 			Post("/count", new(CountAction)).
-
+			Post("/updateRefs", new(UpdateRefsAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/servers/components/cache/updateRefs.go

@@ -0,0 +1,35 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package cache
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type UpdateRefsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateRefsAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *UpdateRefsAction) RunPost(params struct {
+	CachePolicyId int64
+	RefsJSON      []byte
+}) {
+	// 修改缓存条件
+	if params.CachePolicyId > 0 && len(params.RefsJSON) > 0 {
+		_, err := this.RPC().HTTPCachePolicyRPC().UpdateHTTPCachePolicyRefs(this.AdminContext(), &pb.UpdateHTTPCachePolicyRefsRequest{
+			HttpCachePolicyId: params.CachePolicyId,
+			RefsJSON:          params.RefsJSON,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/components/waf/group.go

@@ -73,6 +73,14 @@ func (this *GroupAction) RunGet(params struct {
 			"name": set.Name,
 			"rules": lists.Map(set.Rules, func(k int, v interface{}) interface{} {
 				rule := v.(*firewallconfigs.HTTPFirewallRule)
+
+				// 校验
+				var errString = ""
+				var err = rule.Init()
+				if err != nil {
+					errString = err.Error()
+				}
+
 				return maps.Map{
 					"param":             rule.Param,
 					"paramFilters":      rule.ParamFilters,
@@ -81,6 +89,7 @@ func (this *GroupAction) RunGet(params struct {
 					"isCaseInsensitive": rule.IsCaseInsensitive,
 					"isComposed":        firewallconfigs.CheckCheckpointIsComposed(rule.Prefix()),
 					"checkpointOptions": rule.CheckpointOptions,
+					"err":               errString,
 				}
 			}),
 			"isOn":      set.IsOn,

internal/web/actions/default/servers/components/waf/index.go

@@ -70,10 +70,17 @@ func (this *IndexAction) RunGet(params struct {
 		}
 		countClusters := countClustersResp.Count
 
+		// mode
+		if len(policy.Mode) == 0 {
+			policy.Mode = firewallconfigs.FirewallModeDefend
+		}
+
 		policyMaps = append(policyMaps, maps.Map{
 			"id":            policy.Id,
 			"isOn":          policy.IsOn,
 			"name":          policy.Name,
+			"mode":          policy.Mode,
+			"modeInfo":      firewallconfigs.FindFirewallMode(policy.Mode),
 			"countInbound":  countInbound,
 			"countOutbound": countOutbound,
 			"countClusters": countClusters,