缓存支持默认条件

README.md

@@ -9,7 +9,7 @@
 * `高扩展性` - 可以自由扩展新的节点，支持亿级数据
 
 ## 文档
-[点这里查看文档](https://github.com/TeaOSLab/EdgeDocs)
+[点这里查看文档](http://edge.teaos.cn/docs)
 
 ## 架构
 ![架构](doc/architect-zh.jpg)

build/build-all.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+./build.sh linux amd64
+./build.sh linux 386
+./build.sh linux arm64
+./build.sh linux mips64
+./build.sh linux mips64le
+./build.sh darwin amd64
+./build.sh darwin arm64

build/licenses/README.md

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

build/licenses/miekg-dns.md

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

cmd/edge-admin/main.go

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

internal/configloaders/security_config.go

@@ -52,6 +52,10 @@ func UpdateSecurityConfig(securityConfig *systemconfigs.SecurityConfig) error {
 	if err != nil {
 		return err
 	}
+	err = securityConfig.Init()
+	if err != nil {
+		return err
+	}
 	sharedSecurityConfig = securityConfig
 
 	// 通知更新
@@ -86,6 +90,10 @@ func loadSecurityConfig() (*systemconfigs.SecurityConfig, error) {
 		sharedSecurityConfig = defaultSecurityConfig()
 		return sharedSecurityConfig, nil
 	}
+	err = config.Init()
+	if err != nil {
+		return nil, err
+	}
 	sharedSecurityConfig = config
 	return sharedSecurityConfig, nil
 }

internal/configs/api_config.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 )
 
-// API配置
+// APIConfig API配置
 type APIConfig struct {
 	RPC struct {
 		Endpoints []string `yaml:"endpoints"`
@@ -18,7 +18,7 @@ type APIConfig struct {
 	Secret string `yaml:"secret"`
 }
 
-// 加载API配置
+// LoadAPIConfig 加载API配置
 func LoadAPIConfig() (*APIConfig, error) {
 	// 候选文件
 	localFile := Tea.ConfigFile("api.yaml")
@@ -59,7 +59,50 @@ func LoadAPIConfig() (*APIConfig, error) {
 	return config, nil
 }
 
-// 写入API配置
+// ResetAPIConfig 重置配置
+func ResetAPIConfig() error {
+	filename := "api.yaml"
+
+	{
+		configFile := Tea.ConfigFile(filename)
+		stat, err := os.Stat(configFile)
+		if err == nil && !stat.IsDir() {
+			err = os.Remove(configFile)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	// 重置 ~/.edge-admin/api.yaml
+	homeDir, homeErr := os.UserHomeDir()
+	if homeErr == nil {
+		configFile := homeDir + "/." + teaconst.ProcessName + "/" + filename
+		stat, err := os.Stat(configFile)
+		if err == nil && !stat.IsDir() {
+			err = os.Remove(configFile)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	// 重置 /etc/edge-admin/api.yaml
+	{
+		configFile := "/etc/" + teaconst.ProcessName + "/" + filename
+		stat, err := os.Stat(configFile)
+		if err == nil && !stat.IsDir() {
+			err = os.Remove(configFile)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+// WriteFile 写入API配置
 func (this *APIConfig) WriteFile(path string) error {
 	data, err := yaml.Marshal(this)
 	if err != nil {
@@ -84,7 +127,7 @@ func (this *APIConfig) WriteFile(path string) error {
 		}
 	}
 
-	// 写入 /etc/.edge-admin
+	// 写入 /etc/edge-admin
 	{
 		dir := "/etc/" + teaconst.ProcessName
 		stat, err := os.Stat(dir)

internal/const/const.go

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

internal/const/plus.go

@@ -0,0 +1,6 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package teaconst
+
+// IsPlus 是否为企业版
+var IsPlus = false

internal/nodes/admin_node.go

@@ -87,7 +87,7 @@ func (this *AdminNode) Run() {
 		Start()
 }
 
-// 实现守护进程
+// Daemon 实现守护进程
 func (this *AdminNode) Daemon() {
 	path := os.TempDir() + "/edge-admin.sock"
 	isDebug := lists.ContainsString(os.Args, "debug")
@@ -132,7 +132,7 @@ func (this *AdminNode) Daemon() {
 	}
 }
 
-// 安装系统服务
+// InstallSystemService 安装系统服务
 func (this *AdminNode) InstallSystemService() error {
 	shortName := teaconst.SystemdServiceName
 
@@ -149,7 +149,7 @@ func (this *AdminNode) InstallSystemService() error {
 	return nil
 }
 
-// 添加子PID
+// AddSubPID 添加子PID
 func (this *AdminNode) AddSubPID(pid int) {
 	this.subPIDs = append(this.subPIDs, pid)
 }

internal/rpc/rpc_client.go

@@ -22,7 +22,7 @@ import (
 	"time"
 )
 
-// RPC客户端
+// RPCClient RPC客户端
 type RPCClient struct {
 	apiConfig *configs.APIConfig
 	conns     []*grpc.ClientConn
@@ -30,7 +30,7 @@ type RPCClient struct {
 	locker sync.Mutex
 }
 
-// 构造新的RPC客户端
+// NewRPCClient 构造新的RPC客户端
 func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) {
 	if apiConfig == nil {
 		return nil, errors.New("api config should not be nil")
@@ -91,6 +91,14 @@ func (this *RPCClient) NodeIPAddressRPC() pb.NodeIPAddressServiceClient {
 	return pb.NewNodeIPAddressServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) NodeValueRPC() pb.NodeValueServiceClient {
+	return pb.NewNodeValueServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NodeThresholdRPC() pb.NodeThresholdServiceClient {
+	return pb.NewNodeThresholdServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) ServerRPC() pb.ServerServiceClient {
 	return pb.NewServerServiceClient(this.pickConn())
 }
@@ -139,6 +147,10 @@ func (this *RPCClient) DBNodeRPC() pb.DBNodeServiceClient {
 	return pb.NewDBNodeServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) MonitorNodeRPC() pb.MonitorNodeServiceClient {
+	return pb.NewMonitorNodeServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) DBRPC() pb.DBServiceClient {
 	return pb.NewDBServiceClient(this.pickConn())
 }
@@ -203,11 +215,15 @@ func (this *RPCClient) HTTPRewriteRuleRPC() pb.HTTPRewriteRuleServiceClient {
 	return pb.NewHTTPRewriteRuleServiceClient(this.pickConn())
 }
 
-// 访问日志
+// HTTPAccessLogRPC 访问日志
 func (this *RPCClient) HTTPAccessLogRPC() pb.HTTPAccessLogServiceClient {
 	return pb.NewHTTPAccessLogServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) HTTPFastcgiRPC() pb.HTTPFastcgiServiceClient {
+	return pb.NewHTTPFastcgiServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) SSLCertRPC() pb.SSLCertServiceClient {
 	return pb.NewSSLCertServiceClient(this.pickConn())
 }
@@ -224,6 +240,34 @@ func (this *RPCClient) MessageRPC() pb.MessageServiceClient {
 	return pb.NewMessageServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) MessageRecipientGroupRPC() pb.MessageRecipientGroupServiceClient {
+	return pb.NewMessageRecipientGroupServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) MessageRecipientRPC() pb.MessageRecipientServiceClient {
+	return pb.NewMessageRecipientServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) MessageMediaRPC() pb.MessageMediaServiceClient {
+	return pb.NewMessageMediaServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) MessageMediaInstanceRPC() pb.MessageMediaInstanceServiceClient {
+	return pb.NewMessageMediaInstanceServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) MessageTaskRPC() pb.MessageTaskServiceClient {
+	return pb.NewMessageTaskServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) MessageTaskLogRPC() pb.MessageTaskLogServiceClient {
+	return pb.NewMessageTaskLogServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) MessageReceiverRPC() pb.MessageReceiverServiceClient {
+	return pb.NewMessageReceiverServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) IPLibraryRPC() pb.IPLibraryServiceClient {
 	return pb.NewIPLibraryServiceClient(this.pickConn())
 }
@@ -296,7 +340,19 @@ func (this *RPCClient) NodeTaskRPC() pb.NodeTaskServiceClient {
 	return pb.NewNodeTaskServiceClient(this.pickConn())
 }
 
-// 构造Admin上下文
+func (this *RPCClient) AuthorityKeyRPC() pb.AuthorityKeyServiceClient {
+	return pb.NewAuthorityKeyServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) AuthorityNodeRPC() pb.AuthorityNodeServiceClient {
+	return pb.NewAuthorityNodeServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) LatestItemRPC() pb.LatestItemServiceClient {
+	return pb.NewLatestItemServiceClient(this.pickConn())
+}
+
+// Context 构造Admin上下文
 func (this *RPCClient) Context(adminId int64) context.Context {
 	ctx := context.Background()
 	m := maps.Map{
@@ -319,7 +375,7 @@ func (this *RPCClient) Context(adminId int64) context.Context {
 	return ctx
 }
 
-// 构造API上下文
+// APIContext 构造API上下文
 func (this *RPCClient) APIContext(apiNodeId int64) context.Context {
 	ctx := context.Background()
 	m := maps.Map{
@@ -342,7 +398,7 @@ func (this *RPCClient) APIContext(apiNodeId int64) context.Context {
 	return ctx
 }
 
-// 修改配置
+// UpdateConfig 修改配置
 func (this *RPCClient) UpdateConfig(config *configs.APIConfig) error {
 	this.apiConfig = config
 	return this.init()

internal/rpc/rpc_client_test.go

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

internal/setup/utils.go

@@ -6,7 +6,7 @@ import (
 
 var isConfigured bool
 
-// 判断系统是否已经配置过
+// IsConfigured 判断系统是否已经配置过
 func IsConfigured() bool {
 	if isConfigured {
 		return true

internal/tasks/task_authority.go

@@ -0,0 +1,68 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package tasks
+
+import (
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/events"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/logs"
+	"time"
+)
+
+func init() {
+	events.On(events.EventStart, func() {
+		task := NewAuthorityTask()
+		go task.Start()
+	})
+}
+
+type AuthorityTask struct {
+}
+
+func NewAuthorityTask() *AuthorityTask {
+	return &AuthorityTask{}
+}
+
+func (this *AuthorityTask) Start() {
+	ticker := time.NewTicker(10 * time.Minute)
+	if Tea.IsTesting() {
+		// 快速测试
+		ticker = time.NewTicker(1 * time.Minute)
+	}
+
+	// 初始化的时候先获取一次
+	timeout := time.NewTimer(5 * time.Second)
+	<-timeout.C
+	err := this.Loop()
+	if err != nil {
+		logs.Println("[TASK][AuthorityTask]" + err.Error())
+	}
+
+	// 定时获取
+	for range ticker.C {
+		err := this.Loop()
+		if err != nil {
+			logs.Println("[TASK][AuthorityTask]" + err.Error())
+		}
+	}
+}
+
+func (this *AuthorityTask) Loop() error {
+	rpcClient, err := rpc.SharedRPC()
+	if err != nil {
+		return err
+	}
+	resp, err := rpcClient.AuthorityKeyRPC().ReadAuthorityKey(rpcClient.Context(0), &pb.ReadAuthorityKeyRequest{})
+	if err != nil {
+		return err
+	}
+	if resp.AuthorityKey != nil {
+		teaconst.IsPlus = true
+	} else {
+		teaconst.IsPlus = false
+	}
+	return nil
+}

internal/ttlcache/piece.go

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

internal/utils/numberutils/utils.go

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

internal/web/actions/actionutils/utils.go

@@ -5,6 +5,7 @@ import (
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/logs"
+	"net/http"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -25,7 +26,21 @@ func FailPage(action actions.ActionWrapper, err error) {
 	if err != nil {
 		logs.Println("[" + reflect.TypeOf(action).String() + "]" + findStack(err.Error()))
 	}
-	action.Object().WriteString(teaconst.ErrServer)
+	action.Object().ResponseWriter.WriteHeader(http.StatusInternalServerError)
+	if len(action.Object().Request.Header.Get("X-Requested-With")) > 0 {
+		action.Object().WriteString(teaconst.ErrServer)
+	} else {
+		action.Object().WriteString(`<!DOCTYPE html>
+<html>
+	<head></head>
+	<body>
+	<div style="background: #eee; border: 1px #ccc solid; padding: 10px; font-size: 12px; line-height: 1.8">
+	` + teaconst.ErrServer + `
+	<div>可以通过查看 <strong><em>$安装目录/logs/run.log</em></strong> 日志文件查看具体的错误提示。</div>
+	</div>
+	</body>
+</html>`)
+	}
 }
 
 // 判断动作的文件路径是否相当

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

@@ -36,6 +36,7 @@ func (this *AdminAction) RunGet(params struct {
 		"username": admin.Username,
 		"isOn":     admin.IsOn,
 		"isSuper":  admin.IsSuper,
+		"canLogin": admin.CanLogin,
 	}
 
 	// 权限

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

@@ -31,6 +31,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	Pass2       string
 	ModuleCodes []string
 	IsSuper     bool
+	CanLogin    bool
 
 	// OTP
 	OtpOn bool
@@ -88,6 +89,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Fullname:    params.Fullname,
 		ModulesJSON: modulesJSON,
 		IsSuper:     params.IsSuper,
+		CanLogin:    params.CanLogin,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -42,6 +42,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 			"fullname":     admin.Fullname,
 			"createdTime":  timeutil.FormatTime("Y-m-d H:i:s", admin.CreatedAt),
 			"otpLoginIsOn": admin.OtpLogin != nil && admin.OtpLogin.IsOn,
+			"canLogin":     admin.CanLogin,
 		})
 	}
 	this.Data["admins"] = adminMaps

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

@@ -18,6 +18,7 @@ func init() {
 			Post("/delete", new(DeleteAction)).
 			Get("/admin", new(AdminAction)).
 			Get("/otpQrcode", new(OtpQrcodeAction)).
+			Post("/options", new(OptionsAction)).
 			EndAll()
 	})
 }

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

@@ -0,0 +1,40 @@
+package admins
+
+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) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *OptionsAction) RunPost(params struct{}) {
+	// TODO 实现关键词搜索
+	adminsResp, err := this.RPC().AdminRPC().ListEnabledAdmins(this.AdminContext(), &pb.ListEnabledAdminsRequest{
+		Offset: 0,
+		Size:   1000,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	adminMaps := []maps.Map{}
+	for _, admin := range adminsResp.Admins {
+		adminMaps = append(adminMaps, maps.Map{
+			"id":       admin.Id,
+			"name":     admin.Fullname,
+			"username": admin.Username,
+		})
+	}
+	this.Data["admins"] = adminMaps
+
+	this.Success()
+}

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

@@ -0,0 +1,58 @@
+package recipients
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type CreatePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *CreatePopupAction) RunGet(params struct{}) {
+	this.Show()
+}
+
+func (this *CreatePopupAction) RunPost(params struct {
+	AdminId    int64
+	InstanceId int64
+	User       string
+
+	TelegramToken string
+
+	GroupIds    string
+	Description string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	params.Must.
+		Field("adminId", params.AdminId).
+		Gt(0, "请选择系统用户").
+		Field("instanceId", params.InstanceId).
+		Gt(0, "请选择媒介")
+
+	groupIds := utils.SplitNumbers(params.GroupIds)
+
+	resp, err := this.RPC().MessageRecipientRPC().CreateMessageRecipient(this.AdminContext(), &pb.CreateMessageRecipientRequest{
+		AdminId:                  params.AdminId,
+		MessageMediaInstanceId:   params.InstanceId,
+		User:                     params.User,
+		MessageRecipientGroupIds: groupIds,
+		Description:              params.Description,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	defer this.CreateLogInfo("创建媒介接收人 %d", resp.MessageRecipientId)
+
+	this.Success()
+}

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

@@ -0,0 +1,24 @@
+package recipients
+
+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 {
+	RecipientId int64
+}) {
+	defer this.CreateLogInfo("删除媒介接收人 %d", params.RecipientId)
+
+	_, err := this.RPC().MessageRecipientRPC().DeleteMessageRecipient(this.AdminContext(), &pb.DeleteMessageRecipientRequest{MessageRecipientId: params.RecipientId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,38 @@
+package groups
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type CreatePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *CreatePopupAction) RunGet(params struct{}) {
+	this.Show()
+}
+
+func (this *CreatePopupAction) RunPost(params struct {
+	Name string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入分组名称")
+
+	_, err := this.RPC().MessageRecipientGroupRPC().CreateMessageRecipientGroup(this.AdminContext(), &pb.CreateMessageRecipientGroupRequest{Name: params.Name})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,22 @@
+package groups
+
+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 {
+	GroupId int64
+}) {
+	_, err := this.RPC().MessageRecipientGroupRPC().DeleteMessageRecipientGroup(this.AdminContext(), &pb.DeleteMessageRecipientGroupRequest{MessageRecipientGroupId: params.GroupId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,34 @@
+package groups
+
+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("", "", "group")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+	groupsResp, err := this.RPC().MessageRecipientGroupRPC().FindAllEnabledMessageRecipientGroups(this.AdminContext(), &pb.FindAllEnabledMessageRecipientGroupsRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	groupMaps := []maps.Map{}
+	for _, group := range groupsResp.MessageRecipientGroups {
+		groupMaps = append(groupMaps, maps.Map{
+			"id":   group.Id,
+			"name": group.Name,
+			"isOn": group.IsOn,
+		})
+	}
+	this.Data["groups"] = groupMaps
+
+	this.Show()
+}

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

@@ -0,0 +1,23 @@
+package groups
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeAdmin)).
+			Data("teaMenu", "admins").
+			Data("teaSubMenu", "recipients").
+			Prefix("/admins/recipients/groups").
+			Get("", new(IndexAction)).
+			GetPost("/createPopup", new(CreatePopupAction)).
+			GetPost("/updatePopup", new(UpdatePopupAction)).
+			Post("/delete", new(DeleteAction)).
+			Get("/selectPopup", new(SelectPopupAction)).
+			EndAll()
+	})
+}

internal/web/actions/default/admins/recipients/groups/selectPopup.go

@@ -0,0 +1,39 @@
+package groups
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/lists"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type SelectPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SelectPopupAction) RunGet(params struct {
+	GroupIds string
+}) {
+	selectedGroupIds := utils.SplitNumbers(params.GroupIds)
+
+	groupsResp, err := this.RPC().MessageRecipientGroupRPC().FindAllEnabledMessageRecipientGroups(this.AdminContext(), &pb.FindAllEnabledMessageRecipientGroupsRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	groupMaps := []maps.Map{}
+	for _, group := range groupsResp.MessageRecipientGroups {
+		if lists.ContainsInt64(selectedGroupIds, group.Id) {
+			continue
+		}
+		groupMaps = append(groupMaps, maps.Map{
+			"id":   group.Id,
+			"name": group.Name,
+			"isOn": group.IsOn,
+		})
+	}
+	this.Data["groups"] = groupMaps
+
+	this.Show()
+}

internal/web/actions/default/admins/recipients/groups/updatePopup.go

@@ -0,0 +1,64 @@
+package groups
+
+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 {
+	GroupId int64
+}) {
+	groupResp, err := this.RPC().MessageRecipientGroupRPC().FindEnabledMessageRecipientGroup(this.AdminContext(), &pb.FindEnabledMessageRecipientGroupRequest{MessageRecipientGroupId: params.GroupId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	group := groupResp.MessageRecipientGroup
+	if group == nil {
+		this.NotFound("messageRecipientGroup", params.GroupId)
+		return
+	}
+
+	this.Data["group"] = maps.Map{
+		"id":   group.Id,
+		"name": group.Name,
+		"isOn": group.IsOn,
+	}
+
+	this.Show()
+}
+
+func (this *UpdatePopupAction) RunPost(params struct {
+	GroupId int64
+	Name    string
+	IsOn    bool
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入分组名称")
+
+	_, err := this.RPC().MessageRecipientGroupRPC().UpdateMessageRecipientGroup(this.AdminContext(), &pb.UpdateMessageRecipientGroupRequest{
+		MessageRecipientGroupId: params.GroupId,
+		Name:                    params.Name,
+		IsOn:                    params.IsOn,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,70 @@
+package recipients
+
+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("", "", "recipient")
+}
+
+func (this *IndexAction) RunGet(params struct {
+}) {
+	// TODO 增加系统用户、媒介类型等条件搜索
+	countResp, err := this.RPC().MessageRecipientRPC().CountAllEnabledMessageRecipients(this.AdminContext(), &pb.CountAllEnabledMessageRecipientsRequest{
+		AdminId:                 0,
+		MediaType:               "",
+		MessageRecipientGroupId: 0,
+		Keyword:                 "",
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	count := countResp.Count
+	page := this.NewPage(count)
+	this.Data["page"] = page.AsHTML()
+
+	recipientsResp, err := this.RPC().MessageRecipientRPC().ListEnabledMessageRecipients(this.AdminContext(), &pb.ListEnabledMessageRecipientsRequest{
+		AdminId:                 0,
+		MediaType:               "",
+		MessageRecipientGroupId: 0,
+		Keyword:                 "",
+		Offset:                  page.Offset,
+		Size:                    page.Size,
+	})
+
+	recipientMaps := []maps.Map{}
+	for _, recipient := range recipientsResp.MessageRecipients {
+		if recipient.Admin == nil {
+			continue
+		}
+		if recipient.MessageMediaInstance == nil {
+			continue
+		}
+		recipientMaps = append(recipientMaps, maps.Map{
+			"id": recipient.Id,
+			"admin": maps.Map{
+				"id":       recipient.Admin.Id,
+				"fullname": recipient.Admin.Fullname,
+				"username": recipient.Admin.Username,
+			},
+			"groups": recipient.MessageRecipientGroups,
+			"isOn":   recipient.IsOn,
+			"instance": maps.Map{
+				"name": recipient.MessageMediaInstance.Name,
+			},
+			"user":        recipient.User,
+			"description": recipient.Description,
+		})
+	}
+	this.Data["recipients"] = recipientMaps
+
+	this.Show()
+}

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

@@ -0,0 +1,25 @@
+package recipients
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeAdmin)).
+			Data("teaMenu", "admins").
+			Data("teaSubMenu", "recipients").
+			Prefix("/admins/recipients").
+			Get("", new(IndexAction)).
+			GetPost("/createPopup", new(CreatePopupAction)).
+			GetPost("/update", new(UpdateAction)).
+			Post("/delete", new(DeleteAction)).
+			Post("/mediaOptions", new(MediaOptionsAction)).
+			Get("/recipient", new(RecipientAction)).
+			GetPost("/test", new(TestAction)).
+			EndAll()
+	})
+}

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

@@ -0,0 +1,248 @@
+package instances
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type CreatePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *CreatePopupAction) RunGet(params struct{}) {
+	this.Show()
+}
+
+func (this *CreatePopupAction) RunPost(params struct {
+	Name      string
+	MediaType string
+
+	EmailSmtp     string
+	EmailUsername string
+	EmailPassword string
+	EmailFrom     string
+
+	WebHookURL          string
+	WebHookMethod       string
+	WebHookHeaderNames  []string
+	WebHookHeaderValues []string
+	WebHookContentType  string
+	WebHookParamNames   []string
+	WebHookParamValues  []string
+	WebHookBody         string
+
+	ScriptType      string
+	ScriptPath      string
+	ScriptLang      string
+	ScriptCode      string
+	ScriptCwd       string
+	ScriptEnvNames  []string
+	ScriptEnvValues []string
+
+	DingTalkWebHookURL string
+
+	QyWeixinCorporateId string
+	QyWeixinAgentId     string
+	QyWeixinAppSecret   string
+	QyWeixinTextFormat  string
+
+	QyWeixinRobotWebHookURL string
+	QyWeixinRobotTextFormat string
+
+	AliyunSmsSign              string
+	AliyunSmsTemplateCode      string
+	AliyunSmsTemplateVarNames  []string
+	AliyunSmsTemplateVarValues []string
+	AliyunSmsAccessKeyId       string
+	AliyunSmsAccessKeySecret   string
+
+	TelegramToken string
+
+	Description string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入媒介名称").
+		Field("mediaType", params.MediaType).
+		Require("请选择媒介类型")
+
+	options := maps.Map{}
+
+	switch params.MediaType {
+	case "email":
+		params.Must.
+			Field("emailSmtp", params.EmailSmtp).
+			Require("请输入SMTP地址").
+			Field("emailUsername", params.EmailUsername).
+			Require("请输入邮箱账号").
+			Field("emailPassword", params.EmailPassword).
+			Require("请输入密码或授权码")
+
+		options["smtp"] = params.EmailSmtp
+		options["username"] = params.EmailUsername
+		options["password"] = params.EmailPassword
+		options["from"] = params.EmailFrom
+	case "webHook":
+		params.Must.
+			Field("webHookURL", params.WebHookURL).
+			Require("请输入URL地址").
+			Match("(?i)^(http|https)://", "URL地址必须以http或https开头").
+			Field("webHookMethod", params.WebHookMethod).
+			Require("请选择请求方法")
+
+		options["url"] = params.WebHookURL
+		options["method"] = params.WebHookMethod
+		options["contentType"] = params.WebHookContentType
+
+		headers := []maps.Map{}
+		if len(params.WebHookHeaderNames) > 0 {
+			for index, name := range params.WebHookHeaderNames {
+				if index < len(params.WebHookHeaderValues) {
+					headers = append(headers, maps.Map{
+						"name":  name,
+						"value": params.WebHookHeaderValues[index],
+					})
+				}
+			}
+		}
+		options["headers"] = headers
+
+		if params.WebHookContentType == "params" {
+			webHookParams := []maps.Map{}
+			for index, name := range params.WebHookParamNames {
+				if index < len(params.WebHookParamValues) {
+					webHookParams = append(webHookParams, maps.Map{
+						"name":  name,
+						"value": params.WebHookParamValues[index],
+					})
+				}
+			}
+			options["params"] = webHookParams
+		} else if params.WebHookContentType == "body" {
+			options["body"] = params.WebHookBody
+		}
+	case "script":
+		if params.ScriptType == "path" {
+			params.Must.
+				Field("scriptPath", params.ScriptPath).
+				Require("请输入脚本路径")
+		} else if params.ScriptType == "code" {
+			params.Must.
+				Field("scriptCode", params.ScriptCode).
+				Require("请输入脚本代码")
+		} else {
+			params.Must.
+				Field("scriptPath", params.ScriptPath).
+				Require("请输入脚本路径")
+		}
+
+		options["scriptType"] = params.ScriptType
+		options["path"] = params.ScriptPath
+		options["scriptLang"] = params.ScriptLang
+		options["script"] = params.ScriptCode
+		options["cwd"] = params.ScriptCwd
+
+		env := []maps.Map{}
+		for index, envName := range params.ScriptEnvNames {
+			if index < len(params.ScriptEnvValues) {
+				env = append(env, maps.Map{
+					"name":  envName,
+					"value": params.ScriptEnvValues[index],
+				})
+			}
+		}
+		options["env"] = env
+	case "dingTalk":
+		params.Must.
+			Field("dingTalkWebHookURL", params.DingTalkWebHookURL).
+			Require("请输入Hook地址").
+			Match("^https:", "Hook地址必须以https://开头")
+
+		options["webHookURL"] = params.DingTalkWebHookURL
+	case "qyWeixin":
+		params.Must.
+			Field("qyWeixinCorporateId", params.QyWeixinCorporateId).
+			Require("请输入企业ID").
+			Field("qyWeixinAgentId", params.QyWeixinAgentId).
+			Require("请输入应用AgentId").
+			Field("qyWeixinSecret", params.QyWeixinAppSecret).
+			Require("请输入应用Secret")
+
+		options["corporateId"] = params.QyWeixinCorporateId
+		options["agentId"] = params.QyWeixinAgentId
+		options["appSecret"] = params.QyWeixinAppSecret
+		options["textFormat"] = params.QyWeixinTextFormat
+	case "qyWeixinRobot":
+		params.Must.
+			Field("qyWeixinRobotWebHookURL", params.QyWeixinRobotWebHookURL).
+			Require("请输入WebHook地址").
+			Match("^https:", "WebHook地址必须以https://开头")
+
+		options["webHookURL"] = params.QyWeixinRobotWebHookURL
+		options["textFormat"] = params.QyWeixinRobotTextFormat
+	case "aliyunSms":
+		params.Must.
+			Field("aliyunSmsSign", params.AliyunSmsSign).
+			Require("请输入签名名称").
+			Field("aliyunSmsTemplateCode", params.AliyunSmsTemplateCode).
+			Require("请输入模板CODE").
+			Field("aliyunSmsAccessKeyId", params.AliyunSmsAccessKeyId).
+			Require("请输入AccessKey ID").
+			Field("aliyunSmsAccessKeySecret", params.AliyunSmsAccessKeySecret).
+			Require("请输入AccessKey Secret")
+
+		options["sign"] = params.AliyunSmsSign
+		options["templateCode"] = params.AliyunSmsTemplateCode
+		options["accessKeyId"] = params.AliyunSmsAccessKeyId
+		options["accessKeySecret"] = params.AliyunSmsAccessKeySecret
+
+		variables := []maps.Map{}
+		for index, name := range params.AliyunSmsTemplateVarNames {
+			if index < len(params.AliyunSmsTemplateVarValues) {
+				variables = append(variables, maps.Map{
+					"name":  name,
+					"value": params.AliyunSmsTemplateVarValues[index],
+				})
+			}
+		}
+		options["variables"] = variables
+	case "telegram":
+		params.Must.
+			Field("telegramToken", params.TelegramToken).
+			Require("请输入机器人Token")
+		options["token"] = params.TelegramToken
+	default:
+		this.Fail("错误的媒介类型")
+	}
+
+	optionsJSON, err := json.Marshal(options)
+	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,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	defer this.CreateLogInfo("创建消息媒介 %d", resp.MessageMediaInstanceId)
+
+	this.Success()
+}

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

@@ -0,0 +1,24 @@
+package instances
+
+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 {
+	InstanceId int64
+}) {
+	defer this.CreateLogInfo("删除消息媒介 %d", params.InstanceId)
+
+	_, err := this.RPC().MessageMediaInstanceRPC().DeleteMessageMediaInstance(this.AdminContext(), &pb.DeleteMessageMediaInstanceRequest{MessageMediaInstanceId: params.InstanceId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,57 @@
+package instances
+
+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("", "", "instance")
+}
+
+func (this *IndexAction) RunGet(params struct {
+}) {
+	// TODO 增加系统用户、媒介类型等条件搜索
+	countResp, err := this.RPC().MessageMediaInstanceRPC().CountAllEnabledMessageMediaInstances(this.AdminContext(), &pb.CountAllEnabledMessageMediaInstancesRequest{
+		MediaType: "",
+		Keyword:   "",
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	count := countResp.Count
+	page := this.NewPage(count)
+	this.Data["page"] = page.AsHTML()
+
+	instancesResp, err := this.RPC().MessageMediaInstanceRPC().ListEnabledMessageMediaInstances(this.AdminContext(), &pb.ListEnabledMessageMediaInstancesRequest{
+		MediaType: "",
+		Keyword:   "",
+		Offset:    page.Offset,
+		Size:      page.Size,
+	})
+
+	instanceMaps := []maps.Map{}
+	for _, instance := range instancesResp.MessageMediaInstances {
+		if instance.MessageMedia == nil {
+			continue
+		}
+		instanceMaps = append(instanceMaps, maps.Map{
+			"id":   instance.Id,
+			"name": instance.Name,
+			"isOn": instance.IsOn,
+			"media": maps.Map{
+				"name": instance.MessageMedia.Name,
+			},
+			"description": instance.Description,
+		})
+	}
+	this.Data["instances"] = instanceMaps
+
+	this.Show()
+}

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

@@ -0,0 +1,25 @@
+package instances
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeAdmin)).
+			Data("teaMenu", "admins").
+			Data("teaSubMenu", "instances").
+			Prefix("/admins/recipients/instances").
+			Get("", new(IndexAction)).
+			GetPost("/createPopup", new(CreatePopupAction)).
+			GetPost("/update", new(UpdateAction)).
+			Post("/delete", new(DeleteAction)).
+			Get("/instance", new(InstanceAction)).
+			GetPost("/test", new(TestAction)).
+			Post("/options", new(OptionsAction)).
+			EndAll()
+	})
+}

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

@@ -0,0 +1,54 @@
+package instances
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type InstanceAction struct {
+	actionutils.ParentAction
+}
+
+func (this *InstanceAction) Init() {
+	this.Nav("", "", "instance")
+}
+
+func (this *InstanceAction) RunGet(params struct {
+	InstanceId int64
+}) {
+	instanceResp, err := this.RPC().MessageMediaInstanceRPC().FindEnabledMessageMediaInstance(this.AdminContext(), &pb.FindEnabledMessageMediaInstanceRequest{MessageMediaInstanceId: params.InstanceId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	instance := instanceResp.MessageMediaInstance
+	if instance == nil || instance.MessageMedia == nil {
+		this.NotFound("messageMediaInstance", params.InstanceId)
+		return
+	}
+
+	mediaParams := maps.Map{}
+	if len(instance.ParamsJSON) > 0 {
+		err = json.Unmarshal(instance.ParamsJSON, &mediaParams)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	this.Data["instance"] = maps.Map{
+		"id":   instance.Id,
+		"name": instance.Name,
+		"isOn": instance.IsOn,
+		"media": maps.Map{
+			"type": instance.MessageMedia.Type,
+			"name": instance.MessageMedia.Name,
+		},
+		"description": instance.Description,
+		"params":      mediaParams,
+	}
+
+	this.Show()
+}

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

@@ -0,0 +1,39 @@
+package instances
+
+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().MessageMediaInstanceRPC().ListEnabledMessageMediaInstances(this.AdminContext(), &pb.ListEnabledMessageMediaInstancesRequest{
+		Offset: 0,
+		Size:   1000,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	instanceMaps := []maps.Map{}
+	for _, instance := range resp.MessageMediaInstances {
+		instanceMaps = append(instanceMaps, maps.Map{
+			"id":          instance.Id,
+			"name":        instance.Name,
+			"description": instance.Description,
+			"media": maps.Map{
+				"type":            instance.MessageMedia.Type,
+				"name":            instance.MessageMedia.Name,
+				"userDescription": instance.MessageMedia.UserDescription,
+			},
+		})
+	}
+	this.Data["instances"] = instanceMaps
+
+	this.Success()
+}

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

@@ -0,0 +1,87 @@
+package instances
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type TestAction struct {
+	actionutils.ParentAction
+}
+
+func (this *TestAction) Init() {
+	this.Nav("", "", "test")
+}
+
+func (this *TestAction) RunGet(params struct {
+	InstanceId int64
+}) {
+	instanceResp, err := this.RPC().MessageMediaInstanceRPC().FindEnabledMessageMediaInstance(this.AdminContext(), &pb.FindEnabledMessageMediaInstanceRequest{MessageMediaInstanceId: params.InstanceId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	instance := instanceResp.MessageMediaInstance
+	if instance == nil || instance.MessageMedia == nil {
+		this.NotFound("messageMediaInstance", params.InstanceId)
+		return
+	}
+
+	mediaParams := maps.Map{}
+	if len(instance.ParamsJSON) > 0 {
+		err = json.Unmarshal(instance.ParamsJSON, &mediaParams)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	this.Data["instance"] = maps.Map{
+		"id":   instance.Id,
+		"isOn": instance.IsOn,
+		"media": maps.Map{
+			"type":            instance.MessageMedia.Type,
+			"name":            instance.MessageMedia.Name,
+			"userDescription": instance.MessageMedia.UserDescription,
+		},
+		"description": instance.Description,
+		"params":      mediaParams,
+	}
+
+	this.Show()
+}
+
+func (this *TestAction) RunPost(params struct {
+	InstanceId int64
+	Subject    string
+	Body       string
+	User       string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	params.Must.
+		Field("instanceId", params.InstanceId).
+		Gt(0, "请选择正确的媒介")
+
+	resp, err := this.RPC().MessageTaskRPC().CreateMessageTask(this.AdminContext(), &pb.CreateMessageTaskRequest{
+		RecipientId: 0,
+		InstanceId:  params.InstanceId,
+		User:        params.User,
+		Subject:     params.Subject,
+		Body:        params.Body,
+		IsPrimary:   true,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["taskId"] = resp.MessageTaskId
+
+	defer this.CreateLogInfo("创建媒介测试任务 %d", resp.MessageTaskId)
+
+	this.Success()
+}

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

@@ -0,0 +1,287 @@
+package instances
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type UpdateAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateAction) Init() {
+	this.Nav("", "", "update")
+}
+
+func (this *UpdateAction) RunGet(params struct {
+	InstanceId int64
+}) {
+	instanceResp, err := this.RPC().MessageMediaInstanceRPC().FindEnabledMessageMediaInstance(this.AdminContext(), &pb.FindEnabledMessageMediaInstanceRequest{MessageMediaInstanceId: params.InstanceId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	instance := instanceResp.MessageMediaInstance
+	if instance == nil || instance.MessageMedia == nil {
+		this.NotFound("messageMediaInstance", params.InstanceId)
+		return
+	}
+
+	mediaParams := maps.Map{}
+	if len(instance.ParamsJSON) > 0 {
+		err = json.Unmarshal(instance.ParamsJSON, &mediaParams)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	this.Data["instance"] = maps.Map{
+		"id":   instance.Id,
+		"name": instance.Name,
+		"isOn": instance.IsOn,
+		"media": maps.Map{
+			"type": instance.MessageMedia.Type,
+			"name": instance.MessageMedia.Name,
+		},
+		"description": instance.Description,
+		"params":      mediaParams,
+	}
+
+	this.Show()
+}
+
+func (this *UpdateAction) RunPost(params struct {
+	InstanceId int64
+	Name       string
+	MediaType  string
+
+	EmailSmtp     string
+	EmailUsername string
+	EmailPassword string
+	EmailFrom     string
+
+	WebHookURL          string
+	WebHookMethod       string
+	WebHookHeaderNames  []string
+	WebHookHeaderValues []string
+	WebHookContentType  string
+	WebHookParamNames   []string
+	WebHookParamValues  []string
+	WebHookBody         string
+
+	ScriptType      string
+	ScriptPath      string
+	ScriptLang      string
+	ScriptCode      string
+	ScriptCwd       string
+	ScriptEnvNames  []string
+	ScriptEnvValues []string
+
+	DingTalkWebHookURL string
+
+	QyWeixinCorporateId string
+	QyWeixinAgentId     string
+	QyWeixinAppSecret   string
+	QyWeixinTextFormat  string
+
+	QyWeixinRobotWebHookURL string
+	QyWeixinRobotTextFormat string
+
+	AliyunSmsSign              string
+	AliyunSmsTemplateCode      string
+	AliyunSmsTemplateVarNames  []string
+	AliyunSmsTemplateVarValues []string
+	AliyunSmsAccessKeyId       string
+	AliyunSmsAccessKeySecret   string
+
+	TelegramToken string
+
+	GroupIds    string
+	Description string
+	IsOn        bool
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改消息媒介 %d", params.InstanceId)
+
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入媒介名称").
+		Field("mediaType", params.MediaType).
+		Require("请选择媒介类型")
+
+	options := maps.Map{}
+
+	switch params.MediaType {
+	case "email":
+		params.Must.
+			Field("emailSmtp", params.EmailSmtp).
+			Require("请输入SMTP地址").
+			Field("emailUsername", params.EmailUsername).
+			Require("请输入邮箱账号").
+			Field("emailPassword", params.EmailPassword).
+			Require("请输入密码或授权码")
+
+		options["smtp"] = params.EmailSmtp
+		options["username"] = params.EmailUsername
+		options["password"] = params.EmailPassword
+		options["from"] = params.EmailFrom
+	case "webHook":
+		params.Must.
+			Field("webHookURL", params.WebHookURL).
+			Require("请输入URL地址").
+			Match("(?i)^(http|https)://", "URL地址必须以http或https开头").
+			Field("webHookMethod", params.WebHookMethod).
+			Require("请选择请求方法")
+
+		options["url"] = params.WebHookURL
+		options["method"] = params.WebHookMethod
+		options["contentType"] = params.WebHookContentType
+
+		headers := []maps.Map{}
+		if len(params.WebHookHeaderNames) > 0 {
+			for index, name := range params.WebHookHeaderNames {
+				if index < len(params.WebHookHeaderValues) {
+					headers = append(headers, maps.Map{
+						"name":  name,
+						"value": params.WebHookHeaderValues[index],
+					})
+				}
+			}
+		}
+		options["headers"] = headers
+
+		if params.WebHookContentType == "params" {
+			webHookParams := []maps.Map{}
+			for index, name := range params.WebHookParamNames {
+				if index < len(params.WebHookParamValues) {
+					webHookParams = append(webHookParams, maps.Map{
+						"name":  name,
+						"value": params.WebHookParamValues[index],
+					})
+				}
+			}
+			options["params"] = webHookParams
+		} else if params.WebHookContentType == "body" {
+			options["body"] = params.WebHookBody
+		}
+	case "script":
+		if params.ScriptType == "path" {
+			params.Must.
+				Field("scriptPath", params.ScriptPath).
+				Require("请输入脚本路径")
+		} else if params.ScriptType == "code" {
+			params.Must.
+				Field("scriptCode", params.ScriptCode).
+				Require("请输入脚本代码")
+		} else {
+			params.Must.
+				Field("scriptPath", params.ScriptPath).
+				Require("请输入脚本路径")
+		}
+
+		options["scriptType"] = params.ScriptType
+		options["path"] = params.ScriptPath
+		options["scriptLang"] = params.ScriptLang
+		options["script"] = params.ScriptCode
+		options["cwd"] = params.ScriptCwd
+
+		env := []maps.Map{}
+		for index, envName := range params.ScriptEnvNames {
+			if index < len(params.ScriptEnvValues) {
+				env = append(env, maps.Map{
+					"name":  envName,
+					"value": params.ScriptEnvValues[index],
+				})
+			}
+		}
+		options["env"] = env
+	case "dingTalk":
+		params.Must.
+			Field("dingTalkWebHookURL", params.DingTalkWebHookURL).
+			Require("请输入Hook地址").
+			Match("^https:", "Hook地址必须以https://开头")
+
+		options["webHookURL"] = params.DingTalkWebHookURL
+	case "qyWeixin":
+		params.Must.
+			Field("qyWeixinCorporateId", params.QyWeixinCorporateId).
+			Require("请输入企业ID").
+			Field("qyWeixinAgentId", params.QyWeixinAgentId).
+			Require("请输入应用AgentId").
+			Field("qyWeixinSecret", params.QyWeixinAppSecret).
+			Require("请输入应用Secret")
+
+		options["corporateId"] = params.QyWeixinCorporateId
+		options["agentId"] = params.QyWeixinAgentId
+		options["appSecret"] = params.QyWeixinAppSecret
+		options["textFormat"] = params.QyWeixinTextFormat
+	case "qyWeixinRobot":
+		params.Must.
+			Field("qyWeixinRobotWebHookURL", params.QyWeixinRobotWebHookURL).
+			Require("请输入WebHook地址").
+			Match("^https:", "WebHook地址必须以https://开头")
+
+		options["webHookURL"] = params.QyWeixinRobotWebHookURL
+		options["textFormat"] = params.QyWeixinRobotTextFormat
+	case "aliyunSms":
+		params.Must.
+			Field("aliyunSmsSign", params.AliyunSmsSign).
+			Require("请输入签名名称").
+			Field("aliyunSmsTemplateCode", params.AliyunSmsTemplateCode).
+			Require("请输入模板CODE").
+			Field("aliyunSmsAccessKeyId", params.AliyunSmsAccessKeyId).
+			Require("请输入AccessKey ID").
+			Field("aliyunSmsAccessKeySecret", params.AliyunSmsAccessKeySecret).
+			Require("请输入AccessKey Secret")
+
+		options["sign"] = params.AliyunSmsSign
+		options["templateCode"] = params.AliyunSmsTemplateCode
+		options["accessKeyId"] = params.AliyunSmsAccessKeyId
+		options["accessKeySecret"] = params.AliyunSmsAccessKeySecret
+
+		variables := []maps.Map{}
+		for index, name := range params.AliyunSmsTemplateVarNames {
+			if index < len(params.AliyunSmsTemplateVarValues) {
+				variables = append(variables, maps.Map{
+					"name":  name,
+					"value": params.AliyunSmsTemplateVarValues[index],
+				})
+			}
+		}
+		options["variables"] = variables
+	case "telegram":
+		params.Must.
+			Field("telegramToken", params.TelegramToken).
+			Require("请输入机器人Token")
+		options["token"] = params.TelegramToken
+	default:
+		this.Fail("错误的媒介类型")
+	}
+
+	optionsJSON, err := json.Marshal(options)
+	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,
+		IsOn:                   params.IsOn,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,61 @@
+package logs
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "", "log")
+}
+
+func (this *IndexAction) RunGet(params struct{}) {
+	countResp, err := this.RPC().MessageTaskLogRPC().CountMessageTaskLogs(this.AdminContext(), &pb.CountMessageTaskLogsRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	page := this.NewPage(countResp.Count)
+	this.Data["page"] = page.AsHTML()
+
+	logsResp, err := this.RPC().MessageTaskLogRPC().ListMessageTaskLogs(this.AdminContext(), &pb.ListMessageTaskLogsRequest{
+		Offset: page.Offset,
+		Size:   page.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	logMaps := []maps.Map{}
+	for _, log := range logsResp.MessageTaskLogs {
+		if log.MessageTask.MessageRecipient != nil {
+			log.MessageTask.User = log.MessageTask.MessageRecipient.User
+		}
+		logMaps = append(logMaps, maps.Map{
+			"task": maps.Map{
+				"id":      log.MessageTask.Id,
+				"user":    log.MessageTask.User,
+				"subject": log.MessageTask.Subject,
+				"body":    log.MessageTask.Body,
+				"instance": maps.Map{
+					"id":   log.MessageTask.MessageMediaInstance.Id,
+					"name": log.MessageTask.MessageMediaInstance.Name,
+				},
+			},
+			"isOk":        log.IsOk,
+			"error":       log.Error,
+			"response":    log.Response,
+			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", log.CreatedAt),
+		})
+	}
+	this.Data["logs"] = logMaps
+
+	this.Show()
+}

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

@@ -0,0 +1,19 @@
+package logs
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeAdmin)).
+			Data("teaMenu", "admins").
+			Data("teaSubMenu", "recipients").
+			Prefix("/admins/recipients/logs").
+			Get("", new(IndexAction)).
+			EndAll()
+	})
+}

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

@@ -0,0 +1,32 @@
+package recipients
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+// 媒介类型选项
+type MediaOptionsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *MediaOptionsAction) RunPost(params struct{}) {
+	resp, err := this.RPC().MessageMediaRPC().FindAllMessageMedias(this.AdminContext(), &pb.FindAllMessageMediasRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	mediaMaps := []maps.Map{}
+	for _, media := range resp.MessageMedias {
+		mediaMaps = append(mediaMaps, maps.Map{
+			"id":          media.Id,
+			"type":        media.Type,
+			"name":        media.Name,
+			"description": media.Description,
+		})
+	}
+	this.Data["medias"] = mediaMaps
+
+	this.Success()
+}

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

@@ -0,0 +1,50 @@
+package recipients
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type RecipientAction struct {
+	actionutils.ParentAction
+}
+
+func (this *RecipientAction) Init() {
+	this.Nav("", "", "recipient")
+}
+
+func (this *RecipientAction) RunGet(params struct {
+	RecipientId int64
+}) {
+	recipientResp, err := this.RPC().MessageRecipientRPC().FindEnabledMessageRecipient(this.AdminContext(), &pb.FindEnabledMessageRecipientRequest{MessageRecipientId: params.RecipientId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	recipient := recipientResp.MessageRecipient
+	if recipient == nil || recipient.Admin == nil || recipient.MessageMediaInstance == nil {
+		this.NotFound("messageRecipient", params.RecipientId)
+		return
+	}
+
+	this.Data["recipient"] = maps.Map{
+		"id": recipient.Id,
+		"admin": maps.Map{
+			"id":       recipient.Admin.Id,
+			"fullname": recipient.Admin.Fullname,
+			"username": recipient.Admin.Username,
+		},
+		"groups": recipient.MessageRecipientGroups,
+		"isOn":   recipient.IsOn,
+		"instance": maps.Map{
+			"id":          recipient.MessageMediaInstance.Id,
+			"name":        recipient.MessageMediaInstance.Name,
+			"description": recipient.MessageMediaInstance.Description,
+		},
+		"user":        recipient.User,
+		"description": recipient.Description,
+	}
+
+	this.Show()
+}

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

@@ -0,0 +1,19 @@
+package tasks
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeAdmin)).
+			Data("teaMenu", "admins").
+			Data("teaSubMenu", "recipients").
+			Prefix("/admins/recipients/tasks").
+			Post("/taskInfo", new(TaskInfoAction)).
+			EndAll()
+	})
+}

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

@@ -0,0 +1,40 @@
+package tasks
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type TaskInfoAction struct {
+	actionutils.ParentAction
+}
+
+func (this *TaskInfoAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *TaskInfoAction) RunPost(params struct {
+	TaskId int64
+}) {
+	resp, err := this.RPC().MessageTaskRPC().FindEnabledMessageTask(this.AdminContext(), &pb.FindEnabledMessageTaskRequest{MessageTaskId: params.TaskId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	if resp.MessageTask == nil {
+		this.NotFound("messageTask", params.TaskId)
+		return
+	}
+
+	result := resp.MessageTask.Result
+	this.Data["status"] = resp.MessageTask.Status
+	this.Data["result"] = maps.Map{
+		"isOk":     result.IsOk,
+		"response": result.Response,
+		"error":    result.Error,
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,113 @@
+package recipients
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type TestAction struct {
+	actionutils.ParentAction
+}
+
+func (this *TestAction) Init() {
+	this.Nav("", "", "test")
+}
+
+func (this *TestAction) RunGet(params struct {
+	RecipientId int64
+}) {
+	recipientResp, err := this.RPC().MessageRecipientRPC().FindEnabledMessageRecipient(this.AdminContext(), &pb.FindEnabledMessageRecipientRequest{MessageRecipientId: params.RecipientId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	recipient := recipientResp.MessageRecipient
+	if recipient == nil || recipient.Admin == nil || recipient.MessageMediaInstance == nil {
+		this.NotFound("messageRecipient", params.RecipientId)
+		return
+	}
+
+	this.Data["recipient"] = maps.Map{
+		"id": recipient.Id,
+		"admin": maps.Map{
+			"id":       recipient.Admin.Id,
+			"fullname": recipient.Admin.Fullname,
+			"username": recipient.Admin.Username,
+		},
+		"instance": maps.Map{
+			"id":          recipient.MessageMediaInstance.Id,
+			"name":        recipient.MessageMediaInstance.Name,
+			"description": recipient.MessageMediaInstance.Description,
+		},
+		"user": recipient.User,
+	}
+
+	instanceResp, err := this.RPC().MessageMediaInstanceRPC().FindEnabledMessageMediaInstance(this.AdminContext(), &pb.FindEnabledMessageMediaInstanceRequest{MessageMediaInstanceId: recipient.MessageMediaInstance.Id})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	instance := instanceResp.MessageMediaInstance
+	if instance == nil || instance.MessageMedia == nil {
+		this.NotFound("messageMediaInstance", recipient.MessageMediaInstance.Id)
+		return
+	}
+
+	mediaParams := maps.Map{}
+	if len(instance.ParamsJSON) > 0 {
+		err = json.Unmarshal(instance.ParamsJSON, &mediaParams)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	this.Data["instance"] = maps.Map{
+		"id":   instance.Id,
+		"isOn": instance.IsOn,
+		"media": maps.Map{
+			"type":            instance.MessageMedia.Type,
+			"name":            instance.MessageMedia.Name,
+			"userDescription": instance.MessageMedia.UserDescription,
+		},
+		"description": instance.Description,
+		"params":      mediaParams,
+	}
+
+	this.Show()
+}
+
+func (this *TestAction) RunPost(params struct {
+	InstanceId int64
+	Subject    string
+	Body       string
+	User       string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	params.Must.
+		Field("instanceId", params.InstanceId).
+		Gt(0, "请选择正确的媒介")
+
+	resp, err := this.RPC().MessageTaskRPC().CreateMessageTask(this.AdminContext(), &pb.CreateMessageTaskRequest{
+		RecipientId: 0,
+		InstanceId:  params.InstanceId,
+		User:        params.User,
+		Subject:     params.Subject,
+		Body:        params.Body,
+		IsPrimary:   true,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["taskId"] = resp.MessageTaskId
+
+	defer this.CreateLogInfo("创建媒介测试任务 %d", resp.MessageTaskId)
+
+	this.Success()
+}

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

@@ -0,0 +1,92 @@
+package recipients
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type UpdateAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateAction) Init() {
+	this.Nav("", "", "update")
+}
+
+func (this *UpdateAction) RunGet(params struct {
+	RecipientId int64
+}) {
+	recipientResp, err := this.RPC().MessageRecipientRPC().FindEnabledMessageRecipient(this.AdminContext(), &pb.FindEnabledMessageRecipientRequest{MessageRecipientId: params.RecipientId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	recipient := recipientResp.MessageRecipient
+	if recipient == nil || recipient.Admin == nil || recipient.MessageMediaInstance == nil {
+		this.NotFound("messageRecipient", params.RecipientId)
+		return
+	}
+
+	this.Data["recipient"] = maps.Map{
+		"id": recipient.Id,
+		"admin": maps.Map{
+			"id":       recipient.Admin.Id,
+			"fullname": recipient.Admin.Fullname,
+			"username": recipient.Admin.Username,
+		},
+		"groups": recipient.MessageRecipientGroups,
+		"isOn":   recipient.IsOn,
+		"instance": maps.Map{
+			"id":   recipient.MessageMediaInstance.Id,
+			"name": recipient.MessageMediaInstance.Name,
+		},
+		"user":        recipient.User,
+		"description": recipient.Description,
+	}
+
+	this.Show()
+}
+
+func (this *UpdateAction) RunPost(params struct {
+	RecipientId int64
+
+	AdminId    int64
+	User       string
+	InstanceId int64
+
+	GroupIds    string
+	Description string
+	IsOn        bool
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改媒介接收人 %d", params.RecipientId)
+
+	params.Must.
+		Field("adminId", params.AdminId).
+		Gt(0, "请选择系统用户").
+		Field("instanceId", params.InstanceId).
+		Gt(0, "请选择媒介")
+
+	groupIds := utils.SplitNumbers(params.GroupIds)
+
+	_, err := this.RPC().MessageRecipientRPC().UpdateMessageRecipient(this.AdminContext(), &pb.UpdateMessageRecipientRequest{
+		MessageRecipientId:       params.RecipientId,
+		AdminId:                  params.AdminId,
+		MessageMediaInstanceId:   params.InstanceId,
+		User:                     params.User,
+		MessageRecipientGroupIds: groupIds,
+		Description:              params.Description,
+		IsOn:                     params.IsOn,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -45,6 +45,7 @@ func (this *UpdateAction) RunGet(params struct {
 		"username":     admin.Username,
 		"isOn":         admin.IsOn,
 		"isSuper":      admin.IsSuper,
+		"canLogin":     admin.CanLogin,
 		"otpLoginIsOn": otpLoginIsOn,
 	}
 
@@ -76,6 +77,7 @@ func (this *UpdateAction) RunPost(params struct {
 	ModuleCodes []string
 	IsOn        bool
 	IsSuper     bool
+	CanLogin    bool
 
 	// OTP
 	OtpOn bool
@@ -139,6 +141,7 @@ func (this *UpdateAction) RunPost(params struct {
 		ModulesJSON: modulesJSON,
 		IsSuper:     params.IsSuper,
 		IsOn:        params.IsOn,
+		CanLogin:    params.CanLogin,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -36,6 +36,15 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["activeState"] = params.ActiveState
 	this.Data["keyword"] = params.Keyword
 
+	countAllResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
+		NodeClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["countAll"] = countAllResp.Count
+
 	countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
 		NodeClusterId: params.ClusterId,
 		GroupId:       params.GroupId,
@@ -194,5 +203,15 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["regions"] = regionMaps
 
+	// 记录最近访问
+	_, err = this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{
+		ItemType: "cluster",
+		ItemId:   params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Show()
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,6 +3,7 @@ package node
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
@@ -114,17 +115,17 @@ func (this *NodeAction) RunGet(params struct {
 		grantMap := maps.Map{}
 		grantId := loginParams.GetInt64("grantId")
 		if grantId > 0 {
-			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: grantId})
+			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
 			if err != nil {
 				this.ErrorPage(err)
 				return
 			}
-			if grantResp.Grant != nil {
+			if grantResp.NodeGrant != nil {
 				grantMap = maps.Map{
-					"id":         grantResp.Grant.Id,
-					"name":       grantResp.Grant.Name,
-					"method":     grantResp.Grant.Method,
-					"methodName": grantutils.FindGrantMethodName(grantResp.Grant.Method),
+					"id":         grantResp.NodeGrant.Id,
+					"name":       grantResp.NodeGrant.Name,
+					"method":     grantResp.NodeGrant.Method,
+					"methodName": grantutils.FindGrantMethodName(grantResp.NodeGrant.Method),
 				}
 			}
 		}
@@ -185,6 +186,33 @@ func (this *NodeAction) 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",
+		}
+	}
+
 	this.Data["node"] = maps.Map{
 		"id":          node.Id,
 		"name":        node.Name,
@@ -199,24 +227,29 @@ func (this *NodeAction) RunGet(params struct {
 		"isOn":        node.IsOn,
 
 		"status": maps.Map{
-			"isActive":         status.IsActive,
-			"updatedAt":        status.UpdatedAt,
-			"hostname":         status.Hostname,
-			"cpuUsage":         status.CPUUsage,
-			"cpuUsageText":     fmt.Sprintf("%.2f%%", status.CPUUsage*100),
-			"memUsage":         status.MemoryUsage,
-			"memUsageText":     fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
-			"connectionCount":  status.ConnectionCount,
-			"buildVersion":     status.BuildVersion,
-			"cpuPhysicalCount": status.CPUPhysicalCount,
-			"cpuLogicalCount":  status.CPULogicalCount,
-			"load1m":           fmt.Sprintf("%.2f", status.Load1m),
-			"load5m":           fmt.Sprintf("%.2f", status.Load5m),
-			"load15m":          fmt.Sprintf("%.2f", status.Load15m),
+			"isActive":             status.IsActive,
+			"updatedAt":            status.UpdatedAt,
+			"hostname":             status.Hostname,
+			"cpuUsage":             status.CPUUsage,
+			"cpuUsageText":         fmt.Sprintf("%.2f%%", status.CPUUsage*100),
+			"memUsage":             status.MemoryUsage,
+			"memUsageText":         fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
+			"connectionCount":      status.ConnectionCount,
+			"buildVersion":         status.BuildVersion,
+			"cpuPhysicalCount":     status.CPUPhysicalCount,
+			"cpuLogicalCount":      status.CPULogicalCount,
+			"load1m":               fmt.Sprintf("%.2f", status.Load1m),
+			"load5m":               fmt.Sprintf("%.2f", status.Load5m),
+			"load15m":              fmt.Sprintf("%.2f", status.Load15m),
+			"cacheTotalDiskSize":   numberutils.FormatBytes(status.CacheTotalDiskSize),
+			"cacheTotalMemorySize": numberutils.FormatBytes(status.CacheTotalMemorySize),
 		},
 
 		"group":  groupMap,
 		"region": regionMap,
+
+		"maxCacheDiskCapacity":   maxCacheDiskCapacity,
+		"maxCacheMemoryCapacity": maxCacheMemoryCapacity,
 	}
 
 	this.Show()

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

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

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

@@ -7,6 +7,7 @@ import (
 	"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/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
@@ -114,17 +115,17 @@ func (this *UpdateAction) RunGet(params struct {
 		grantMap := maps.Map{}
 		grantId := loginParams.GetInt64("grantId")
 		if grantId > 0 {
-			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: grantId})
+			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
 			if err != nil {
 				this.ErrorPage(err)
 				return
 			}
-			if grantResp.Grant != nil {
+			if grantResp.NodeGrant != nil {
 				grantMap = maps.Map{
-					"id":         grantResp.Grant.Id,
-					"name":       grantResp.Grant.Name,
-					"method":     grantResp.Grant.Method,
-					"methodName": grantutils.FindGrantMethodName(grantResp.Grant.Method),
+					"id":         grantResp.NodeGrant.Id,
+					"name":       grantResp.NodeGrant.Name,
+					"method":     grantResp.NodeGrant.Method,
+					"methodName": grantutils.FindGrantMethodName(grantResp.NodeGrant.Method),
 				}
 			}
 		}
@@ -156,16 +157,45 @@ 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",
+		}
+	}
+
 	this.Data["node"] = maps.Map{
-		"id":          node.Id,
-		"name":        node.Name,
-		"ipAddresses": ipAddressMaps,
-		"cluster":     clusterMap,
-		"login":       loginMap,
-		"maxCPU":      node.MaxCPU,
-		"isOn":        node.IsOn,
-		"group":       groupMap,
-		"region":      regionMap,
+		"id":                     node.Id,
+		"name":                   node.Name,
+		"ipAddresses":            ipAddressMaps,
+		"cluster":                clusterMap,
+		"login":                  loginMap,
+		"maxCPU":                 node.MaxCPU,
+		"isOn":                   node.IsOn,
+		"group":                  groupMap,
+		"region":                 regionMap,
+		"maxCacheDiskCapacity":   maxCacheDiskCapacity,
+		"maxCacheMemoryCapacity": maxCacheMemoryCapacity,
 	}
 
 	// 所有集群
@@ -190,18 +220,20 @@ func (this *UpdateAction) RunGet(params struct {
 }
 
 func (this *UpdateAction) RunPost(params struct {
-	LoginId         int64
-	NodeId          int64
-	GroupId         int64
-	RegionId        int64
-	Name            string
-	IPAddressesJSON []byte `alias:"ipAddressesJSON"`
-	ClusterId       int64
-	GrantId         int64
-	SshHost         string
-	SshPort         int
-	MaxCPU          int32
-	IsOn            bool
+	LoginId                    int64
+	NodeId                     int64
+	GroupId                    int64
+	RegionId                   int64
+	Name                       string
+	IPAddressesJSON            []byte `alias:"ipAddressesJSON"`
+	ClusterId                  int64
+	GrantId                    int64
+	SshHost                    string
+	SshPort                    int
+	MaxCPU                     int32
+	IsOn                       bool
+	MaxCacheDiskCapacityJSON   []byte
+	MaxCacheMemoryCapacityJSON []byte
 
 	DnsDomainId   int64
 	DnsRoutesJSON []byte
@@ -258,18 +290,49 @@ func (this *UpdateAction) RunPost(params struct {
 		}.AsJSON(),
 	}
 
+	// 缓存硬盘 & 内存容量
+	var pbMaxCacheDiskCapacity *pb.SizeCapacity
+	if len(params.MaxCacheDiskCapacityJSON) > 0 {
+		var sizeCapacity = &shared.SizeCapacity{}
+		err := json.Unmarshal(params.MaxCacheDiskCapacityJSON, sizeCapacity)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		pbMaxCacheDiskCapacity = &pb.SizeCapacity{
+			Count: sizeCapacity.Count,
+			Unit:  sizeCapacity.Unit,
+		}
+	}
+
+	var pbMaxCacheMemoryCapacity *pb.SizeCapacity
+	if len(params.MaxCacheMemoryCapacityJSON) > 0 {
+		var sizeCapacity = &shared.SizeCapacity{}
+		err := json.Unmarshal(params.MaxCacheMemoryCapacityJSON, sizeCapacity)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		pbMaxCacheMemoryCapacity = &pb.SizeCapacity{
+			Count: sizeCapacity.Count,
+			Unit:  sizeCapacity.Unit,
+		}
+	}
+
 	// 保存
 	_, err := this.RPC().NodeRPC().UpdateNode(this.AdminContext(), &pb.UpdateNodeRequest{
-		NodeId:        params.NodeId,
-		GroupId:       params.GroupId,
-		RegionId:      params.RegionId,
-		Name:          params.Name,
-		NodeClusterId: params.ClusterId,
-		Login:         loginInfo,
-		MaxCPU:        params.MaxCPU,
-		IsOn:          params.IsOn,
-		DnsDomainId:   params.DnsDomainId,
-		DnsRoutes:     dnsRouteCodes,
+		NodeId:                 params.NodeId,
+		GroupId:                params.GroupId,
+		RegionId:               params.RegionId,
+		Name:                   params.Name,
+		NodeClusterId:          params.ClusterId,
+		Login:                  loginInfo,
+		MaxCPU:                 params.MaxCPU,
+		IsOn:                   params.IsOn,
+		DnsDomainId:            params.DnsDomainId,
+		DnsRoutes:              dnsRouteCodes,
+		MaxCacheDiskCapacity:   pbMaxCacheDiskCapacity,
+		MaxCacheMemoryCapacity: pbMaxCacheMemoryCapacity,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

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

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

@@ -6,7 +6,9 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/dns"
 	firewallActions "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/firewall-actions"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/health"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/message"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/services"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/thresholds"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/toa"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/waf"
 	clusters "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils"
@@ -36,6 +38,12 @@ func init() {
 			Prefix("/clusters/cluster/settings/dns").
 			GetPost("", new(dns.IndexAction)).
 
+			// 消息
+			Prefix("/clusters/cluster/settings/message").
+			GetPost("", new(message.IndexAction)).
+			Get("/selectReceiverPopup", new(message.SelectReceiverPopupAction)).
+			Post("/selectedReceivers", new(message.SelectedReceiversAction)).
+
 			// TOA
 			Prefix("/clusters/cluster/settings/toa").
 			GetPost("", new(toa.IndexAction)).
@@ -52,6 +60,13 @@ func init() {
 			GetPost("/updatePopup", new(firewallActions.UpdatePopupAction)).
 			Post("/delete", new(firewallActions.DeleteAction)).
 
+			// 阈值
+			Prefix("/clusters/cluster/settings/thresholds").
+			Get("", new(thresholds.IndexAction)).
+			GetPost("/createPopup", new(thresholds.CreatePopupAction)).
+			GetPost("/updatePopup", new(thresholds.UpdatePopupAction)).
+			Post("/delete", new(thresholds.DeleteAction)).
+
 			EndAll()
 	})
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,6 +2,7 @@ package clusterutils
 
 import (
 	"encoding/json"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
@@ -23,10 +24,10 @@ func NewClusterHelper() *ClusterHelper {
 	return &ClusterHelper{}
 }
 
-func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) {
+func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool) {
 	action := actionPtr.Object()
 	if action.Request.Method != http.MethodGet {
-		return
+		return true
 	}
 
 	action.Data["teaMenu"] = "clusters"
@@ -66,6 +67,8 @@ func (this *ClusterHelper) BeforeAction(actionPtr actions.ActionWrapper) {
 			action.Data["leftMenuItems"] = this.createSettingMenu(cluster, secondMenuItem)
 		}
 	}
+
+	return true
 }
 
 // 设置菜单
@@ -115,6 +118,31 @@ func (this *ClusterHelper) createSettingMenu(cluster *pb.NodeCluster, selectedIt
 		"isActive": selectedItem == "dns",
 		"isOn":     cluster.DnsDomainId > 0 || len(cluster.DnsName) > 0,
 	})
+	if teaconst.IsPlus {
+		hasThresholds, _ := this.checkThresholds(cluster.Id)
+		items = append(items, maps.Map{
+			"name":     "阈值设置",
+			"url":      "/clusters/cluster/settings/thresholds?clusterId=" + clusterId,
+			"isActive": selectedItem == "threshold",
+			"isOn":     hasThresholds,
+		})
+	}
+	if teaconst.IsPlus {
+		hasMessageReceivers, _ := this.checkMessages(cluster.Id)
+		items = append(items, maps.Map{
+			"name":     "消息通知",
+			"url":      "/clusters/cluster/settings/message?clusterId=" + clusterId,
+			"isActive": selectedItem == "message",
+			"isOn":     hasMessageReceivers,
+		})
+	}
+
+	items = append(items, maps.Map{
+		"name":     "-",
+		"url":      "",
+		"isActive": false,
+	})
+
 	items = append(items, maps.Map{
 		"name":     "系统服务",
 		"url":      "/clusters/cluster/settings/services?clusterId=" + clusterId,
@@ -161,3 +189,34 @@ func (this *ClusterHelper) checkFirewallActions(clusterId int64) (bool, error) {
 	}
 	return resp.Count > 0, nil
 }
+
+// 检查阈值是否已经设置
+func (this *ClusterHelper) checkThresholds(clusterId int64) (bool, error) {
+	rpcClient, err := rpc.SharedRPC()
+	if err != nil {
+		return false, err
+	}
+	resp, err := rpcClient.NodeThresholdRPC().CountAllEnabledNodeThresholds(rpcClient.Context(0), &pb.CountAllEnabledNodeThresholdsRequest{
+		Role:          "node",
+		NodeClusterId: clusterId,
+	})
+	if err != nil {
+		return false, err
+	}
+	return resp.Count > 0, nil
+}
+
+// 检查消息通知是否已经设置
+func (this *ClusterHelper) checkMessages(clusterId int64) (bool, error) {
+	rpcClient, err := rpc.SharedRPC()
+	if err != nil {
+		return false, err
+	}
+	resp, err := rpcClient.MessageReceiverRPC().CountAllEnabledMessageReceivers(rpcClient.Context(0), &pb.CountAllEnabledMessageReceiversRequest{
+		NodeClusterId: clusterId,
+	})
+	if err != nil {
+		return false, err
+	}
+	return resp.Count > 0, nil
+}

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

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

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

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

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

@@ -38,7 +38,7 @@ func (this *DeleteAction) RunPost(params struct {
 	}
 
 	// 删除
-	_, err = this.RPC().NodeGrantRPC().DisableNodeGrant(this.AdminContext(), &pb.DisableNodeGrantRequest{GrantId: params.GrantId})
+	_, err = this.RPC().NodeGrantRPC().DisableNodeGrant(this.AdminContext(), &pb.DisableNodeGrantRequest{NodeGrantId: params.GrantId})
 	if err != nil {
 		this.ErrorPage(err)
 		return

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

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
+	"strings"
 )
 
 type GrantAction struct {
@@ -18,26 +19,26 @@ func (this *GrantAction) Init() {
 func (this *GrantAction) RunGet(params struct {
 	GrantId int64
 }) {
-	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: params.GrantId})
+	grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: params.GrantId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	if grantResp.Grant == nil {
+	if grantResp.NodeGrant == nil {
 		this.WriteString("can not find the grant")
 		return
 	}
 
 	// TODO 处理节点专用的认证
 
-	grant := grantResp.Grant
+	grant := grantResp.NodeGrant
 	this.Data["grant"] = maps.Map{
 		"id":          grant.Id,
 		"name":        grant.Name,
 		"method":      grant.Method,
 		"methodName":  grantutils.FindGrantMethodName(grant.Method),
 		"username":    grant.Username,
-		"password":    grant.Password,
+		"password":    strings.Repeat("*", len(grant.Password)),
 		"privateKey":  grant.PrivateKey,
 		"description": grant.Description,
 		"su":          grant.Su,

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -24,9 +24,10 @@ func (this *IndexAction) RunGet(params struct {
 	Keyword    string
 	SearchType string
 }) {
+	isSearching := len(params.Keyword) > 0
 	this.Data["keyword"] = params.Keyword
 	this.Data["searchType"] = params.SearchType
-	this.Data["isSearching"] = len(params.Keyword) > 0
+	this.Data["isSearching"] = isSearching
 
 	// 搜索节点
 	if params.SearchType == "node" && len(params.Keyword) > 0 {
@@ -34,6 +35,23 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 
+	// 常用的节点
+	latestClusterMaps := []maps.Map{}
+	if !isSearching {
+		clustersResp, err := this.RPC().NodeClusterRPC().FindLatestNodeClusters(this.AdminContext(), &pb.FindLatestNodeClustersRequest{Size: 6})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		for _, cluster := range clustersResp.NodeClusters {
+			latestClusterMaps = append(latestClusterMaps, maps.Map{
+				"id":   cluster.Id,
+				"name": cluster.Name,
+			})
+		}
+	}
+	this.Data["latestClusters"] = latestClusterMaps
+
 	// 搜索集群
 	countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClusters(this.AdminContext(), &pb.CountAllEnabledNodeClustersRequest{
 		Keyword: params.Keyword,

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

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

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

@@ -0,0 +1,19 @@
+package logs
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/iwind/TeaGo"
+)
+
+func init() {
+	TeaGo.BeforeStart(func(server *TeaGo.Server) {
+		server.
+			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeNode)).
+			Data("teaMenu", "clusters").
+			Data("teaSubMenu", "log").
+			Prefix("/clusters/logs").
+			Get("", new(IndexAction)).
+			EndAll()
+	})
+}

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

@@ -77,8 +77,10 @@ func (this *PricesAction) formatBits(bits int64) string {
 		sizeHuman = fmt.Sprintf("%.2fGBPS", float64(bits)/1000/1000/1000)
 	} else if bits < 1_000_000_000_000_000 {
 		sizeHuman = fmt.Sprintf("%.2fTBPS", float64(bits)/1000/1000/1000/1000)
-	} else {
+	} else if bits < 1_000_000_000_000_000_000 {
 		sizeHuman = fmt.Sprintf("%.2fPBPS", float64(bits)/1000/1000/1000/1000/1000)
+	} else {
+		sizeHuman = fmt.Sprintf("%.2fEBPS", float64(bits)/1000/1000/1000/1000/1000/1000)
 	}
 	return sizeHuman
 }

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

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

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

@@ -55,6 +55,10 @@ func (this *CreatePopupAction) RunPost(params struct {
 	ParamApiKey    string
 	ParamApiSecret string
 
+	// CloudFlare
+	CloudFlareAPIKey string
+	CloudFlareEmail  string
+
 	// CustomHTTP
 	ParamCustomHTTPURL    string
 	ParamCustomHTTPSecret string
@@ -97,6 +101,14 @@ func (this *CreatePopupAction) RunPost(params struct {
 
 		apiParams["apiKey"] = params.ParamApiKey
 		apiParams["apiSecret"] = params.ParamApiSecret
+	case "cloudFlare":
+		params.Must.
+			Field("cloudFlareAPIKey", params.CloudFlareAPIKey).
+			Require("请输入API密钥").
+			Field("cloudFlareEmail", params.CloudFlareEmail).
+			Email("请输入正确格式的邮箱地址")
+		apiParams["apiKey"] = params.CloudFlareAPIKey
+		apiParams["email"] = params.CloudFlareEmail
 	case "customHTTP":
 		params.Must.
 			Field("paramCustomHTTPURL", params.ParamCustomHTTPURL).

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

@@ -84,6 +84,10 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	ParamApiKey    string
 	ParamApiSecret string
 
+	// CloudFlare
+	CloudFlareAPIKey string
+	CloudFlareEmail  string
+
 	// CustomHTTP
 	ParamCustomHTTPURL    string
 	ParamCustomHTTPSecret string
@@ -128,6 +132,14 @@ func (this *UpdatePopupAction) RunPost(params struct {
 
 		apiParams["apiKey"] = params.ParamApiKey
 		apiParams["apiSecret"] = params.ParamApiSecret
+	case "cloudFlare":
+		params.Must.
+			Field("cloudFlareAPIKey", params.CloudFlareAPIKey).
+			Require("请输入API密钥").
+			Field("cloudFlareEmail", params.CloudFlareEmail).
+			Email("请输入正确格式的邮箱地址")
+		apiParams["apiKey"] = params.CloudFlareAPIKey
+		apiParams["email"] = params.CloudFlareEmail
 	case "customHTTP":
 		params.Must.
 			Field("paramCustomHTTPURL", params.ParamCustomHTTPURL).

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

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

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

@@ -16,30 +16,121 @@ func (this *IndexAction) Init() {
 	this.SecondMenu("list")
 }
 
-func (this *IndexAction) RunGet(params struct{}) {
-	countResp, err := this.RPC().ACMETaskRPC().CountAllEnabledACMETasks(this.AdminContext(), &pb.CountAllEnabledACMETasksRequest{
-		AdminId: this.AdminId(),
-		UserId:  0,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	count := countResp.Count
-	page := this.NewPage(count)
-	this.Data["page"] = page.AsHTML()
+func (this *IndexAction) RunGet(params struct {
+	Type    string
+	Keyword string
+}) {
+	this.Data["type"] = params.Type
+	this.Data["keyword"] = params.Keyword
 
-	tasksResp, err := this.RPC().ACMETaskRPC().ListEnabledACMETasks(this.AdminContext(), &pb.ListEnabledACMETasksRequest{
-		AdminId: this.AdminId(),
-		UserId:  0,
-		Offset:  page.Offset,
-		Size:    page.Size,
-	})
+	countAll := int64(0)
+	countAvailable := int64(0)
+	countExpired := int64(0)
+	count7Days := int64(0)
+	count30Days := int64(0)
+
+	// 计算数量
+	{
+		// all
+		resp, err := this.RPC().ACMETaskRPC().CountAllEnabledACMETasks(this.AdminContext(), &pb.CountAllEnabledACMETasksRequest{
+			Keyword: params.Keyword,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		countAll = resp.Count
+
+		// available
+		resp, err = this.RPC().ACMETaskRPC().CountAllEnabledACMETasks(this.AdminContext(), &pb.CountAllEnabledACMETasksRequest{
+			IsAvailable: true,
+			Keyword:     params.Keyword,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		countAvailable = resp.Count
+
+		// expired
+		resp, err = this.RPC().ACMETaskRPC().CountAllEnabledACMETasks(this.AdminContext(), &pb.CountAllEnabledACMETasksRequest{
+			IsExpired: true,
+			Keyword:   params.Keyword,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		countExpired = resp.Count
+
+		// expire in 7 days
+		resp, err = this.RPC().ACMETaskRPC().CountAllEnabledACMETasks(this.AdminContext(), &pb.CountAllEnabledACMETasksRequest{
+			ExpiringDays: 7,
+			Keyword:      params.Keyword,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		count7Days = resp.Count
+
+		// expire in 30 days
+		resp, err = this.RPC().ACMETaskRPC().CountAllEnabledACMETasks(this.AdminContext(), &pb.CountAllEnabledACMETasksRequest{
+			ExpiringDays: 30,
+			Keyword:      params.Keyword,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		count30Days = resp.Count
+	}
+
+	this.Data["countAll"] = countAll
+	this.Data["countAvailable"] = countAvailable
+	this.Data["countExpired"] = countExpired
+	this.Data["count7Days"] = count7Days
+	this.Data["count30Days"] = count30Days
+
+	// 分页
+	var page *actionutils.Page
+	var tasksResp *pb.ListEnabledACMETasksResponse
+	var err error
+	switch params.Type {
+	case "":
+		page = this.NewPage(countAll)
+		tasksResp, err = this.RPC().ACMETaskRPC().ListEnabledACMETasks(this.AdminContext(), &pb.ListEnabledACMETasksRequest{
+			Offset:  page.Offset,
+			Size:    page.Size,
+			Keyword: params.Keyword,
+		})
+	case "available":
+		page = this.NewPage(countAvailable)
+		tasksResp, err = this.RPC().ACMETaskRPC().ListEnabledACMETasks(this.AdminContext(), &pb.ListEnabledACMETasksRequest{IsAvailable: true, Offset: page.Offset, Size: page.Size, Keyword: params.Keyword})
+	case "expired":
+		page = this.NewPage(countExpired)
+		tasksResp, err = this.RPC().ACMETaskRPC().ListEnabledACMETasks(this.AdminContext(), &pb.ListEnabledACMETasksRequest{IsExpired: true, Offset: page.Offset, Size: page.Size, Keyword: params.Keyword})
+	case "7days":
+		page = this.NewPage(count7Days)
+		tasksResp, err = this.RPC().ACMETaskRPC().ListEnabledACMETasks(this.AdminContext(), &pb.ListEnabledACMETasksRequest{ExpiringDays: 7, Offset: page.Offset, Size: page.Size, Keyword: params.Keyword})
+	case "30days":
+		page = this.NewPage(count30Days)
+		tasksResp, err = this.RPC().ACMETaskRPC().ListEnabledACMETasks(this.AdminContext(), &pb.ListEnabledACMETasksRequest{ExpiringDays: 30, Offset: page.Offset, Size: page.Size, Keyword: params.Keyword})
+	default:
+		page = this.NewPage(countAll)
+		tasksResp, err = this.RPC().ACMETaskRPC().ListEnabledACMETasks(this.AdminContext(), &pb.ListEnabledACMETasksRequest{
+			Keyword: params.Keyword,
+			Offset:  page.Offset,
+			Size:    page.Size,
+		})
+	}
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
+	this.Data["page"] = page.AsHTML()
+
 	taskMaps := []maps.Map{}
 	for _, task := range tasksResp.AcmeTasks {
 		if task.AcmeUser == nil {

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

@@ -138,6 +138,8 @@ func (this *IndexAction) RunGet(params struct {
 		page = this.NewPage(countAll)
 		listResp, err = this.RPC().SSLCertRPC().ListSSLCerts(this.AdminContext(), &pb.ListSSLCertsRequest{
 			Keyword: params.Keyword,
+			Offset:  page.Offset,
+			Size:    page.Size,
 		})
 	}
 	if err != nil {

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

@@ -13,7 +13,7 @@ import (
 	"time"
 )
 
-// 选择证书
+// SelectPopupAction 选择证书
 type SelectPopupAction struct {
 	actionutils.ParentAction
 }
@@ -25,10 +25,12 @@ func (this *SelectPopupAction) Init() {
 func (this *SelectPopupAction) RunGet(params struct {
 	ViewSize        string
 	SelectedCertIds string
+	Keyword         string
 }) {
-	// TODO 支持关键词搜索
 	// TODO 列出常用和最新的证书供用户选择
 
+	this.Data["keyword"] = params.Keyword
+
 	// 已经选择的证书
 	selectedCertIds := []string{}
 	if len(params.SelectedCertIds) > 0 {
@@ -40,7 +42,9 @@ func (this *SelectPopupAction) RunGet(params struct {
 	}
 	this.Data["viewSize"] = params.ViewSize
 
-	countResp, err := this.RPC().SSLCertRPC().CountSSLCerts(this.AdminContext(), &pb.CountSSLCertRequest{})
+	countResp, err := this.RPC().SSLCertRPC().CountSSLCerts(this.AdminContext(), &pb.CountSSLCertRequest{
+		Keyword: params.Keyword,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -50,8 +54,9 @@ func (this *SelectPopupAction) RunGet(params struct {
 	this.Data["page"] = page.AsHTML()
 
 	listResp, err := this.RPC().SSLCertRPC().ListSSLCerts(this.AdminContext(), &pb.ListSSLCertsRequest{
-		Offset: page.Offset,
-		Size:   page.Size,
+		Keyword: params.Keyword,
+		Offset:  page.Offset,
+		Size:    page.Size,
 	})
 
 	certConfigs := []*sslconfigs.SSLCertConfig{}

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

@@ -12,7 +12,7 @@ import (
 	"github.com/iwind/TeaGo/types"
 	"net/http"
 	"strconv"
-	strings "strings"
+	"strings"
 )
 
 type PurgeAction struct {
@@ -53,6 +53,7 @@ func (this *PurgeAction) RunGet(params struct {
 func (this *PurgeAction) RunPost(params struct {
 	CachePolicyId int64
 	ClusterId     int64
+	Type          string
 	Keys          string
 	Must          *actions.Must
 }) {
@@ -96,6 +97,11 @@ func (this *PurgeAction) RunPost(params struct {
 		CachePolicyJSON: cachePolicyJSON,
 		Keys:            realKeys,
 	}
+	if params.Type == "prefix" {
+		msg.Type = messageconfigs.PurgeCacheMessageTypeDir
+	} else {
+		msg.Type = messageconfigs.PurgeCacheMessageTypeFile
+	}
 	results, err := nodeutils.SendMessageToCluster(this.AdminContext(), params.ClusterId, messageconfigs.MessageCodePurgeCache, msg, 10)
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -63,8 +63,13 @@ func (this *UpdateAction) RunPost(params struct {
 	Description string
 	IsOn        bool
 
+	RefsJSON []byte
+
 	Must *actions.Must
 }) {
+	// 创建日志
+	defer this.CreateLog(oplogs.LevelInfo, "修改缓存策略：%d", params.CachePolicyId)
+
 	params.Must.
 		Field("name", params.Name).
 		Require("请输入策略名称")
@@ -104,6 +109,22 @@ func (this *UpdateAction) RunPost(params struct {
 		this.ErrorPage(err)
 		return
 	}
+
+	// 校验缓存条件
+	refs := []*serverconfigs.HTTPCacheRef{}
+	if len(params.RefsJSON) > 0 {
+		err = json.Unmarshal(params.RefsJSON, &refs)
+		if err != nil {
+			this.Fail("缓存条件解析失败：" + err.Error())
+		}
+		for _, ref := range refs {
+			err = ref.Init()
+			if err != nil {
+				this.Fail("缓存条件校验失败：" + err.Error())
+			}
+		}
+	}
+
 	_, err = this.RPC().HTTPCachePolicyRPC().UpdateHTTPCachePolicy(this.AdminContext(), &pb.UpdateHTTPCachePolicyRequest{
 		HttpCachePolicyId: params.CachePolicyId,
 		IsOn:              params.IsOn,
@@ -120,8 +141,15 @@ func (this *UpdateAction) RunPost(params struct {
 		return
 	}
 
-	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "修改缓存策略：%d", params.CachePolicyId)
+	// 修改缓存条件
+	_, 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/fixLog.go

@@ -0,0 +1,24 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package servers
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type FixLogAction struct {
+	actionutils.ParentAction
+}
+
+func (this *FixLogAction) RunPost(params struct {
+	LogId int64
+}) {
+	_, err := this.RPC().NodeLogRPC().FixNodeLog(this.AdminContext(), &pb.FixNodeLogRequest{NodeLogId: params.LogId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -4,9 +4,11 @@ import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
 )
 
 type IndexAction struct {
@@ -30,10 +32,29 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["auditingFlag"] = params.AuditingFlag
 	this.Data["checkDNS"] = params.CheckDNS
 
+	isSearching := params.AuditingFlag == 1 || params.ClusterId > 0 || params.GroupId > 0 || len(params.Keyword) > 0
+
 	if params.AuditingFlag > 0 {
 		this.Data["firstMenuItem"] = "auditing"
 	}
 
+	// 常用的服务
+	latestServerMaps := []maps.Map{}
+	if !isSearching {
+		serversResp, err := this.RPC().ServerRPC().FindLatestServers(this.AdminContext(), &pb.FindLatestServersRequest{Size: 6})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		for _, server := range serversResp.Servers {
+			latestServerMaps = append(latestServerMaps, maps.Map{
+				"id":   server.Id,
+				"name": server.Name,
+			})
+		}
+	}
+	this.Data["latestServers"] = latestServerMaps
+
 	// 审核中的数量
 	countAuditingResp, err := this.RPC().ServerRPC().CountAllEnabledServersMatch(this.AdminContext(), &pb.CountAllEnabledServersMatchRequest{
 		AuditingFlag: 1,
@@ -231,5 +252,48 @@ func (this *IndexAction) RunGet(params struct {
 	// 是否有用户管理权限
 	this.Data["canVisitUser"] = configloaders.AllowModule(this.AdminId(), configloaders.AdminModuleCodeUser)
 
+	// 显示服务相关的日志
+	errorLogsResp, err := this.RPC().NodeLogRPC().ListNodeLogs(this.AdminContext(), &pb.ListNodeLogsRequest{
+		NodeId:     0,
+		Role:       "node",
+		Offset:     0,
+		Size:       10,
+		Level:      "error",
+		FixedState: int32(configutils.BoolStateNo),
+		AllServers: true,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	errorLogMaps := []maps.Map{}
+	for _, errorLog := range errorLogsResp.NodeLogs {
+		serverResp, err := this.RPC().ServerRPC().FindEnabledUserServerBasic(this.AdminContext(), &pb.FindEnabledUserServerBasicRequest{ServerId: errorLog.ServerId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		server := serverResp.Server
+		if server == nil {
+			// 设置为已修复
+			_, err = this.RPC().NodeLogRPC().FixNodeLog(this.AdminContext(), &pb.FixNodeLogRequest{NodeLogId: errorLog.Id})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+
+			continue
+		}
+
+		errorLogMaps = append(errorLogMaps, maps.Map{
+			"id":          errorLog.Id,
+			"description": errorLog.Description,
+			"createdTime": timeutil.FormatTime("Y-m-d H:i:s", errorLog.CreatedAt),
+			"serverId":    errorLog.ServerId,
+			"serverName":  server.Name,
+		})
+	}
+	this.Data["errorLogs"] = errorLogMaps
+
 	this.Show()
 }

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

@@ -15,6 +15,7 @@ func init() {
 			Get("", new(IndexAction)).
 			GetPost("/create", new(CreateAction)).
 			GetPost("/update", new(UpdateAction)).
+			Post("/fixLog", new(FixLogAction)).
 
 			GetPost("/addPortPopup", new(AddPortPopupAction)).
 			GetPost("/addServerNamePopup", new(AddServerNamePopupAction)).

internal/web/actions/default/servers/server/log/index.go

@@ -24,6 +24,16 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["serverId"] = params.ServerId
 	this.Data["requestId"] = params.RequestId
 
+	// 记录最近使用
+	_, err := this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{
+		ItemType: "server",
+		ItemId:   params.ServerId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	this.Show()
 }