阶段性提交

README.md

@@ -1 +1,29 @@
-![架构](doc/architect-zh.jpg)
+# GoEdge目标
+做一款人人用得起的CDN & WAF系统。
+
+![架构](doc/screenshot.png)
+
+## 特性
+* `免费` - 开源、免费、自由、开放
+* `简单` - 架构简单清晰，安装简单，使用简单，运维简单
+* `高扩展性` - 可以自由扩展新的节点，支持亿级数据
+
+## 文档
+* [新手指南](https://edge.teaos.cn/docs/QuickStart/Index.md)
+* [完整文档](https://edge.teaos.cn/docs)
+* [开发者指南](https://edge.teaos.cn/docs/Developer/Build.md)
+
+## 架构
+![架构](doc/architect-zh.jpg)
+
+其中的组件源码地址如下：
+* [边缘节点](https://github.com/TeaOSLab/EdgeNode)
+* [API节点](https://github.com/TeaOSLab/EdgeAPI)
+* [管理平台](https://github.com/TeaOSLab/EdgeAdmin)
+
+## 联系我们
+有什么问题和建议都可以加入QQ群 `659832182`。
+
+## 感谢
+* 感谢[JetBrains公司](https://www.jetbrains.com/)提供免费的IDE开发Licence。
+* 感谢[Gitee](https://gitee.com/)提供国内源代码托管平台

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/configs/.gitignore

@@ -1,4 +1,5 @@
+api.yaml
 server.yaml
 api_db.yaml
-api-123.yaml
-*.pem
+*.pem
+tip.json

build/configs/api.yaml

@@ -1,6 +0,0 @@
-rpc:
-  endpoints:
-  - http://192.168.2.40:8003
-nodeId: H6sjDf779jimnVPnBFSgZxvr6Ca0wQ0z
-secret: hMHjmEng0SIcT3yiA3HIoUjogwAC9cur
-

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()
@@ -22,6 +30,15 @@ func main() {
 		err := nodes.NewAdminNode().InstallSystemService()
 		if err != nil {
 			fmt.Println("[ERROR]install failed: " + err.Error())
+			return
+		}
+		fmt.Println("done")
+	})
+	app.On("reset", func() {
+		err := configs.ResetAPIConfig()
+		if err != nil {
+			fmt.Println("[ERROR]reset failed: " + err.Error())
+			return
 		}
 		fmt.Println("done")
 	})

go.mod

@@ -9,13 +9,18 @@ require (
 	github.com/cespare/xxhash v1.1.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/go-yaml/yaml v2.1.0+incompatible
-	github.com/iwind/TeaGo v0.0.0-20201206115018-cdd967bfb13d
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/iwind/TeaGo v0.0.0-20210411134150-ddf57e240c2f
 	github.com/miekg/dns v1.1.35
+	github.com/shirou/gopsutil v3.21.5+incompatible // indirect
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/tealeg/xlsx/v3 v3.2.3
 	github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119
-	golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c // indirect
-	google.golang.org/grpc v1.32.0
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
+	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
+	google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced // indirect
+	google.golang.org/grpc v1.38.0
+	google.golang.org/protobuf v1.26.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 )

go.sum

@@ -9,9 +9,11 @@ github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiU
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -19,6 +21,7 @@ github.com/dgryski/go-rendezvous v0.0.0-20200624174652-8d2f3be8b2d9/go.mod h1:cu
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/frankban/quicktest v1.5.0 h1:Tb4jWdSpdjKzTUicPnY61PZxKbDoGa7ABbrReT3gQVY=
 github.com/frankban/quicktest v1.5.0/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
@@ -43,6 +46,9 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -51,11 +57,14 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/iwind/TeaGo v0.0.0-20200923021120-f5d76441fe9e/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
-github.com/iwind/TeaGo v0.0.0-20201206115018-cdd967bfb13d h1:J4ohNUwOqCQkY62LFwaygfGtHJj+87pnzr+RJxEYSBo=
-github.com/iwind/TeaGo v0.0.0-20201206115018-cdd967bfb13d/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
+github.com/iwind/TeaGo v0.0.0-20210411134150-ddf57e240c2f h1:r2O8PONj/KiuZjJHVHn7KlCePUIjNtgAmvLfgRafQ8o=
+github.com/iwind/TeaGo v0.0.0-20210411134150-ddf57e240c2f/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
 github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -65,12 +74,10 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs=
 github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -93,18 +100,22 @@ github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/shabbyrobe/xmlwriter v0.0.0-20200208144257-9fca06d00ffa h1:2cO3RojjYl3hVTbEvJVqrMaFmORhL6O06qdW42toftk=
 github.com/shabbyrobe/xmlwriter v0.0.0-20200208144257-9fca06d00ffa/go.mod h1:Yjr3bdWaVWyME1kha7X0jsz3k2DgXNa1Pj3XGyUAbx8=
+github.com/shirou/gopsutil v3.21.5+incompatible h1:OloQyEerMi7JUrXiNzy8wQ5XN+baemxSl12QgIzt0jc=
+github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tealeg/xlsx/v3 v3.2.3 h1:MXnVh+9Y8cUglowItTy2HL3Kv6z+q/0aNjeKuTsVqZQ=
 github.com/tealeg/xlsx/v3 v3.2.3/go.mod h1:0hGmAEoZ48SS1ZAE6eqZJkJVXgOMY+8a33vjXa8S8HA=
 github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119 h1:YyPWX3jLOtYKulBR6AScGIs74lLrJcgeKRwcbAuQOG4=
 github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119/go.mod h1:/nuTSlK+okRfR/vnIPqR89fFKonnWPiZymN5ydRJkX8=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.opentelemetry.io/otel v0.7.0/go.mod h1:aZMyHG5TqDOXEgH2tyLiXSUKly1jT3yqE9PmrzIeCdo=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
@@ -117,9 +128,11 @@ golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+o
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -130,11 +143,15 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 h1:AeiKBIuRw3UomYXSbLy0Mc2dDLfdtbT/IVn4keq83P0=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -150,19 +167,35 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
 golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -170,6 +203,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced h1:c5geK1iMU3cDKtFrCVQIcjR3W+JOZMuhIyICMCTbtus=
+google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
@@ -177,6 +212,8 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0=
 google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -187,6 +224,9 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
@@ -194,6 +234,7 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/configloaders/admin_module.go

@@ -1,6 +1,7 @@
 package configloaders
 
 import (
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
@@ -10,15 +11,17 @@ import (
 type AdminModuleCode = string
 
 const (
-	AdminModuleCodeServer  AdminModuleCode = "server"  // 网站
-	AdminModuleCodeNode    AdminModuleCode = "node"    // 节点
-	AdminModuleCodeDNS     AdminModuleCode = "dns"     // DNS
-	AdminModuleCodeAdmin   AdminModuleCode = "admin"   // 系统用户
-	AdminModuleCodeUser    AdminModuleCode = "user"    // 平台用户
-	AdminModuleCodeFinance AdminModuleCode = "finance" // 财务
-	AdminModuleCodeLog     AdminModuleCode = "log"     // 日志
-	AdminModuleCodeSetting AdminModuleCode = "setting" // 设置
-	AdminModuleCodeCommon  AdminModuleCode = "common"  // 只要登录就可以访问的模块
+	AdminModuleCodeDashboard AdminModuleCode = "dashboard" // 看板
+	AdminModuleCodeServer    AdminModuleCode = "server"    // 网站
+	AdminModuleCodeNode      AdminModuleCode = "node"      // 节点
+	AdminModuleCodeDNS       AdminModuleCode = "dns"       // DNS
+	AdminModuleCodeNS        AdminModuleCode = "ns"        // 域名服务
+	AdminModuleCodeAdmin     AdminModuleCode = "admin"     // 系统用户
+	AdminModuleCodeUser      AdminModuleCode = "user"      // 平台用户
+	AdminModuleCodeFinance   AdminModuleCode = "finance"   // 财务
+	AdminModuleCodeLog       AdminModuleCode = "log"       // 日志
+	AdminModuleCodeSetting   AdminModuleCode = "setting"   // 设置
+	AdminModuleCodeCommon    AdminModuleCode = "common"    // 只要登录就可以访问的模块
 )
 
 var sharedAdminModuleMapping = map[int64]*AdminModuleList{} // adminId => AdminModuleList
@@ -67,7 +70,7 @@ func NotifyAdminModuleMappingChange() error {
 	return err
 }
 
-// 检查用户是否存在
+// CheckAdmin 检查用户是否存在
 func CheckAdmin(adminId int64) bool {
 	locker.Lock()
 	defer locker.Unlock()
@@ -81,7 +84,7 @@ func CheckAdmin(adminId int64) bool {
 	return ok
 }
 
-// 检查模块是否允许访问
+// AllowModule 检查模块是否允许访问
 func AllowModule(adminId int64, module string) bool {
 	locker.Lock()
 	defer locker.Unlock()
@@ -102,14 +105,14 @@ func AllowModule(adminId int64, module string) bool {
 	return false
 }
 
-// 获取管理员第一个可访问模块
+// FindFirstAdminModule 获取管理员第一个可访问模块
 func FindFirstAdminModule(adminId int64) (module AdminModuleCode, ok bool) {
 	locker.Lock()
 	defer locker.Unlock()
 	list, ok2 := sharedAdminModuleMapping[adminId]
 	if ok2 {
 		if list.IsSuper {
-			return AdminModuleCodeServer, true
+			return AdminModuleCodeDashboard, true
 		} else if len(list.Modules) > 0 {
 			return list.Modules[0].Code, true
 		}
@@ -117,7 +120,7 @@ func FindFirstAdminModule(adminId int64) (module AdminModuleCode, ok bool) {
 	return
 }
 
-// 查找某个管理员名称
+// FindAdminFullname 查找某个管理员名称
 func FindAdminFullname(adminId int64) string {
 	locker.Lock()
 	defer locker.Unlock()
@@ -129,9 +132,14 @@ func FindAdminFullname(adminId int64) string {
 	return ""
 }
 
-// 所有权限列表
+// AllModuleMaps 所有权限列表
 func AllModuleMaps() []maps.Map {
-	return []maps.Map{
+	m := []maps.Map{
+		{
+			"name": "看板",
+			"code": AdminModuleCodeDashboard,
+			"url":  "/dashboard",
+		},
 		{
 			"name": "网站服务",
 			"code": AdminModuleCodeServer,
@@ -147,6 +155,15 @@ func AllModuleMaps() []maps.Map {
 			"code": AdminModuleCodeDNS,
 			"url":  "/dns",
 		},
+	}
+	if teaconst.IsPlus {
+		m = append(m, maps.Map{
+			"name": "域名服务",
+			"code": AdminModuleCodeNS,
+			"url":  "/ns",
+		})
+	}
+	m = append(m, []maps.Map{
 		{
 			"name": "平台用户",
 			"code": AdminModuleCodeUser,
@@ -172,5 +189,6 @@ func AllModuleMaps() []maps.Map {
 			"code": AdminModuleCodeSetting,
 			"url":  "/settings",
 		},
-	}
+	}...)
+	return m
 }

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,19 +18,20 @@ type APIConfig struct {
 	Secret string `yaml:"secret"`
 }
 
-// 加载API配置
+// LoadAPIConfig 加载API配置
 func LoadAPIConfig() (*APIConfig, error) {
 	// 候选文件
 	localFile := Tea.ConfigFile("api.yaml")
 	isFromLocal := false
 	paths := []string{localFile}
-	homeDir, err := os.UserHomeDir()
-	if err == nil {
+	homeDir, homeErr := os.UserHomeDir()
+	if homeErr == nil {
 		paths = append(paths, homeDir+"/."+teaconst.ProcessName+"/api.yaml")
 	}
 	paths = append(paths, "/etc/"+teaconst.ProcessName+"/api.yaml")
 
 	var data []byte
+	var err error
 	for _, path := range paths {
 		data, err = ioutil.ReadFile(path)
 		if err == nil {
@@ -58,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 {
@@ -69,8 +113,8 @@ func (this *APIConfig) WriteFile(path string) error {
 	// 写入 ~/ 和 /etc/ 目录，因为是备份需要，所以不需要提示错误信息
 	// 写入 ~/.edge-admin/
 	filename := filepath.Base(path)
-	homeDir, err := os.UserHomeDir()
-	if err == nil {
+	homeDir, homeErr := os.UserHomeDir()
+	if homeErr == nil {
 		dir := homeDir + "/." + teaconst.ProcessName
 		stat, err := os.Stat(dir)
 		if err == nil && stat.IsDir() {
@@ -83,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.9"
+	Version = "0.2.4"
 
 	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")
@@ -71,6 +71,10 @@ func (this *RPCClient) NodeClusterRPC() pb.NodeClusterServiceClient {
 	return pb.NewNodeClusterServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) NodeClusterFirewallActionRPC() pb.NodeClusterFirewallActionServiceClient {
+	return pb.NewNodeClusterFirewallActionServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) NodeGroupRPC() pb.NodeGroupServiceClient {
 	return pb.NewNodeGroupServiceClient(this.pickConn())
 }
@@ -87,10 +91,50 @@ 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())
 }
 
+func (this *RPCClient) ServerClientSystemMonthlyStatRPC() pb.ServerClientSystemMonthlyStatServiceClient {
+	return pb.NewServerClientSystemMonthlyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerClientBrowserMonthlyStatRPC() pb.ServerClientBrowserMonthlyStatServiceClient {
+	return pb.NewServerClientBrowserMonthlyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerRegionCountryMonthlyStatRPC() pb.ServerRegionCountryMonthlyStatServiceClient {
+	return pb.NewServerRegionCountryMonthlyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerRegionProvinceMonthlyStatRPC() pb.ServerRegionProvinceMonthlyStatServiceClient {
+	return pb.NewServerRegionProvinceMonthlyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerRegionCityMonthlyStatRPC() pb.ServerRegionCityMonthlyStatServiceClient {
+	return pb.NewServerRegionCityMonthlyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerRegionProviderMonthlyStatRPC() pb.ServerRegionProviderMonthlyStatServiceClient {
+	return pb.NewServerRegionProviderMonthlyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerHTTPFirewallDailyStatRPC() pb.ServerHTTPFirewallDailyStatServiceClient {
+	return pb.NewServerHTTPFirewallDailyStatServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) ServerDailyStatRPC() pb.ServerDailyStatServiceClient {
+	return pb.NewServerDailyStatServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) ServerGroupRPC() pb.ServerGroupServiceClient {
 	return pb.NewServerGroupServiceClient(this.pickConn())
 }
@@ -107,6 +151,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())
 }
@@ -171,11 +219,19 @@ 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) HTTPAuthPolicyRPC() pb.HTTPAuthPolicyServiceClient {
+	return pb.NewHTTPAuthPolicyServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) SSLCertRPC() pb.SSLCertServiceClient {
 	return pb.NewSSLCertServiceClient(this.pickConn())
 }
@@ -192,6 +248,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())
 }
@@ -236,6 +320,10 @@ func (this *RPCClient) DNSRPC() pb.DNSServiceClient {
 	return pb.NewDNSServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) DNSTaskRPC() pb.DNSTaskServiceClient {
+	return pb.NewDNSTaskServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) ACMEUserRPC() pb.ACMEUserServiceClient {
 	return pb.NewACMEUserServiceClient(this.pickConn())
 }
@@ -252,6 +340,10 @@ func (this *RPCClient) UserBillRPC() pb.UserBillServiceClient {
 	return pb.NewUserBillServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) UserAccessKeyRPC() pb.UserAccessKeyServiceClient {
+	return pb.NewUserAccessKeyServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) LoginRPC() pb.LoginServiceClient {
 	return pb.NewLoginServiceClient(this.pickConn())
 }
@@ -260,7 +352,51 @@ 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())
+}
+
+func (this *RPCClient) NSClusterRPC() pb.NSClusterServiceClient {
+	return pb.NewNSClusterServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSNodeRPC() pb.NSNodeServiceClient {
+	return pb.NewNSNodeServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSDomainRPC() pb.NSDomainServiceClient {
+	return pb.NewNSDomainServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSRecordRPC() pb.NSRecordServiceClient {
+	return pb.NewNSRecordServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSRouteRPC() pb.NSRouteServiceClient {
+	return pb.NewNSRouteServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NSAccessLogRPC() pb.NSAccessLogServiceClient {
+	return pb.NewNSAccessLogServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) MetricItemRPC() pb.MetricItemServiceClient {
+	return pb.NewMetricItemServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) NodeClusterMetricItemRPC() pb.NodeClusterMetricItemServiceClient {
+	return pb.NewNodeClusterMetricItemServiceClient(this.pickConn())
+}
+
+// Context 构造Admin上下文
 func (this *RPCClient) Context(adminId int64) context.Context {
 	ctx := context.Background()
 	m := maps.Map{
@@ -283,7 +419,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{
@@ -306,6 +442,12 @@ 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()
+}
+
 // 初始化
 func (this *RPCClient) init() error {
 	// 重新连接
@@ -333,6 +475,8 @@ func (this *RPCClient) init() error {
 	if len(conns) == 0 {
 		return errors.New("[RPC]no available endpoints")
 	}
+
+	// 这里不需要加锁，因为会和pickConn冲突
 	this.conns = conns
 	return nil
 }

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,74 @@
+// 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/EdgeAdmin/internal/setup"
+	"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(3 * 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 {
+	// 如果还没有安装直接返回
+	if !setup.IsConfigured() {
+		return nil
+	}
+
+	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/tasks/task_sync_api_nodes.go

@@ -0,0 +1,98 @@
+package tasks
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/events"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
+	"github.com/TeaOSLab/EdgeAdmin/internal/setup"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/logs"
+	"sort"
+	"strings"
+	"time"
+)
+
+func init() {
+	events.On(events.EventStart, func() {
+		task := NewSyncAPINodesTask()
+		go task.Start()
+	})
+}
+
+// API节点同步任务
+type SyncAPINodesTask struct {
+}
+
+func NewSyncAPINodesTask() *SyncAPINodesTask {
+	return &SyncAPINodesTask{}
+}
+
+func (this *SyncAPINodesTask) Start() {
+	ticker := time.NewTicker(5 * time.Minute)
+	if Tea.IsTesting() {
+		// 快速测试
+		ticker = time.NewTicker(1 * time.Minute)
+	}
+	for range ticker.C {
+		err := this.Loop()
+		if err != nil {
+			logs.Println("[TASK][SYNC_API_NODES]" + err.Error())
+		}
+	}
+}
+
+func (this *SyncAPINodesTask) Loop() error {
+	// 如果还没有安装直接返回
+	if !setup.IsConfigured() {
+		return nil
+	}
+
+	// 获取所有可用的节点
+	rpcClient, err := rpc.SharedRPC()
+	if err != nil {
+		return err
+	}
+	resp, err := rpcClient.APINodeRPC().FindAllEnabledAPINodes(rpcClient.Context(0), &pb.FindAllEnabledAPINodesRequest{})
+	if err != nil {
+		return err
+	}
+
+	newEndpoints := []string{}
+	for _, node := range resp.Nodes {
+		if !node.IsOn {
+			continue
+		}
+		newEndpoints = append(newEndpoints, node.AccessAddrs...)
+	}
+
+	// 和现有的对比
+	config, err := configs.LoadAPIConfig()
+	if err != nil {
+		return err
+	}
+	if this.isSame(newEndpoints, config.RPC.Endpoints) {
+		return nil
+	}
+
+	// 修改RPC对象配置
+	config.RPC.Endpoints = newEndpoints
+	err = rpcClient.UpdateConfig(config)
+	if err != nil {
+		return err
+	}
+
+	// 保存到文件
+	err = config.WriteFile(Tea.ConfigFile("api.yaml"))
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (this *SyncAPINodesTask) isSame(endpoints1 []string, endpoints2 []string) bool {
+	sort.Strings(endpoints1)
+	sort.Strings(endpoints2)
+	return strings.Join(endpoints1, "&") == strings.Join(endpoints2, "&")
+}

internal/tasks/task_sync_api_nodes_test.go

@@ -0,0 +1,15 @@
+package tasks
+
+import (
+	_ "github.com/iwind/TeaGo/bootstrap"
+	"testing"
+)
+
+func TestSyncAPINodesTask_Loop(t *testing.T) {
+	task := NewSyncAPINodesTask()
+	err := task.Loop()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}

internal/tasks/task_sync_cluster.go

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

internal/ttlcache/piece.go

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

internal/utils/ip_utils.go

@@ -2,18 +2,42 @@ package utils
 
 import (
 	"encoding/binary"
+	"math/big"
 	"net"
+	"regexp"
+	"strings"
 )
 
 // 将IP转换为整型
-func IP2Long(ip string) uint32 {
+func IP2Long(ip string) uint64 {
 	s := net.ParseIP(ip)
-	if s == nil {
+	if len(s) != 16 {
 		return 0
 	}
 
-	if len(s) == 16 {
-		return binary.BigEndian.Uint32(s[12:16])
+	if strings.Contains(ip, ":") { // IPv6
+		bigInt := big.NewInt(0)
+		bigInt.SetBytes(s.To16())
+		return bigInt.Uint64()
 	}
-	return binary.BigEndian.Uint32(s)
+	return uint64(binary.BigEndian.Uint32(s.To4()))
+}
+
+// 判断是否为IPv4
+func IsIPv4(ip string) bool {
+	if !regexp.MustCompile(`^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$`).MatchString(ip) {
+		return false
+	}
+	if IP2Long(ip) == 0 {
+		return false
+	}
+	return true
+}
+
+// 判断是否为IPv6
+func IsIPv6(ip string) bool {
+	if !strings.Contains(ip, ":") {
+		return false
+	}
+	return len(net.ParseIP(ip)) == net.IPv6len
 }

internal/utils/ip_utils_test.go

@@ -0,0 +1,85 @@
+package utils
+
+import (
+	"testing"
+)
+
+func TestIP2Long(t *testing.T) {
+	for _, ip := range []string{
+		"0.0.0.1",
+		"0.0.0.2",
+		"127.0.0.1",
+		"192.0.0.2",
+		"255.255.255.255",
+		"2001:db8:0:1::101",
+		"2001:db8:0:1::102",
+		"2406:8c00:0:3409:133:18:203:0",
+		"2406:8c00:0:3409:133:18:203:158",
+		"2406:8c00:0:3409:133:18:203:159",
+		"2406:8c00:0:3409:133:18:203:160",
+	} {
+		t.Log(ip, " -> ", IP2Long(ip))
+	}
+}
+
+func TestIsIPv4(t *testing.T) {
+	type testIP struct {
+		ip string
+		ok bool
+	}
+	for _, item := range []testIP{
+		{
+			ip: "1",
+			ok: false,
+		},
+		{
+			ip: "192.168.0.1",
+			ok: true,
+		},
+		{
+			ip: "1.1.0.1",
+			ok: true,
+		},
+		{
+			ip: "255.255.255.255",
+			ok: true,
+		},
+		{
+			ip: "192.168.0.1233",
+			ok: false,
+		},
+	} {
+		if IsIPv4(item.ip) != item.ok {
+			t.Fatal(item.ip, "should be", item.ok)
+		}
+	}
+}
+
+func TestIsIPv6(t *testing.T) {
+	type testIP struct {
+		ip string
+		ok bool
+	}
+	for _, item := range []testIP{
+		{
+			ip: "1",
+			ok: false,
+		},
+		{
+			ip: "2406:8c00:0:3409:133:18:203:158",
+			ok: true,
+		},
+		{
+			ip: "2406::8c00:0:3409:133:18:203:158",
+			ok: false,
+		},
+		{
+			ip: "2001:db8:0:1::101",
+			ok: true,
+		},
+	} {
+		if IsIPv6(item.ip) != item.ok {
+			t.Fatal(item.ip, "should be", item.ok)
+		}
+	}
+}

internal/utils/numberutils/utils.go

@@ -17,12 +17,34 @@ func FormatBytes(bytes int64) string {
 	if bytes < 1024 {
 		return FormatInt64(bytes) + "B"
 	} else if bytes < 1024*1024 {
-		return fmt.Sprintf("%.2fK", float64(bytes)/1024)
+		return fmt.Sprintf("%.2fKB", float64(bytes)/1024)
 	} else if bytes < 1024*1024*1024 {
-		return fmt.Sprintf("%.2fM", float64(bytes)/1024/1024)
+		return fmt.Sprintf("%.2fMB", float64(bytes)/1024/1024)
 	} else if bytes < 1024*1024*1024*1024 {
-		return fmt.Sprintf("%.2fG", float64(bytes)/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("%.2fP", float64(bytes)/1024/1024/1024/1024)
+		return fmt.Sprintf("%.2fEB", float64(bytes)/1024/1024/1024/1024/1024/1024)
+	}
+}
+
+func FormatBits(bits int64) string {
+	if bits < 1000 {
+		return FormatInt64(bits) + "B"
+	} else if bits < 1000*1000 {
+		return fmt.Sprintf("%.2fKB", float64(bits)/1000)
+	} else if bits < 1000*1000*1000 {
+		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("%.2fEB", float64(bits)/1000/1000/1000/1000/1000/1000)
 	}
 }

internal/web/actions/actionutils/parent_action.go

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

internal/web/actions/actionutils/utils.go

@@ -3,8 +3,10 @@ package actionutils
 import (
 	"fmt"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	rpcerrors "github.com/TeaOSLab/EdgeCommon/pkg/rpc/errors"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/logs"
+	"net/http"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -12,28 +14,45 @@ import (
 	"strings"
 )
 
-// 提示服务器错误信息
+// Fail 提示服务器错误信息
 func Fail(action actions.ActionWrapper, err error) {
 	if err != nil {
 		logs.Println("[" + reflect.TypeOf(action).String() + "]" + findStack(err.Error()))
 	}
-	action.Object().Fail(teaconst.ErrServer)
+	action.Object().Fail(teaconst.ErrServer + "（" + err.Error() + "）")
 }
 
-// 提示页面错误信息
+// FailPage 提示页面错误信息
 func FailPage(action actions.ActionWrapper, err error) {
 	if err != nil {
 		logs.Println("[" + reflect.TypeOf(action).String() + "]" + findStack(err.Error()))
 	}
-	action.Object().WriteString(teaconst.ErrServer)
+	err = rpcerrors.HumanError(err)
+	action.Object().ResponseWriter.WriteHeader(http.StatusInternalServerError)
+	if len(action.Object().Request.Header.Get("X-Requested-With")) > 0 {
+		action.Object().WriteString(teaconst.ErrServer)
+	} 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>
+	<hr style="border-top: 1px #ccc solid"/>
+	<div style="color: red">Error: ` + err.Error() + `</pre>
+	</div>
+	</body>
+</html>`)
+	}
 }
 
-// 判断动作的文件路径是否相当
+// MatchPath 判断动作的文件路径是否相当
 func MatchPath(action *actions.ActionObject, path string) bool {
 	return action.Request.URL.Path == path
 }
 
-// 查找父级Action
+// FindParentAction 查找父级Action
 func FindParentAction(actionPtr actions.ActionWrapper) *ParentAction {
 	parentActionValue := reflect.ValueOf(actionPtr).Elem().FieldByName("ParentAction")
 	if parentActionValue.IsValid() {

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

@@ -0,0 +1,49 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package accesskeys
+
+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 {
+	AdminId int64
+}) {
+	this.Data["adminId"] = params.AdminId
+	this.Show()
+}
+
+func (this *CreatePopupAction) RunPost(params struct {
+	AdminId     int64
+	Description string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	params.Must.
+		Field("description", params.Description).
+		Require("请输入备注")
+
+	accessKeyIdResp, err := this.RPC().UserAccessKeyRPC().CreateUserAccessKey(this.AdminContext(), &pb.CreateUserAccessKeyRequest{
+		AdminId:     params.AdminId,
+		Description: params.Description,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	defer this.CreateLogInfo("创建AccessKey %d", accessKeyIdResp.UserAccessKeyId)
+
+	this.Success()
+}

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

@@ -0,0 +1,24 @@
+package accesskeys
+
+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 {
+	AccessKeyId int64
+}) {
+	defer this.CreateLogInfo("删除AccessKey %d", params.AccessKeyId)
+
+	_, err := this.RPC().UserAccessKeyRPC().DeleteUserAccessKey(this.AdminContext(), &pb.DeleteUserAccessKeyRequest{UserAccessKeyId: params.AccessKeyId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,54 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package accesskeys
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/admins/adminutils"
+	"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("", "", "accessKey")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	AdminId int64
+}) {
+	err := adminutils.InitAdmin(this.Parent(), params.AdminId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	accessKeysResp, err := this.RPC().UserAccessKeyRPC().FindAllEnabledUserAccessKeys(this.AdminContext(), &pb.FindAllEnabledUserAccessKeysRequest{AdminId: params.AdminId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	accessKeyMaps := []maps.Map{}
+	for _, accessKey := range accessKeysResp.UserAccessKeys {
+		var accessedTime string
+		if accessKey.AccessedAt > 0 {
+			accessedTime = timeutil.FormatTime("Y-m-d H:i:s", accessKey.AccessedAt)
+		}
+		accessKeyMaps = append(accessKeyMaps, maps.Map{
+			"id":           accessKey.Id,
+			"isOn":         accessKey.IsOn,
+			"uniqueId":     accessKey.UniqueId,
+			"secret":       accessKey.Secret,
+			"description":  accessKey.Description,
+			"accessedTime": accessedTime,
+		})
+	}
+	this.Data["accessKeys"] = accessKeyMaps
+
+	this.Show()
+}

internal/web/actions/default/admins/accesskeys/updateIsOn.go

@@ -0,0 +1,28 @@
+package accesskeys
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type UpdateIsOnAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpdateIsOnAction) RunPost(params struct {
+	AccessKeyId int64
+	IsOn        bool
+}) {
+	defer this.CreateLogInfo("设置AccessKey %d 启用状态", params.AccessKeyId)
+
+	_, err := this.RPC().UserAccessKeyRPC().UpdateUserAccessKeyIsOn(this.AdminContext(), &pb.UpdateUserAccessKeyIsOnRequest{
+		UserAccessKeyId: params.AccessKeyId,
+		IsOn:            params.IsOn,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -30,12 +30,22 @@ func (this *AdminAction) RunGet(params struct {
 		return
 	}
 
+	// AccessKey数量
+	countAccessKeyResp, err := this.RPC().UserAccessKeyRPC().CountAllEnabledUserAccessKeys(this.AdminContext(), &pb.CountAllEnabledUserAccessKeysRequest{AdminId: params.AdminId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	countAccessKeys := countAccessKeyResp.Count
+
 	this.Data["admin"] = maps.Map{
-		"id":       admin.Id,
-		"fullname": admin.Fullname,
-		"username": admin.Username,
-		"isOn":     admin.IsOn,
-		"isSuper":  admin.IsSuper,
+		"id":              admin.Id,
+		"fullname":        admin.Fullname,
+		"username":        admin.Username,
+		"isOn":            admin.IsOn,
+		"isSuper":         admin.IsSuper,
+		"canLogin":        admin.CanLogin,
+		"countAccessKeys": countAccessKeys,
 	}
 
 	// 权限

internal/web/actions/default/admins/adminutils/utils.go

@@ -0,0 +1,38 @@
+package adminutils
+
+import (
+	"errors"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+// InitAdmin 查找管理员基本信息
+func InitAdmin(p *actionutils.ParentAction, adminId int64) error {
+	// 管理员信息
+	resp, err := p.RPC().AdminRPC().FindEnabledAdmin(p.AdminContext(), &pb.FindEnabledAdminRequest{AdminId: adminId})
+	if err != nil {
+		return err
+	}
+	if resp.Admin == nil {
+		return errors.New("not found admin")
+	}
+	var admin = resp.Admin
+
+	// AccessKey数量
+	countAccessKeysResp, err := p.RPC().UserAccessKeyRPC().CountAllEnabledUserAccessKeys(p.AdminContext(), &pb.CountAllEnabledUserAccessKeysRequest{
+		AdminId: adminId,
+		UserId:  0,
+	})
+	if err != nil {
+		return err
+	}
+
+	p.Data["admin"] = maps.Map{
+		"id":              admin.Id,
+		"username":        admin.Username,
+		"fullname":        admin.Fullname,
+		"countAccessKeys": countAccessKeysResp.Count,
+	}
+	return nil
+}

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

@@ -2,6 +2,7 @@ package admins
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/admins/accesskeys"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
 )
@@ -18,6 +19,16 @@ func init() {
 			Post("/delete", new(DeleteAction)).
 			Get("/admin", new(AdminAction)).
 			Get("/otpQrcode", new(OtpQrcodeAction)).
+			Post("/options", new(OptionsAction)).
+
+			// AccessKeys
+			Prefix("/admins/accessKeys").
+			Get("", new(accesskeys.IndexAction)).
+			GetPost("/createPopup", new(accesskeys.CreatePopupAction)).
+			Post("/delete", new(accesskeys.DeleteAction)).
+			Post("/updateIsOn", new(accesskeys.UpdateIsOnAction)).
+
+
 			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

@@ -39,13 +39,23 @@ func (this *UpdateAction) RunGet(params struct {
 		otpLoginIsOn = admin.OtpLogin.IsOn
 	}
 
+	// AccessKey数量
+	countAccessKeyResp, err := this.RPC().UserAccessKeyRPC().CountAllEnabledUserAccessKeys(this.AdminContext(), &pb.CountAllEnabledUserAccessKeysRequest{AdminId: params.AdminId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	countAccessKeys := countAccessKeyResp.Count
+
 	this.Data["admin"] = maps.Map{
-		"id":           admin.Id,
-		"fullname":     admin.Fullname,
-		"username":     admin.Username,
-		"isOn":         admin.IsOn,
-		"isSuper":      admin.IsSuper,
-		"otpLoginIsOn": otpLoginIsOn,
+		"id":              admin.Id,
+		"fullname":        admin.Fullname,
+		"username":        admin.Username,
+		"isOn":            admin.IsOn,
+		"isSuper":         admin.IsSuper,
+		"canLogin":        admin.CanLogin,
+		"otpLoginIsOn":    otpLoginIsOn,
+		"countAccessKeys": countAccessKeys,
 	}
 
 	// 权限
@@ -76,6 +86,7 @@ func (this *UpdateAction) RunPost(params struct {
 	ModuleCodes []string
 	IsOn        bool
 	IsSuper     bool
+	CanLogin    bool
 
 	// OTP
 	OtpOn bool
@@ -139,6 +150,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/api/node/logs.go

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -19,7 +19,7 @@ func (this *InstallNodesAction) Init() {
 func (this *InstallNodesAction) RunGet(params struct {
 	ClusterId int64
 }) {
-	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(params.ClusterId, "register")
+	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "register")
 
 	clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: params.ClusterId})
 	if err != nil {

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

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

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

@@ -3,6 +3,7 @@ package node
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
@@ -11,16 +12,16 @@ import (
 	"time"
 )
 
-type NodeAction struct {
+type IndexAction struct {
 	actionutils.ParentAction
 }
 
-func (this *NodeAction) Init() {
+func (this *IndexAction) Init() {
 	this.Nav("", "node", "node")
 	this.SecondMenu("nodes")
 }
 
-func (this *NodeAction) RunGet(params struct {
+func (this *IndexAction) RunGet(params struct {
 	NodeId int64
 }) {
 	this.Data["nodeId"] = params.NodeId
@@ -55,7 +56,10 @@ func (this *NodeAction) RunGet(params struct {
 	}
 
 	// IP地址
-	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{NodeId: params.NodeId})
+	ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+		NodeId: params.NodeId,
+		Role:   nodeconfigs.NodeRoleNode,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -89,6 +93,12 @@ func (this *NodeAction) RunGet(params struct {
 			})
 		}
 	}
+	if len(dnsRouteMaps) == 0 {
+		dnsRouteMaps = append(dnsRouteMaps, maps.Map{
+			"name": "",
+			"code": "",
+		})
+	}
 	this.Data["dnsRoutes"] = dnsRouteMaps
 	this.Data["dnsRecordName"] = recordName
 	this.Data["dnsRecordValue"] = recordValue
@@ -108,17 +118,17 @@ func (this *NodeAction) RunGet(params struct {
 		grantMap := maps.Map{}
 		grantId := loginParams.GetInt64("grantId")
 		if grantId > 0 {
-			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledGrant(this.AdminContext(), &pb.FindEnabledGrantRequest{GrantId: grantId})
+			grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId})
 			if err != nil {
 				this.ErrorPage(err)
 				return
 			}
-			if grantResp.Grant != nil {
+			if grantResp.NodeGrant != nil {
 				grantMap = maps.Map{
-					"id":         grantResp.Grant.Id,
-					"name":       grantResp.Grant.Name,
-					"method":     grantResp.Grant.Method,
-					"methodName": grantutils.FindGrantMethodName(grantResp.Grant.Method),
+					"id":         grantResp.NodeGrant.Id,
+					"name":       grantResp.NodeGrant.Name,
+					"method":     grantResp.NodeGrant.Method,
+					"methodName": grantutils.FindGrantMethodName(grantResp.NodeGrant.Method),
 				}
 			}
 		}
@@ -143,21 +153,66 @@ func (this *NodeAction) RunGet(params struct {
 		status.IsActive = status.IsActive && time.Now().Unix()-status.UpdatedAt <= 60 // N秒之内认为活跃
 	}
 
+	// 检查是否有新版本
+	if len(status.OS) > 0 {
+		checkVersionResp, err := this.RPC().NodeRPC().CheckNodeLatestVersion(this.AdminContext(), &pb.CheckNodeLatestVersionRequest{
+			Os:             status.OS,
+			Arch:           status.Arch,
+			CurrentVersion: status.BuildVersion,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		this.Data["shouldUpgrade"] = checkVersionResp.HasNewVersion
+		this.Data["newVersion"] = checkVersionResp.NewVersion
+	} else {
+		this.Data["shouldUpgrade"] = false
+		this.Data["newVersion"] = ""
+	}
+
 	// 分组
 	var groupMap maps.Map = nil
-	if node.Group != nil {
+	if node.NodeGroup != nil {
 		groupMap = maps.Map{
-			"id":   node.Group.Id,
-			"name": node.Group.Name,
+			"id":   node.NodeGroup.Id,
+			"name": node.NodeGroup.Name,
 		}
 	}
 
 	// 区域
 	var regionMap maps.Map = nil
-	if node.Region != nil {
+	if node.NodeRegion != nil {
 		regionMap = maps.Map{
-			"id":   node.Region.Id,
-			"name": node.Region.Name,
+			"id":   node.NodeRegion.Id,
+			"name": node.NodeRegion.Name,
+		}
+	}
+
+	// 缓存硬盘 & 内存容量
+	var maxCacheDiskCapacity maps.Map = nil
+	if node.MaxCacheDiskCapacity != nil {
+		maxCacheDiskCapacity = maps.Map{
+			"count": node.MaxCacheDiskCapacity.Count,
+			"unit":  node.MaxCacheDiskCapacity.Unit,
+		}
+	} else {
+		maxCacheDiskCapacity = maps.Map{
+			"count": 0,
+			"unit":  "gb",
+		}
+	}
+
+	var maxCacheMemoryCapacity maps.Map = nil
+	if node.MaxCacheMemoryCapacity != nil {
+		maxCacheMemoryCapacity = maps.Map{
+			"count": node.MaxCacheMemoryCapacity.Count,
+			"unit":  node.MaxCacheMemoryCapacity.Unit,
+		}
+	} else {
+		maxCacheMemoryCapacity = maps.Map{
+			"count": 0,
+			"unit":  "gb",
 		}
 	}
 
@@ -175,18 +230,29 @@ func (this *NodeAction) RunGet(params struct {
 		"isOn":        node.IsOn,
 
 		"status": maps.Map{
-			"isActive":        status.IsActive,
-			"updatedAt":       status.UpdatedAt,
-			"hostname":        status.Hostname,
-			"cpuUsage":        status.CPUUsage,
-			"cpuUsageText":    fmt.Sprintf("%.2f%%", status.CPUUsage*100),
-			"memUsage":        status.MemoryUsage,
-			"memUsageText":    fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
-			"connectionCount": status.ConnectionCount,
+			"isActive":             status.IsActive,
+			"updatedAt":            status.UpdatedAt,
+			"hostname":             status.Hostname,
+			"cpuUsage":             status.CPUUsage,
+			"cpuUsageText":         fmt.Sprintf("%.2f%%", status.CPUUsage*100),
+			"memUsage":             status.MemoryUsage,
+			"memUsageText":         fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
+			"connectionCount":      status.ConnectionCount,
+			"buildVersion":         status.BuildVersion,
+			"cpuPhysicalCount":     status.CPUPhysicalCount,
+			"cpuLogicalCount":      status.CPULogicalCount,
+			"load1m":               fmt.Sprintf("%.2f", status.Load1m),
+			"load5m":               fmt.Sprintf("%.2f", status.Load5m),
+			"load15m":              fmt.Sprintf("%.2f", status.Load15m),
+			"cacheTotalDiskSize":   numberutils.FormatBytes(status.CacheTotalDiskSize),
+			"cacheTotalMemorySize": numberutils.FormatBytes(status.CacheTotalMemorySize),
 		},
 
 		"group":  groupMap,
 		"region": regionMap,
+
+		"maxCacheDiskCapacity":   maxCacheDiskCapacity,
+		"maxCacheMemoryCapacity": maxCacheMemoryCapacity,
 	}
 
 	this.Show()

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
 package node
 
 import (
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 )
 
@@ -34,6 +34,7 @@ func (this *StatusAction) RunPost(params struct {
 			"isOk":       node.InstallStatus.IsOk,
 			"updatedAt":  node.InstallStatus.UpdatedAt,
 			"error":      node.InstallStatus.Error,
+			"errorCode":  node.InstallStatus.ErrorCode,
 		}
 	} else {
 		this.Data["installStatus"] = nil

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/up.go

@@ -0,0 +1,28 @@
+package node
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+// 手动上线
+type UpAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpAction) RunPost(params struct {
+	NodeId int64
+}) {
+	defer this.CreateLogInfo("手动上线节点 %d", params.NodeId)
+
+	_, err := this.RPC().NodeRPC().UpdateNodeUp(this.AdminContext(), &pb.UpdateNodeUpRequest{
+		NodeId: params.NodeId,
+		IsUp:   true,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

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

internal/web/actions/default/clusters/cluster/settings/firewall-actions/createPopup.go

@@ -0,0 +1,125 @@
+package firewallActions
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type CreatePopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CreatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *CreatePopupAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	this.Data["clusterId"] = params.ClusterId
+	this.Data["actionTypes"] = firewallconfigs.FindAllFirewallActionTypes()
+
+	this.Show()
+}
+
+func (this *CreatePopupAction) RunPost(params struct {
+	ClusterId  int64
+	Name       string
+	EventLevel string
+	Type       string
+
+	// ipset
+	IpsetWhiteName          string
+	IpsetBlackName          string
+	IpsetAutoAddToIPTables  bool
+	IpsetAutoAddToFirewalld bool
+
+	// script
+	ScriptPath string
+
+	// http api
+	HttpAPIURL string
+
+	// html
+	HtmlContent string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("创建WAF动作")
+
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入动作名称").
+		Field("type", params.Type).
+		Require("请选择动作类型")
+
+	var actionParams interface{} = nil
+	switch params.Type {
+	case firewallconfigs.FirewallActionTypeIPSet:
+		params.Must.
+			Field("ipsetWhiteName", params.IpsetWhiteName).
+			Require("请输入IPSet白名单名称").
+			Match(`^\w+$`, "请输入正确的IPSet白名单名称").
+			Field("ipsetBlackName", params.IpsetBlackName).
+			Require("请输入IPSet黑名单名称").
+			Match(`^\w+$`, "请输入正确的IPSet黑名单名称")
+
+		actionParams = &firewallconfigs.FirewallActionIPSetConfig{
+			WhiteName:          params.IpsetWhiteName,
+			BlackName:          params.IpsetBlackName,
+			AutoAddToIPTables:  params.IpsetAutoAddToIPTables,
+			AutoAddToFirewalld: params.IpsetAutoAddToFirewalld,
+		}
+	case firewallconfigs.FirewallActionTypeIPTables:
+		actionParams = &firewallconfigs.FirewallActionIPTablesConfig{}
+	case firewallconfigs.FirewallActionTypeFirewalld:
+		actionParams = &firewallconfigs.FirewallActionFirewalldConfig{}
+	case firewallconfigs.FirewallActionTypeScript:
+		params.Must.
+			Field("scriptPath", params.ScriptPath).
+			Require("请输入脚本路径")
+		actionParams = &firewallconfigs.FirewallActionScriptConfig{
+			Path: params.ScriptPath,
+		}
+	case firewallconfigs.FirewallActionTypeHTTPAPI:
+		params.Must.
+			Field("httpAPIURL", params.HttpAPIURL).
+			Require("请输入API URL").
+			Match(`^(http|https):`, "API地址必须以http://或https://开头")
+		actionParams = &firewallconfigs.FirewallActionHTTPAPIConfig{
+			URL: params.HttpAPIURL,
+		}
+	case firewallconfigs.FirewallActionTypeHTML:
+		params.Must.
+			Field("htmlContent", params.HtmlContent).
+			Require("请输入HTML内容")
+		actionParams = &firewallconfigs.FirewallActionHTMLConfig{
+			Content: params.HtmlContent,
+		}
+	default:
+		this.Fail("选择的类型'" + params.Type + "'暂时不支持")
+	}
+
+	actionParamsJSON, err := json.Marshal(actionParams)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	_, err = this.RPC().NodeClusterFirewallActionRPC().CreateNodeClusterFirewallAction(this.AdminContext(), &pb.CreateNodeClusterFirewallActionRequest{
+		NodeClusterId: params.ClusterId,
+		Name:          params.Name,
+		EventLevel:    params.EventLevel,
+		Type:          params.Type,
+		ParamsJSON:    actionParamsJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Success()
+}

internal/web/actions/default/clusters/cluster/settings/firewall-actions/delete.go

@@ -0,0 +1,24 @@
+package firewallActions
+
+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 {
+	ActionId int64
+}) {
+	defer this.CreateLogInfo("删除WAF动作 %d", params.ActionId)
+
+	_, err := this.RPC().NodeClusterFirewallActionRPC().DeleteNodeClusterFirewallAction(this.AdminContext(), &pb.DeleteNodeClusterFirewallActionRequest{NodeClusterFirewallActionId: params.ActionId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -0,0 +1,65 @@
+package firewallActions
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "")
+	this.SecondMenu("firewallAction")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	actionsResp, err := this.RPC().NodeClusterFirewallActionRPC().FindAllEnabledNodeClusterFirewallActions(this.AdminContext(), &pb.FindAllEnabledNodeClusterFirewallActionsRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	levelMaps := map[string][]maps.Map{} // level => actionMaps
+	for _, action := range actionsResp.NodeClusterFirewallActions {
+		actionMaps, ok := levelMaps[action.EventLevel]
+		if !ok {
+			actionMaps = []maps.Map{}
+		}
+
+		actionMaps = append(actionMaps, maps.Map{
+			"id":       action.Id,
+			"name":     action.Name,
+			"type":     action.Type,
+			"typeName": firewallconfigs.FindFirewallActionTypeName(action.Type),
+		})
+		levelMaps[action.EventLevel] = actionMaps
+	}
+
+	levelMaps2 := []maps.Map{} // []levelMap
+	hasActions := false
+	for _, level := range firewallconfigs.FindAllFirewallEventLevels() {
+		actionMaps, ok := levelMaps[level.Code]
+		if !ok {
+			actionMaps = []maps.Map{}
+		} else {
+			hasActions = true
+		}
+
+		levelMaps2 = append(levelMaps2, maps.Map{
+			"name":    level.Name,
+			"code":    level.Code,
+			"actions": actionMaps,
+		})
+	}
+
+	this.Data["levels"] = levelMaps2
+	this.Data["hasActions"] = hasActions
+
+	this.Show()
+}

internal/web/actions/default/clusters/cluster/settings/firewall-actions/updatePopup.go

@@ -0,0 +1,154 @@
+package firewallActions
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
+	"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 {
+	ActionId int64
+}) {
+	actionResp, err := this.RPC().NodeClusterFirewallActionRPC().FindEnabledNodeClusterFirewallAction(this.AdminContext(), &pb.FindEnabledNodeClusterFirewallActionRequest{NodeClusterFirewallActionId: params.ActionId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	action := actionResp.NodeClusterFirewallAction
+	if action == nil {
+		this.NotFound("nodeClusterFirewallAction", params.ActionId)
+		return
+	}
+
+	actionParams := maps.Map{}
+	if len(action.ParamsJSON) > 0 {
+		err = json.Unmarshal(action.ParamsJSON, &actionParams)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	this.Data["action"] = maps.Map{
+		"id":         action.Id,
+		"name":       action.Name,
+		"eventLevel": action.EventLevel,
+		"params":     actionParams,
+		"type":       action.Type,
+	}
+
+	// 通用参数
+	this.Data["actionTypes"] = firewallconfigs.FindAllFirewallActionTypes()
+
+	this.Show()
+}
+
+func (this *UpdatePopupAction) RunPost(params struct {
+	ActionId   int64
+	Name       string
+	EventLevel string
+	Type       string
+
+	// ipset
+	IpsetWhiteName          string
+	IpsetBlackName          string
+	IpsetAutoAddToIPTables  bool
+	IpsetAutoAddToFirewalld bool
+
+	// script
+	ScriptPath string
+
+	// http api
+	HttpAPIURL string
+
+	// HTML内容
+	HtmlContent string
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改WAF动作 %d", params.ActionId)
+
+	params.Must.
+		Field("name", params.Name).
+		Require("请输入动作名称").
+		Field("type", params.Type).
+		Require("请选择动作类型")
+
+	var actionParams interface{} = nil
+	switch params.Type {
+	case firewallconfigs.FirewallActionTypeIPSet:
+		params.Must.
+			Field("ipsetWhiteName", params.IpsetWhiteName).
+			Require("请输入IPSet白名单名称").
+			Match(`^\w+$`, "请输入正确的IPSet白名单名称").
+			Field("ipsetBlackName", params.IpsetBlackName).
+			Require("请输入IPSet黑名单名称").
+			Match(`^\w+$`, "请输入正确的IPSet黑名单名称")
+
+		actionParams = &firewallconfigs.FirewallActionIPSetConfig{
+			WhiteName:          params.IpsetWhiteName,
+			BlackName:          params.IpsetBlackName,
+			AutoAddToIPTables:  params.IpsetAutoAddToIPTables,
+			AutoAddToFirewalld: params.IpsetAutoAddToFirewalld,
+		}
+	case firewallconfigs.FirewallActionTypeIPTables:
+		actionParams = &firewallconfigs.FirewallActionIPTablesConfig{}
+	case firewallconfigs.FirewallActionTypeFirewalld:
+		actionParams = &firewallconfigs.FirewallActionFirewalldConfig{}
+	case firewallconfigs.FirewallActionTypeScript:
+		params.Must.
+			Field("scriptPath", params.ScriptPath).
+			Require("请输入脚本路径")
+		actionParams = &firewallconfigs.FirewallActionScriptConfig{
+			Path: params.ScriptPath,
+		}
+	case firewallconfigs.FirewallActionTypeHTTPAPI:
+		params.Must.
+			Field("httpAPIURL", params.HttpAPIURL).
+			Require("请输入API URL").
+			Match(`^(http|https):`, "API地址必须以http://或https://开头")
+		actionParams = &firewallconfigs.FirewallActionHTTPAPIConfig{
+			URL: params.HttpAPIURL,
+		}
+	case firewallconfigs.FirewallActionTypeHTML:
+		params.Must.
+			Field("htmlContent", params.HtmlContent).
+			Require("请输入HTML内容")
+		actionParams = &firewallconfigs.FirewallActionHTMLConfig{
+			Content: params.HtmlContent,
+		}
+	default:
+		this.Fail("选择的类型'" + params.Type + "'暂时不支持")
+	}
+
+	actionParamsJSON, err := json.Marshal(actionParams)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	_, err = this.RPC().NodeClusterFirewallActionRPC().UpdateNodeClusterFirewallAction(this.AdminContext(), &pb.UpdateNodeClusterFirewallActionRequest{
+		NodeClusterFirewallActionId: params.ActionId,
+		Name:                        params.Name,
+		EventLevel:                  params.EventLevel,
+		Type:                        params.Type,
+		ParamsJSON:                  actionParamsJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Success()
+}

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

@@ -1,4 +1,4 @@
-package settings
+package health
 
 import (
 	"encoding/json"
@@ -9,16 +9,16 @@ import (
 	"github.com/iwind/TeaGo/actions"
 )
 
-type HealthAction struct {
+type IndexAction struct {
 	actionutils.ParentAction
 }
 
-func (this *HealthAction) Init() {
+func (this *IndexAction) Init() {
 	this.Nav("", "setting", "")
 	this.SecondMenu("health")
 }
 
-func (this *HealthAction) RunGet(params struct {
+func (this *IndexAction) RunGet(params struct {
 	ClusterId int64
 }) {
 	configResp, err := this.RPC().NodeClusterRPC().FindNodeClusterHealthCheckConfig(this.AdminContext(), &pb.FindNodeClusterHealthCheckConfigRequest{NodeClusterId: params.ClusterId})
@@ -40,7 +40,7 @@ func (this *HealthAction) RunGet(params struct {
 	this.Show()
 }
 
-func (this *HealthAction) RunPost(params struct {
+func (this *IndexAction) RunPost(params struct {
 	ClusterId       int64
 	HealthCheckJSON []byte
 	Must            *actions.Must

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

@@ -1,4 +1,4 @@
-package settings
+package health
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
@@ -7,20 +7,19 @@ import (
 	"github.com/iwind/TeaGo/actions"
 )
 
-type HealthRunPopupAction struct {
+type RunPopupAction struct {
 	actionutils.ParentAction
 }
 
-func (this *HealthRunPopupAction) Init() {
+func (this *RunPopupAction) Init() {
 	this.Nav("", "", "")
 }
 
-func (this *HealthRunPopupAction) RunGet(params struct{}) {
-
+func (this *RunPopupAction) RunGet(params struct{}) {
 	this.Show()
 }
 
-func (this *HealthRunPopupAction) RunPost(params struct {
+func (this *RunPopupAction) RunPost(params struct {
 	ClusterId int64
 
 	Must *actions.Must
@@ -33,6 +32,9 @@ func (this *HealthRunPopupAction) RunPost(params struct {
 		this.Fail(err.Error())
 	}
 
+	if resp.Results == nil {
+		resp.Results = []*pb.ExecuteNodeClusterHealthCheckResponse_Result{}
+	}
 	this.Data["results"] = resp.Results
 	this.Success()
 }

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

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