修复go.mod

README.md

@@ -46,7 +46,7 @@
 * [开发者指南](https://goedge.cn/docs/Developer/Build.md)
 
 ## 架构
-![架构](doc/architect-zh.jpg)
+![架构图](doc/architect-zh.png)
 
 其中的组件源码地址如下：
 * [边缘节点](https://github.com/TeaOSLab/EdgeNode)

docker/Dockerfile

@@ -1,7 +1,7 @@
 FROM --platform=linux/amd64 alpine:latest
 LABEL maintainer="goedge.cdn@gmail.com"
 ENV TZ "Asia/Shanghai"
-ENV VERSION 1.2.8
+ENV VERSION 1.3.1
 ENV ROOT_DIR /usr/local/goedge
 ENV TAR_FILE edge-admin-linux-amd64-plus-v${VERSION}.zip
 

go.mod

@@ -11,13 +11,13 @@ require (
 	github.com/iwind/TeaGo v0.0.0-20230623080147-cd1e53b4915f
 	github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4
 	github.com/miekg/dns v1.1.43
-	github.com/quic-go/quic-go v0.36.0
+	github.com/quic-go/quic-go v0.37.4
 	github.com/shirou/gopsutil/v3 v3.22.5
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/tealeg/xlsx/v3 v3.2.3
 	github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119
-	golang.org/x/crypto v0.10.0
-	golang.org/x/sys v0.9.0
+	golang.org/x/crypto v0.12.0
+	golang.org/x/sys v0.11.0
 	google.golang.org/grpc v1.45.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -30,7 +30,7 @@ require (
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/btree v1.0.0 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
+	github.com/google/pprof v0.0.0-20230808223545-4887780b67fb // indirect
 	github.com/kr/pretty v0.2.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/onsi/ginkgo/v2 v2.11.0 // indirect
@@ -38,17 +38,17 @@ require (
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
-	github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
+	github.com/quic-go/qtls-go1-20 v0.3.2 // indirect
 	github.com/rogpeppe/fastuuid v1.2.0 // indirect
 	github.com/shabbyrobe/xmlwriter v0.0.0-20200208144257-9fca06d00ffa // indirect
 	github.com/tdewolff/minify/v2 v2.12.7 // indirect
 	github.com/tdewolff/parse/v2 v2.6.6 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
-	golang.org/x/mod v0.11.0 // indirect
-	golang.org/x/net v0.11.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
-	golang.org/x/tools v0.10.0 // indirect
+	golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/tools v0.12.0 // indirect
 	google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

go.sum

@@ -84,6 +84,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 h1:hR7/MlvK23p6+lIw9SN1TigNLn9ZnF3W4SYRKq2gAHs=
 github.com/google/pprof v0.0.0-20230602150820-91b7bce49751/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
+github.com/google/pprof v0.0.0-20230808223545-4887780b67fb h1:oqpb3Cwpc7EOml5PVGMYbSGmwNui2R7i8IW83gs4W0c=
+github.com/google/pprof v0.0.0-20230808223545-4887780b67fb/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
@@ -132,10 +134,14 @@ github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
 github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc86Z5U=
 github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
-github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E=
-github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
+github.com/quic-go/qtls-go1-20 v0.3.2 h1:rRgN3WfnKbyik4dBV8A6girlJVxGand/d+jVKbQq5GI=
+github.com/quic-go/qtls-go1-20 v0.3.2/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
 github.com/quic-go/quic-go v0.36.0 h1:JIrO7p7Ug6hssFcARjWDiqS2RAKJHCiwPxBAA989rbI=
 github.com/quic-go/quic-go v0.36.0/go.mod h1:zPetvwDlILVxt15n3hr3Gf/I3mDf7LpLKPhR4Ez0AZQ=
+github.com/quic-go/quic-go v0.37.3 h1:pkHH3xaMNUNAh6OtgEV/0K6Fz+YIJXhPzgd/ShiRDm4=
+github.com/quic-go/quic-go v0.37.3/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU=
+github.com/quic-go/quic-go v0.37.4 h1:ke8B73yMCWGq9MfrCCAw0Uzdm7GaViC3i39dsIdDlH4=
+github.com/quic-go/quic-go v0.37.4/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU=
 github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
 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=
@@ -175,13 +181,17 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
-golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
+golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
+golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
+golang.org/x/exp v0.0.0-20230807204917-050eac23e9de h1:l5Za6utMv/HsBWWqzt4S8X17j+kt1uVETUX5UFhn2rE=
+golang.org/x/exp v0.0.0-20230807204917-050eac23e9de/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 h1:EDuYyU/MkFXllv9QF9819VlI9a4tzGuCbhG0ExK9o1U=
+golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -193,6 +203,8 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
 golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 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=
@@ -208,6 +220,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
 golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
+golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
+golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -237,16 +251,16 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
-golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28=
+golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
-golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
+golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 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=
@@ -257,6 +271,8 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=
 golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
+golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
+golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/const/const.go

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

internal/gen/generate.go

@@ -63,7 +63,7 @@ func generateComponentsJSFile() error {
 	} else {
 		buffer.WriteString("window.REQUEST_COND_COMPONENTS = ")
 		buffer.Write(typesJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	// 条件操作符
@@ -73,7 +73,7 @@ func generateComponentsJSFile() error {
 	} else {
 		buffer.WriteString("window.REQUEST_COND_OPERATORS = ")
 		buffer.Write(requestOperatorsJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	// 请求变量
@@ -83,7 +83,7 @@ func generateComponentsJSFile() error {
 	} else {
 		buffer.WriteString("window.REQUEST_VARIABLES = ")
 		buffer.Write(requestVariablesJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	// 指标
@@ -93,7 +93,7 @@ func generateComponentsJSFile() error {
 	} else {
 		buffer.WriteString("window.METRIC_HTTP_KEYS = ")
 		buffer.Write(metricHTTPKeysJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	// IP地址阈值项目
@@ -103,7 +103,7 @@ func generateComponentsJSFile() error {
 	} else {
 		buffer.WriteString("window.IP_ADDR_THRESHOLD_ITEMS = ")
 		buffer.Write(ipAddrThresholdItemsJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	// IP地址阈值动作
@@ -113,7 +113,7 @@ func generateComponentsJSFile() error {
 	} else {
 		buffer.WriteString("window.IP_ADDR_THRESHOLD_ACTIONS = ")
 		buffer.Write(ipAddrThresholdActionsJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	// WAF操作符
@@ -123,7 +123,17 @@ func generateComponentsJSFile() error {
 	} else {
 		buffer.WriteString("window.WAF_RULE_OPERATORS = ")
 		buffer.Write(wafOperatorsJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
+	}
+
+	// WAF验证码类型
+	captchaTypesJSON, err := json.Marshal(firewallconfigs.FindAllCaptchaTypes())
+	if err != nil {
+		logs.Println("ComponentsAction marshal captcha types failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.WAF_CAPTCHA_TYPES = ")
+		buffer.Write(captchaTypesJSON)
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	fp, err := os.OpenFile(filepath.Clean(Tea.PublicFile("/js/components.src.js")), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0777)

internal/rpc/rpc_client.go

@@ -20,6 +20,7 @@ import (
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/encoding/gzip"
+	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/metadata"
 	"net"
 	"net/url"
@@ -280,34 +281,6 @@ 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())
 }
@@ -416,14 +389,6 @@ func (this *RPCClient) NodeTaskRPC() pb.NodeTaskServiceClient {
 	return pb.NewNodeTaskServiceClient(this.pickConn())
 }
 
-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())
 }
@@ -550,12 +515,15 @@ func (this *RPCClient) init() error {
 			grpc.MaxCallSendMsgSize(128<<20),
 			grpc.UseCompressor(gzip.Name),
 		)
+		var keepaliveParams = grpc.WithKeepaliveParams(keepalive.ClientParameters{
+			Time: 30 * time.Second,
+		})
 		if u.Scheme == "http" {
-			conn, err = grpc.Dial(apiHost, grpc.WithTransportCredentials(insecure.NewCredentials()), callOptions)
+			conn, err = grpc.Dial(apiHost, grpc.WithTransportCredentials(insecure.NewCredentials()), callOptions, keepaliveParams)
 		} else if u.Scheme == "https" {
 			conn, err = grpc.Dial(apiHost, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{
 				InsecureSkipVerify: true,
-			})), callOptions)
+			})), callOptions, keepaliveParams)
 		} else {
 			return errors.New("parse endpoint failed: invalid scheme '" + u.Scheme + "'")
 		}

internal/rpc/rpc_client_test.go

@@ -34,14 +34,9 @@ func TestRPCClient_NodeRPC(t *testing.T) {
 
 func TestRPC_Dial_HTTP(t *testing.T) {
 	client, err := NewRPCClient(&configs.APIConfig{
-		RPC: struct {
-			Endpoints     []string `yaml:"endpoints"`
-			DisableUpdate bool     `yaml:"disableUpdate"`
-		}{
-			Endpoints: []string{"http://127.0.0.1:8004"},
-		},
-		NodeId: "a7e55782dab39bce0901058a1e14a0e6",
-		Secret: "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
+		RPCEndpoints: []string{"https://127.0.0.1:8003"},
+		NodeId:       "a7e55782dab39bce0901058a1e14a0e6",
+		Secret:       "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
 	}, true)
 	if err != nil {
 		t.Fatal(err)
@@ -56,14 +51,9 @@ func TestRPC_Dial_HTTP(t *testing.T) {
 
 func TestRPC_Dial_HTTP_2(t *testing.T) {
 	client, err := NewRPCClient(&configs.APIConfig{
-		RPC: struct {
-			Endpoints     []string `yaml:"endpoints"`
-			DisableUpdate bool     `yaml:"disableUpdate"`
-		}{
-			Endpoints: []string{"https://127.0.0.1:8003"},
-		},
-		NodeId: "a7e55782dab39bce0901058a1e14a0e6",
-		Secret: "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
+		RPCEndpoints: []string{"https://127.0.0.1:8003"},
+		NodeId:       "a7e55782dab39bce0901058a1e14a0e6",
+		Secret:       "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
 	}, true)
 	if err != nil {
 		t.Fatal(err)
@@ -78,14 +68,9 @@ func TestRPC_Dial_HTTP_2(t *testing.T) {
 
 func TestRPC_Dial_HTTPS(t *testing.T) {
 	client, err := NewRPCClient(&configs.APIConfig{
-		RPC: struct {
-			Endpoints     []string `yaml:"endpoints"`
-			DisableUpdate bool     `yaml:"disableUpdate"`
-		}{
-			Endpoints: []string{"https://127.0.0.1:8004"},
-		},
-		NodeId: "a7e55782dab39bce0901058a1e14a0e6",
-		Secret: "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
+		RPCEndpoints: []string{"https://127.0.0.1:8004"},
+		NodeId:       "a7e55782dab39bce0901058a1e14a0e6",
+		Secret:       "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
 	}, true)
 	if err != nil {
 		t.Fatal(err)

internal/utils/unzip.go

@@ -0,0 +1,95 @@
+package utils
+
+import (
+	"archive/zip"
+	"errors"
+	"io"
+	"os"
+)
+
+type Unzip struct {
+	zipFile   string
+	targetDir string
+}
+
+func NewUnzip(zipFile string, targetDir string) *Unzip {
+	return &Unzip{
+		zipFile:   zipFile,
+		targetDir: targetDir,
+	}
+}
+
+func (this *Unzip) Run() error {
+	if len(this.zipFile) == 0 {
+		return errors.New("zip file should not be empty")
+	}
+	if len(this.targetDir) == 0 {
+		return errors.New("target dir should not be empty")
+	}
+
+	reader, err := zip.OpenReader(this.zipFile)
+	if err != nil {
+		return err
+	}
+
+	defer func() {
+		_ = reader.Close()
+	}()
+
+	for _, file := range reader.File {
+		var info = file.FileInfo()
+		var target = this.targetDir + "/" + file.Name
+
+		// 目录
+		if info.IsDir() {
+			stat, err := os.Stat(target)
+			if err != nil {
+				if !os.IsNotExist(err) {
+					return err
+				} else {
+					err = os.MkdirAll(target, info.Mode())
+					if err != nil {
+						return err
+					}
+				}
+			} else if !stat.IsDir() {
+				err = os.MkdirAll(target, info.Mode())
+				if err != nil {
+					return err
+				}
+			}
+			continue
+		}
+
+		// 文件
+		err = func(file *zip.File, target string) error {
+			fileReader, err := file.Open()
+			if err != nil {
+				return err
+			}
+			defer func() {
+				_ = fileReader.Close()
+			}()
+
+			// remove old
+			_ = os.Remove(target)
+
+			// create new
+			fileWriter, err := os.OpenFile(target, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, file.FileInfo().Mode())
+			if err != nil {
+				return err
+			}
+			defer func() {
+				_ = fileWriter.Close()
+			}()
+
+			_, err = io.Copy(fileWriter, fileReader)
+			return err
+		}(file, target)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

internal/utils/upgrade_manager.go

@@ -88,10 +88,6 @@ func (this *UpgradeManager) Start() error {
 
 	// 检查unzip
 	unzipExe, _ := exec.LookPath("unzip")
-	if len(unzipExe) == 0 {
-		// TODO install unzip automatically or pack with a static 'unzip' file
-		return errors.New("can not find 'unzip' command")
-	}
 
 	// 检查cp
 	cpExe, _ := exec.LookPath("cp")
@@ -232,12 +228,24 @@ func (this *UpgradeManager) Start() error {
 				return fmt.Errorf("remove old dir '%s' failed: %w", unzipDir, err)
 			}
 		}
-		var unzipCmd = exec.Command(unzipExe, "-q", "-o", destFile, "-d", unzipDir)
-		var unzipStderr = &bytes.Buffer{}
-		unzipCmd.Stderr = unzipStderr
-		err = unzipCmd.Run()
-		if err != nil {
-			return fmt.Errorf("unzip installation file failed: %w: %s", err, unzipStderr.String())
+
+		if len(unzipExe) > 0 {
+			var unzipCmd = exec.Command(unzipExe, "-q", "-o", destFile, "-d", unzipDir)
+			var unzipStderr = &bytes.Buffer{}
+			unzipCmd.Stderr = unzipStderr
+			err = unzipCmd.Run()
+			if err != nil {
+				return fmt.Errorf("unzip installation file failed: %w: %s", err, unzipStderr.String())
+			}
+		} else {
+			var unzipCmd = &Unzip{
+				zipFile:   destFile,
+				targetDir: unzipDir,
+			}
+			err = unzipCmd.Run()
+			if err != nil {
+				return fmt.Errorf("unzip installation file failed: %w", err)
+			}
 		}
 
 		installationFiles, err := filepath.Glob(unzipDir + "/edge-" + this.component + "/*")

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

@@ -1,82 +0,0 @@
-package recipients
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/actions"
-	"regexp"
-)
-
-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
-
-	TimeFromHour   string
-	TimeFromMinute string
-	TimeFromSecond string
-
-	TimeToHour   string
-	TimeToMinute string
-	TimeToSecond 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)
-
-	var digitReg = regexp.MustCompile(`^\d+$`)
-
-	var timeFrom = ""
-	if digitReg.MatchString(params.TimeFromHour) && digitReg.MatchString(params.TimeFromMinute) && digitReg.MatchString(params.TimeFromSecond) {
-		timeFrom = params.TimeFromHour + ":" + params.TimeFromMinute + ":" + params.TimeFromSecond
-	}
-
-	var timeTo = ""
-	if digitReg.MatchString(params.TimeToHour) && digitReg.MatchString(params.TimeToMinute) && digitReg.MatchString(params.TimeToSecond) {
-		timeTo = params.TimeToHour + ":" + params.TimeToMinute + ":" + params.TimeToSecond
-	}
-
-	resp, err := this.RPC().MessageRecipientRPC().CreateMessageRecipient(this.AdminContext(), &pb.CreateMessageRecipientRequest{
-		AdminId:                  params.AdminId,
-		MessageMediaInstanceId:   params.InstanceId,
-		User:                     params.User,
-		MessageRecipientGroupIds: groupIds,
-		Description:              params.Description,
-		TimeFrom:                 timeFrom,
-		TimeTo:                   timeTo,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	defer this.CreateLogInfo(codes.MessageRecipient_LogCreateMessageRecipient, resp.MessageRecipientId)
-
-	this.Success()
-}

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

@@ -1,25 +0,0 @@
-package recipients
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-)
-
-type DeleteAction struct {
-	actionutils.ParentAction
-}
-
-func (this *DeleteAction) RunPost(params struct {
-	RecipientId int64
-}) {
-	defer this.CreateLogInfo(codes.MessageRecipient_LogDeleteMessageRecipient, 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

@@ -1,38 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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

@@ -1,34 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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

@@ -1,39 +0,0 @@
-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

@@ -1,64 +0,0 @@
-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

@@ -1,74 +0,0 @@
-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,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	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

@@ -1,25 +0,0 @@
-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

@@ -1,267 +0,0 @@
-package instances
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
-	"github.com/TeaOSLab/EdgeCommon/pkg/monitorconfigs"
-	"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
-
-	RateMinutes int32
-	RateCount   int32
-
-	HashLife int32
-
-	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
-	}
-
-	var rateConfig = &monitorconfigs.RateConfig{
-		Minutes: params.RateMinutes,
-		Count:   params.RateCount,
-	}
-	rateJSON, err := json.Marshal(rateConfig)
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	resp, err := this.RPC().MessageMediaInstanceRPC().CreateMessageMediaInstance(this.AdminContext(), &pb.CreateMessageMediaInstanceRequest{
-		Name:        params.Name,
-		MediaType:   params.MediaType,
-		ParamsJSON:  optionsJSON,
-		Description: params.Description,
-		RateJSON:    rateJSON,
-		HashLife:    params.HashLife,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	defer this.CreateLogInfo(codes.MessageMediaInstance_LogCreateMessageMediaInstance, resp.MessageMediaInstanceId)
-
-	this.Success()
-}

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

@@ -1,25 +0,0 @@
-package instances
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-)
-
-type DeleteAction struct {
-	actionutils.ParentAction
-}
-
-func (this *DeleteAction) RunPost(params struct {
-	InstanceId int64
-}) {
-	defer this.CreateLogInfo(codes.MessageMediaInstance_LogDeleteMessageMediaInstance, 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

@@ -1,61 +0,0 @@
-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,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	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

@@ -1,25 +0,0 @@
-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

@@ -1,67 +0,0 @@
-package instances
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/monitorconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/maps"
-)
-
-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
-		}
-	}
-
-	// 频率
-	var rateConfig = &monitorconfigs.RateConfig{}
-	if len(instance.RateJSON) > 0 {
-		err = json.Unmarshal(instance.RateJSON, rateConfig)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-	}
-
-	this.Data["instance"] = maps.Map{
-		"id":   instance.Id,
-		"name": instance.Name,
-		"isOn": instance.IsOn,
-		"media": maps.Map{
-			"type": instance.MessageMedia.Type,
-			"name": instance.MessageMedia.Name,
-		},
-		"description": instance.Description,
-		"params":      mediaParams,
-		"rate":        rateConfig,
-		"hashLife":    instance.HashLife,
-	}
-
-	this.Show()
-}

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

@@ -1,39 +0,0 @@
-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

@@ -1,88 +0,0 @@
-package instances
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
-	"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(codes.MessageTask_LogCreateTestingMessageTask, resp.MessageTaskId)
-
-	this.Success()
-}

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

@@ -1,317 +0,0 @@
-package instances
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
-	"github.com/TeaOSLab/EdgeCommon/pkg/monitorconfigs"
-	"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
-		}
-	}
-
-	var rateConfig = &monitorconfigs.RateConfig{}
-	if len(instance.RateJSON) > 0 {
-		err = json.Unmarshal(instance.RateJSON, rateConfig)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-	}
-
-	this.Data["instance"] = maps.Map{
-		"id":   instance.Id,
-		"name": instance.Name,
-		"isOn": instance.IsOn,
-		"media": maps.Map{
-			"type": instance.MessageMedia.Type,
-			"name": instance.MessageMedia.Name,
-		},
-		"description": instance.Description,
-		"params":      mediaParams,
-		"rate":        rateConfig,
-		"hashLife":    instance.HashLife,
-	}
-
-	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
-
-	RateMinutes int32
-	RateCount   int32
-
-	HashLife int32
-
-	Must *actions.Must
-	CSRF *actionutils.CSRF
-}) {
-	defer this.CreateLogInfo(codes.MessageMediaInstance_LogUpdateMessageMediaInstance, 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
-	}
-
-	var rateConfig = &monitorconfigs.RateConfig{
-		Minutes: params.RateMinutes,
-		Count:   params.RateCount,
-	}
-	rateJSON, err := json.Marshal(rateConfig)
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	_, err = this.RPC().MessageMediaInstanceRPC().UpdateMessageMediaInstance(this.AdminContext(), &pb.UpdateMessageMediaInstanceRequest{
-		MessageMediaInstanceId: params.InstanceId,
-		Name:                   params.Name,
-		MediaType:              params.MediaType,
-		ParamsJSON:             optionsJSON,
-		Description:            params.Description,
-		RateJSON:               rateJSON,
-		HashLife:               params.HashLife,
-		IsOn:                   params.IsOn,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Success()
-}

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

@@ -1,61 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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

@@ -1,52 +0,0 @@
-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,
-		"timeFrom":    recipient.TimeFrom,
-		"timeTo":      recipient.TimeTo,
-	}
-
-	this.Show()
-}

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

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

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

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

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

@@ -1,21 +0,0 @@
-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").
-			Get("", new(IndexAction)).
-			Post("/taskInfo", new(TaskInfoAction)).
-			Post("/delete", new(DeleteAction)).
-			EndAll()
-	})
-}

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

@@ -1,40 +0,0 @@
-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

@@ -1,114 +0,0 @@
-package recipients
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
-	"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(codes.MessageTask_LogCreateTestingMessageTask, resp.MessageTaskId)
-
-	this.Success()
-}

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

@@ -1,144 +0,0 @@
-package recipients
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/actions"
-	"github.com/iwind/TeaGo/maps"
-	"regexp"
-	"strings"
-)
-
-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
-	}
-
-	var timeFromHour = ""
-	var timeFromMinute = ""
-	var timeFromSecond = ""
-
-	if len(recipient.TimeFrom) > 0 {
-		var pieces = strings.Split(recipient.TimeFrom, ":")
-		timeFromHour = pieces[0]
-		timeFromMinute = pieces[1]
-		timeFromSecond = pieces[2]
-	}
-
-	var timeToHour = ""
-	var timeToMinute = ""
-	var timeToSecond = ""
-	if len(recipient.TimeTo) > 0 {
-		var pieces = strings.Split(recipient.TimeTo, ":")
-		timeToHour = pieces[0]
-		timeToMinute = pieces[1]
-		timeToSecond = pieces[2]
-	}
-
-	this.Data["recipient"] = maps.Map{
-		"id": recipient.Id,
-		"admin": maps.Map{
-			"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,
-		"timeFromHour":   timeFromHour,
-		"timeFromMinute": timeFromMinute,
-		"timeFromSecond": timeFromSecond,
-		"timeToHour":     timeToHour,
-		"timeToMinute":   timeToMinute,
-		"timeToSecond":   timeToSecond,
-	}
-
-	this.Show()
-}
-
-func (this *UpdateAction) RunPost(params struct {
-	RecipientId int64
-
-	AdminId    int64
-	User       string
-	InstanceId int64
-
-	GroupIds    string
-	Description string
-	IsOn        bool
-
-	TimeFromHour   string
-	TimeFromMinute string
-	TimeFromSecond string
-
-	TimeToHour   string
-	TimeToMinute string
-	TimeToSecond string
-
-	Must *actions.Must
-	CSRF *actionutils.CSRF
-}) {
-	defer this.CreateLogInfo(codes.MessageRecipient_LogUpdateMessageRecipient, params.RecipientId)
-
-	params.Must.
-		Field("adminId", params.AdminId).
-		Gt(0, "请选择系统用户").
-		Field("instanceId", params.InstanceId).
-		Gt(0, "请选择媒介")
-
-	groupIds := utils.SplitNumbers(params.GroupIds)
-
-	var digitReg = regexp.MustCompile(`^\d+$`)
-
-	var timeFrom = ""
-	if digitReg.MatchString(params.TimeFromHour) && digitReg.MatchString(params.TimeFromMinute) && digitReg.MatchString(params.TimeFromSecond) {
-		timeFrom = params.TimeFromHour + ":" + params.TimeFromMinute + ":" + params.TimeFromSecond
-	}
-
-	var timeTo = ""
-	if digitReg.MatchString(params.TimeToHour) && digitReg.MatchString(params.TimeToMinute) && digitReg.MatchString(params.TimeToSecond) {
-		timeTo = params.TimeToHour + ":" + params.TimeToMinute + ":" + params.TimeToSecond
-	}
-
-	_, err := this.RPC().MessageRecipientRPC().UpdateMessageRecipient(this.AdminContext(), &pb.UpdateMessageRecipientRequest{
-		MessageRecipientId:       params.RecipientId,
-		AdminId:                  params.AdminId,
-		MessageMediaInstanceId:   params.InstanceId,
-		User:                     params.User,
-		MessageRecipientGroupIds: groupIds,
-		Description:              params.Description,
-		IsOn:                     params.IsOn,
-		TimeFrom:                 timeFrom,
-		TimeTo:                   timeTo,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Success()
-}

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

@@ -1,62 +0,0 @@
-// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-
-package thresholds
-
-import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/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", "update")
-	this.SecondMenu("threshold")
-}
-
-func (this *IndexAction) RunGet(params struct {
-	ClusterId int64
-	NodeId    int64
-}) {
-	_, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId)
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Data["nodeId"] = params.NodeId
-
-	// 列出所有阈值
-	thresholdsResp, err := this.RPC().NodeThresholdRPC().FindAllEnabledNodeThresholds(this.AdminContext(), &pb.FindAllEnabledNodeThresholdsRequest{
-		Role:          "node",
-		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/settings/dns/index.go

@@ -14,7 +14,7 @@ type IndexAction struct {
 }
 
 func (this *IndexAction) Init() {
-	this.Nav("", "setting", "")
+	this.Nav("", "setting", "index")
 	this.SecondMenu("dns")
 }
 

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

@@ -0,0 +1,303 @@
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+
+package dns
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+type RecordsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *RecordsAction) Init() {
+	this.Nav("", "setting", "records")
+	this.SecondMenu("dns")
+}
+
+func (this *RecordsAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	// 集群信息
+	clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var cluster = clusterResp.NodeCluster
+	if cluster == nil {
+		this.NotFound("nodeCluster", params.ClusterId)
+		return
+	}
+	this.Data["cluster"] = maps.Map{
+		"id":   cluster.Id,
+		"name": cluster.Name,
+	}
+
+	// DNS信息
+	dnsResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeClusterDNS(this.AdminContext(), &pb.FindEnabledNodeClusterDNSRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var defaultRoute = dnsResp.DefaultRoute
+	var domainName = ""
+	var dnsMap = maps.Map{
+		"dnsName":          dnsResp.Name,
+		"domainId":         0,
+		"domainName":       "",
+		"providerId":       0,
+		"providerName":     "",
+		"providerTypeName": "",
+	}
+	if dnsResp.Domain != nil {
+		domainName = dnsResp.Domain.Name
+		dnsMap["domainId"] = dnsResp.Domain.Id
+		dnsMap["domainName"] = dnsResp.Domain.Name
+	}
+	if dnsResp.Provider != nil {
+		dnsMap["providerId"] = dnsResp.Provider.Id
+		dnsMap["providerName"] = dnsResp.Provider.Name
+		dnsMap["providerTypeName"] = dnsResp.Provider.TypeName
+	}
+
+	if len(dnsResp.CnameRecords) > 0 {
+		dnsMap["cnameRecords"] = dnsResp.CnameRecords
+	} else {
+		dnsMap["cnameRecords"] = []string{}
+	}
+
+	this.Data["dnsInfo"] = dnsMap
+
+	// 未安装的节点
+	notInstalledNodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesDNSWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodesDNSWithNodeClusterIdRequest{
+		NodeClusterId: params.ClusterId,
+		IsInstalled:   false,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var allNodes = notInstalledNodesResp.Nodes
+
+	// 节点DNS解析记录
+	nodesResp, err := this.RPC().NodeRPC().FindAllEnabledNodesDNSWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledNodesDNSWithNodeClusterIdRequest{
+		NodeClusterId: params.ClusterId,
+		IsInstalled:   true,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var installedNodeIdsMap = map[int64]bool{}
+	for _, node := range nodesResp.Nodes {
+		installedNodeIdsMap[node.Id] = true
+	}
+
+	allNodes = append(allNodes, nodesResp.Nodes...)
+
+	var nodeMaps = []maps.Map{}
+	for _, node := range allNodes {
+		var isInstalled = installedNodeIdsMap[node.Id]
+
+		if len(node.Routes) > 0 {
+			for _, route := range node.Routes {
+				// 检查是否已解析
+				var isResolved = false
+				if isInstalled && cluster.DnsDomainId > 0 && len(cluster.DnsName) > 0 && len(node.IpAddr) > 0 {
+					var recordType = "A"
+					if utils.IsIPv6(node.IpAddr) {
+						recordType = "AAAA"
+					}
+					checkResp, err := this.RPC().DNSDomainRPC().ExistDNSDomainRecord(this.AdminContext(), &pb.ExistDNSDomainRecordRequest{
+						DnsDomainId: cluster.DnsDomainId,
+						Name:        cluster.DnsName,
+						Type:        recordType,
+						Route:       route.Code,
+						Value:       node.IpAddr,
+					})
+					if err != nil {
+						this.ErrorPage(err)
+						return
+					}
+					isResolved = checkResp.IsOk
+				}
+
+				nodeMaps = append(nodeMaps, maps.Map{
+					"id":       node.Id,
+					"name":     node.Name,
+					"ipAddr":   node.IpAddr,
+					"ipAddrId": node.NodeIPAddressId,
+					"route": maps.Map{
+						"name": route.Name,
+						"code": route.Code,
+					},
+					"clusterId":   node.NodeClusterId,
+					"isResolved":  isResolved,
+					"isInstalled": isInstalled,
+					"isBackup":    node.IsBackupForCluster || node.IsBackupForGroup,
+					"isOffline":   node.IsOffline,
+				})
+			}
+		} else {
+			// 默认线路
+			var isResolved = false
+			if isInstalled && len(defaultRoute) > 0 {
+				var recordType = "A"
+				if utils.IsIPv6(node.IpAddr) {
+					recordType = "AAAA"
+				}
+				checkResp, err := this.RPC().DNSDomainRPC().ExistDNSDomainRecord(this.AdminContext(), &pb.ExistDNSDomainRecordRequest{
+					DnsDomainId: cluster.DnsDomainId,
+					Name:        cluster.DnsName,
+					Type:        recordType,
+					Route:       defaultRoute,
+					Value:       node.IpAddr,
+				})
+				if err != nil {
+					this.ErrorPage(err)
+					return
+				}
+				isResolved = checkResp.IsOk
+			}
+			nodeMaps = append(nodeMaps, maps.Map{
+				"id":       node.Id,
+				"name":     node.Name,
+				"ipAddr":   node.IpAddr,
+				"ipAddrId": node.NodeIPAddressId,
+				"route": maps.Map{
+					"name": "",
+					"code": "",
+				},
+				"clusterId":   node.NodeClusterId,
+				"isResolved":  isResolved,
+				"isInstalled": isInstalled,
+				"isBackup":    node.IsBackupForCluster || node.IsBackupForGroup,
+				"isOffline":   node.IsOffline,
+			})
+		}
+	}
+	this.Data["nodes"] = nodeMaps
+
+	// 代理服务解析记录
+	serversResp, err := this.RPC().ServerRPC().FindAllEnabledServersDNSWithNodeClusterId(this.AdminContext(), &pb.FindAllEnabledServersDNSWithNodeClusterIdRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var serverMaps = []maps.Map{}
+	for _, server := range serversResp.Servers {
+		// 检查是否已解析
+		isResolved := false
+		if cluster.DnsDomainId > 0 && len(cluster.DnsName) > 0 && len(server.DnsName) > 0 && len(domainName) > 0 {
+			checkResp, err := this.RPC().DNSDomainRPC().ExistDNSDomainRecord(this.AdminContext(), &pb.ExistDNSDomainRecordRequest{
+				DnsDomainId: cluster.DnsDomainId,
+				Name:        server.DnsName,
+				Type:        "CNAME",
+				Value:       cluster.DnsName + "." + domainName,
+			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			isResolved = checkResp.IsOk
+		}
+
+		serverMaps = append(serverMaps, maps.Map{
+			"id":         server.Id,
+			"name":       server.Name,
+			"dnsName":    server.DnsName,
+			"isResolved": isResolved,
+		})
+	}
+	this.Data["servers"] = serverMaps
+
+	// 检查解析记录是否有变化
+	checkChangesResp, err := this.RPC().NodeClusterRPC().CheckNodeClusterDNSChanges(this.AdminContext(), &pb.CheckNodeClusterDNSChangesRequest{NodeClusterId: params.ClusterId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["dnsHasChanges"] = checkChangesResp.IsChanged
+
+	// 需要解决的问题
+	issuesResp, err := this.RPC().DNSRPC().FindAllDNSIssues(this.AdminContext(), &pb.FindAllDNSIssuesRequest{
+		NodeClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var issueMaps = []maps.Map{}
+	for _, issue := range issuesResp.Issues {
+		issueMaps = append(issueMaps, maps.Map{
+			"target":      issue.Target,
+			"targetId":    issue.TargetId,
+			"type":        issue.Type,
+			"description": issue.Description,
+			"params":      issue.Params,
+		})
+	}
+	this.Data["issues"] = issueMaps
+
+	// 当前正在执行的任务
+	resp, err := this.RPC().DNSTaskRPC().FindAllDoingDNSTasks(this.AdminContext(), &pb.FindAllDoingDNSTasksRequest{
+		NodeClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var taskMaps = []maps.Map{}
+	for _, task := range resp.DnsTasks {
+		var clusterMap maps.Map = nil
+		var nodeMap maps.Map = nil
+		var serverMap maps.Map = nil
+		var domainMap maps.Map = nil
+
+		if task.NodeCluster != nil {
+			clusterMap = maps.Map{
+				"id":   task.NodeCluster.Id,
+				"name": task.NodeCluster.Name,
+			}
+		}
+		if task.Node != nil {
+			nodeMap = maps.Map{
+				"id":   task.Node.Id,
+				"name": task.Node.Name,
+			}
+		}
+		if task.Server != nil {
+			serverMap = maps.Map{
+				"id":   task.Server.Id,
+				"name": task.Server.Name,
+			}
+		}
+		if task.DnsDomain != nil {
+			domainMap = maps.Map{
+				"id":   task.DnsDomain.Id,
+				"name": task.DnsDomain.Name,
+			}
+		}
+
+		taskMaps = append(taskMaps, maps.Map{
+			"id":          task.Id,
+			"type":        task.Type,
+			"isDone":      task.IsDone,
+			"isOk":        task.IsOk,
+			"error":       task.Error,
+			"updatedTime": timeutil.FormatTime("Y-m-d H:i:s", task.UpdatedAt),
+			"cluster":     clusterMap,
+			"node":        nodeMap,
+			"server":      serverMap,
+			"domain":      domainMap,
+		})
+	}
+	this.Data["tasks"] = taskMaps
+
+	this.Show()
+}

internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go

@@ -100,6 +100,9 @@ func (this *IndexAction) RunPost(params struct {
 	HttpAllNodeIPShowPage                  bool
 	HttpAllEnableServerAddrVariable        bool
 
+	HttpAllDomainAuditingIsOn   bool
+	HttpAllDomainAuditingPrompt string
+
 	HttpAllServerName                string
 	HttpAllSupportsLowVersionHTTP    bool
 	HttpAllMatchCertFromAllServers   bool
@@ -119,6 +122,11 @@ func (this *IndexAction) RunPost(params struct {
 	PerformanceAutoWriteTimeout bool
 	PerformanceDebug            bool
 
+	// TCP端口设置
+	TcpAllPortRangeMin int
+	TcpAllPortRangeMax int
+	TcpAllDenyPorts    []int
+
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
@@ -172,6 +180,9 @@ func (this *IndexAction) RunPost(params struct {
 	config.HTTPAll.NodeIPShowPage = params.HttpAllNodeIPShowPage
 	config.HTTPAll.NodeIPPageHTML = params.HttpAllNodeIPPageHTML
 
+	config.HTTPAll.DomainAuditingIsOn = params.HttpAllDomainAuditingIsOn
+	config.HTTPAll.DomainAuditingPrompt = params.HttpAllDomainAuditingPrompt
+
 	// HTTP All
 	config.HTTPAll.ServerName = params.HttpAllServerName
 	config.HTTPAll.SupportsLowVersionHTTP = params.HttpAllSupportsLowVersionHTTP
@@ -191,6 +202,23 @@ func (this *IndexAction) RunPost(params struct {
 	// 日志
 	config.Log.RecordServerError = params.LogRecordServerError
 
+	// TCP
+	if params.TcpAllPortRangeMin < 1024 {
+		params.TcpAllPortRangeMin = 1024
+	}
+	if params.TcpAllPortRangeMax > 65534 {
+		params.TcpAllPortRangeMax = 65534
+	} else if params.TcpAllPortRangeMax < 1024 {
+		params.TcpAllPortRangeMax = 1024
+	}
+	if params.TcpAllPortRangeMin > params.TcpAllPortRangeMax {
+		params.TcpAllPortRangeMin, params.TcpAllPortRangeMax = params.TcpAllPortRangeMax, params.TcpAllPortRangeMin
+	}
+
+	config.TCPAll.DenyPorts = params.TcpAllDenyPorts
+	config.TCPAll.PortRangeMin = params.TcpAllPortRangeMin
+	config.TCPAll.PortRangeMax = params.TcpAllPortRangeMax
+
 	// 性能
 	config.Performance.AutoReadTimeout = params.PerformanceAutoReadTimeout
 	config.Performance.AutoWriteTimeout = params.PerformanceAutoWriteTimeout

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

@@ -112,6 +112,7 @@ func (this *IndexAction) RunGet(params struct {
 		"clock":               clockConfig,
 		"autoRemoteStart":     cluster.AutoRemoteStart,
 		"autoInstallNftables": cluster.AutoInstallNftables,
+		"autoSystemTuning":    cluster.AutoSystemTuning,
 		"sshParams":           sshParams,
 		"domainName":          fullDomainName,
 	}
@@ -139,6 +140,7 @@ func (this *IndexAction) RunPost(params struct {
 	ClockCheckChrony    bool
 	AutoRemoteStart     bool
 	AutoInstallNftables bool
+	AutoSystemTuning    bool
 
 	Must *actions.Must
 }) {
@@ -193,6 +195,7 @@ func (this *IndexAction) RunPost(params struct {
 		ClockJSON:           clockConfigJSON,
 		AutoRemoteStart:     params.AutoRemoteStart,
 		AutoInstallNftables: params.AutoInstallNftables,
+		AutoSystemTuning:    params.AutoSystemTuning,
 		SshParamsJSON:       sshParamsJSON,
 	})
 	if err != nil {

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

@@ -40,6 +40,7 @@ func init() {
 			// DNS
 			Prefix("/clusters/cluster/settings/dns").
 			GetPost("", new(dns.IndexAction)).
+			Get("/records", new(dns.RecordsAction)).
 			Post("/randomName", new(dns.RandomNameAction)).
 
 			// 系统服务设置

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

@@ -64,6 +64,7 @@ func (this *CreateAction) RunPost(params struct {
 	InstallDir          string
 	SystemdServiceIsOn  bool
 	AutoInstallNftables bool
+	AutoSystemTuning    bool
 
 	// DNS相关
 	DnsDomainId int64
@@ -132,6 +133,7 @@ func (this *CreateAction) RunPost(params struct {
 		SystemServicesJSON:     systemServicesJSON,
 		GlobalServerConfigJSON: globalServerConfigJSON,
 		AutoInstallNftables:    params.AutoInstallNftables,
+		AutoSystemTuning:       params.AutoSystemTuning,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/dashboard/dashboardutils/utils.go

@@ -8,7 +8,6 @@ import (
 	"encoding/json"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
-	"github.com/TeaOSLab/EdgeAdmin/internal/utils/sizes"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/lists"
@@ -19,6 +18,7 @@ import (
 	"os/exec"
 	"regexp"
 	"runtime"
+	"strings"
 )
 
 // CheckDiskPartitions 检查服务器磁盘空间
@@ -47,9 +47,17 @@ func CheckDiskPartitions(thresholdPercent float64) (path string, usage uint64, u
 		if p.Fstype != rootFS {
 			continue
 		}
+
+		// skip some specified partitions on macOS
+		if runtime.GOOS == "darwin" {
+			if strings.Contains(p.Mountpoint, "/Developer/") {
+				continue
+			}
+		}
+
 		stat, _ := disk.Usage(p.Mountpoint)
 		if stat != nil {
-			if stat.Used < 2*uint64(sizes.G) {
+			if stat.Used < (5<<30) || stat.Free > (100<<30) {
 				continue
 			}
 			if stat.UsedPercent > thresholdPercent {

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

@@ -154,17 +154,6 @@ func (this *IndexAction) RunPost(params struct{}) {
 			"version": "",
 		}
 	}
-	if resp.MonitorNodeUpgradeInfo != nil {
-		this.Data["monitorNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.MonitorNodeUpgradeInfo.CountNodes,
-			"version": resp.MonitorNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["monitorNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
 	if resp.ApiNodeUpgradeInfo != nil {
 		this.Data["apiNodeUpgradeInfo"] = maps.Map{
 			"count":   resp.ApiNodeUpgradeInfo.CountNodes,
@@ -176,39 +165,6 @@ func (this *IndexAction) RunPost(params struct{}) {
 			"version": "",
 		}
 	}
-	if resp.UserNodeUpgradeInfo != nil {
-		this.Data["userNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.UserNodeUpgradeInfo.CountNodes,
-			"version": resp.UserNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["userNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": 0,
-		}
-	}
-	if resp.AuthorityNodeUpgradeInfo != nil {
-		this.Data["authorityNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.AuthorityNodeUpgradeInfo.CountNodes,
-			"version": resp.AuthorityNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["authorityNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
-	if resp.NsNodeUpgradeInfo != nil {
-		this.Data["nsNodeUpgradeInfo"] = maps.Map{
-			"count":   resp.NsNodeUpgradeInfo.CountNodes,
-			"version": resp.NsNodeUpgradeInfo.NewVersion,
-		}
-	} else {
-		this.Data["nsNodeUpgradeInfo"] = maps.Map{
-			"count":   0,
-			"version": "",
-		}
-	}
 
 	// 域名排行
 	{

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

@@ -52,9 +52,13 @@ func (this *CreatePopupAction) RunPost(params struct {
 	Type string
 
 	// DNSPod
-	ParamId     string
-	ParamToken  string
-	ParamRegion string
+	ParamDNSPodId     string
+	ParamDNSPodToken  string
+	ParamDNSPodRegion string
+
+	ParamDNSPodAPIType         string
+	ParamDNSPodAccessKeyId     string
+	ParamDNSPodAccessKeySecret string
 
 	// AliDNS
 	ParamAliDNSAccessKeyId     string
@@ -89,18 +93,31 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Field("type", params.Type).
 		Require("请选择服务商厂家")
 
-	apiParams := maps.Map{}
+	var apiParams = maps.Map{}
 	switch params.Type {
 	case "dnspod":
-		params.Must.
-			Field("paramId", params.ParamId).
-			Require("请输入密钥ID").
-			Field("paramToken", params.ParamToken).
-			Require("请输入密钥Token")
+		apiParams["apiType"] = params.ParamDNSPodAPIType
+		switch params.ParamDNSPodAPIType {
+		case "tencentDNS":
+			params.Must.
+				Field("paramDNSPodAccessKeyId", params.ParamDNSPodAccessKeyId).
+				Require("请输入SecretId").
+				Field("paramDNSPodAccessKeySecret", params.ParamDNSPodAccessKeySecret).
+				Require("请输入SecretKey")
+			apiParams["accessKeyId"] = params.ParamDNSPodAccessKeyId
+			apiParams["accessKeySecret"] = params.ParamDNSPodAccessKeySecret
+			apiParams["region"] = params.ParamDNSPodRegion
+		default:
+			params.Must.
+				Field("paramId", params.ParamDNSPodId).
+				Require("请输入密钥ID").
+				Field("paramToken", params.ParamDNSPodToken).
+				Require("请输入密钥Token")
 
-		apiParams["id"] = params.ParamId
-		apiParams["token"] = params.ParamToken
-		apiParams["region"] = params.ParamRegion
+			apiParams["id"] = params.ParamDNSPodId
+			apiParams["token"] = params.ParamDNSPodToken
+			apiParams["region"] = params.ParamDNSPodRegion
+		}
 	case "alidns":
 		params.Must.
 			Field("paramAliDNSAccessKeyId", params.ParamAliDNSAccessKeyId).

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

@@ -79,9 +79,13 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	Type string
 
 	// DNSPod
-	ParamId     string
-	ParamToken  string
-	ParamRegion string
+	ParamDNSPodId     string
+	ParamDNSPodToken  string
+	ParamDNSPodRegion string
+
+	ParamDNSPodAPIType         string
+	ParamDNSPodAccessKeyId     string
+	ParamDNSPodAccessKeySecret string
 
 	// AliDNS
 	ParamAliDNSAccessKeyId     string
@@ -118,18 +122,31 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		Field("type", params.Type).
 		Require("请选择服务商厂家")
 
-	apiParams := maps.Map{}
+	var apiParams = maps.Map{}
 	switch params.Type {
 	case "dnspod":
-		params.Must.
-			Field("paramId", params.ParamId).
-			Require("请输入密钥ID").
-			Field("paramToken", params.ParamToken).
-			Require("请输入密钥Token")
+		apiParams["apiType"] = params.ParamDNSPodAPIType
+		switch params.ParamDNSPodAPIType {
+		case "tencentDNS":
+			params.Must.
+				Field("paramDNSPodAccessKeyId", params.ParamDNSPodAccessKeyId).
+				Require("请输入SecretId").
+				Field("paramDNSPodAccessKeySecret", params.ParamDNSPodAccessKeySecret).
+				Require("请输入SecretKey")
+			apiParams["accessKeyId"] = params.ParamDNSPodAccessKeyId
+			apiParams["accessKeySecret"] = params.ParamDNSPodAccessKeySecret
+			apiParams["region"] = params.ParamDNSPodRegion
+		default:
+			params.Must.
+				Field("paramId", params.ParamDNSPodId).
+				Require("请输入密钥ID").
+				Field("paramToken", params.ParamDNSPodToken).
+				Require("请输入密钥Token")
 
-		apiParams["id"] = params.ParamId
-		apiParams["token"] = params.ParamToken
-		apiParams["region"] = params.ParamRegion
+			apiParams["id"] = params.ParamDNSPodId
+			apiParams["token"] = params.ParamDNSPodToken
+			apiParams["region"] = params.ParamDNSPodRegion
+		}
 	case "alidns":
 		params.Must.
 			Field("paramAliDNSAccessKeyId", params.ParamAliDNSAccessKeyId).

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

@@ -17,12 +17,16 @@ func (this *IndexAction) Init() {
 }
 
 func (this *IndexAction) RunGet(params struct {
-	UserId  int64
-	Type    string
-	Keyword string
+	UserId   int64
+	Type     string
+	Keyword  string
+	UserType string
 }) {
 	this.Data["type"] = params.Type
 	this.Data["keyword"] = params.Keyword
+	this.Data["userType"] = params.UserType
+
+	var userOnly = params.UserId > 0 || params.UserType == "user"
 
 	// 当前用户
 	this.Data["searchingUserId"] = params.UserId
@@ -58,8 +62,9 @@ func (this *IndexAction) RunGet(params struct {
 	{
 		// all
 		resp, err := this.RPC().ACMETaskRPC().CountAllEnabledACMETasks(this.AdminContext(), &pb.CountAllEnabledACMETasksRequest{
-			UserId:  params.UserId,
-			Keyword: params.Keyword,
+			UserId:   params.UserId,
+			Keyword:  params.Keyword,
+			UserOnly: userOnly,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -72,6 +77,7 @@ func (this *IndexAction) RunGet(params struct {
 			UserId:      params.UserId,
 			IsAvailable: true,
 			Keyword:     params.Keyword,
+			UserOnly:    userOnly,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -84,6 +90,7 @@ func (this *IndexAction) RunGet(params struct {
 			UserId:    params.UserId,
 			IsExpired: true,
 			Keyword:   params.Keyword,
+			UserOnly:  userOnly,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -96,6 +103,7 @@ func (this *IndexAction) RunGet(params struct {
 			UserId:       params.UserId,
 			ExpiringDays: 7,
 			Keyword:      params.Keyword,
+			UserOnly:     userOnly,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -108,6 +116,7 @@ func (this *IndexAction) RunGet(params struct {
 			UserId:       params.UserId,
 			ExpiringDays: 30,
 			Keyword:      params.Keyword,
+			UserOnly:     userOnly,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -130,10 +139,11 @@ func (this *IndexAction) RunGet(params struct {
 	case "":
 		page = this.NewPage(countAll)
 		tasksResp, err = this.RPC().ACMETaskRPC().ListEnabledACMETasks(this.AdminContext(), &pb.ListEnabledACMETasksRequest{
-			UserId:  params.UserId,
-			Offset:  page.Offset,
-			Size:    page.Size,
-			Keyword: params.Keyword,
+			UserId:   params.UserId,
+			Offset:   page.Offset,
+			Size:     page.Size,
+			Keyword:  params.Keyword,
+			UserOnly: userOnly,
 		})
 	case "available":
 		page = this.NewPage(countAvailable)
@@ -143,6 +153,7 @@ func (this *IndexAction) RunGet(params struct {
 			Offset:      page.Offset,
 			Size:        page.Size,
 			Keyword:     params.Keyword,
+			UserOnly:    userOnly,
 		})
 	case "expired":
 		page = this.NewPage(countExpired)
@@ -152,6 +163,7 @@ func (this *IndexAction) RunGet(params struct {
 			Offset:    page.Offset,
 			Size:      page.Size,
 			Keyword:   params.Keyword,
+			UserOnly:  userOnly,
 		})
 	case "7days":
 		page = this.NewPage(count7Days)
@@ -161,6 +173,7 @@ func (this *IndexAction) RunGet(params struct {
 			Offset:       page.Offset,
 			Size:         page.Size,
 			Keyword:      params.Keyword,
+			UserOnly:     userOnly,
 		})
 	case "30days":
 		page = this.NewPage(count30Days)
@@ -170,14 +183,16 @@ func (this *IndexAction) RunGet(params struct {
 			Offset:       page.Offset,
 			Size:         page.Size,
 			Keyword:      params.Keyword,
+			UserOnly:     userOnly,
 		})
 	default:
 		page = this.NewPage(countAll)
 		tasksResp, err = this.RPC().ACMETaskRPC().ListEnabledACMETasks(this.AdminContext(), &pb.ListEnabledACMETasksRequest{
-			UserId:  params.UserId,
-			Keyword: params.Keyword,
-			Offset:  page.Offset,
-			Size:    page.Size,
+			UserId:   params.UserId,
+			Keyword:  params.Keyword,
+			UserOnly: userOnly,
+			Offset:   page.Offset,
+			Size:     page.Size,
 		})
 	}
 	if err != nil {
@@ -242,6 +257,23 @@ func (this *IndexAction) RunGet(params struct {
 			}
 		}
 
+		// user
+		userResp, err := this.RPC().ACMETaskRPC().FindACMETaskUser(this.AdminContext(), &pb.FindACMETaskUserRequest{AcmeTaskId: task.Id})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		var taskUserMap = maps.Map{
+			"id": 0,
+		}
+		if userResp.User != nil {
+			taskUserMap = maps.Map{
+				"id":       userResp.User.Id,
+				"username": userResp.User.Username,
+				"fullname": userResp.User.Fullname,
+			}
+		}
+
 		taskMaps = append(taskMaps, maps.Map{
 			"id":       task.Id,
 			"authType": task.AuthType,
@@ -257,6 +289,7 @@ func (this *IndexAction) RunGet(params struct {
 			"autoRenew":   task.AutoRenew,
 			"cert":        certMap,
 			"log":         logMap,
+			"user":        taskUserMap,
 		})
 	}
 	this.Data["tasks"] = taskMaps

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

@@ -19,13 +19,19 @@ func (this *IndexAction) Init() {
 }
 
 func (this *IndexAction) RunGet(params struct {
-	UserId  int64
-	Type    string
-	Keyword string
+	UserId   int64
+	Type     string // [empty] | ca | 7days | ...
+	Keyword  string
+	UserType string
 }) {
 	this.Data["type"] = params.Type
 	this.Data["keyword"] = params.Keyword
 
+	if params.UserId > 0 {
+		params.UserType = "user"
+	}
+	this.Data["userType"] = params.UserType
+
 	// 当前用户
 	this.Data["searchingUserId"] = params.UserId
 	var userMap = maps.Map{
@@ -57,12 +63,15 @@ func (this *IndexAction) RunGet(params struct {
 	var count7Days int64
 	var count30Days int64
 
+	var userOnly = params.UserType == "user" || params.UserId > 0
+
 	// 计算数量
 	{
 		// all
 		resp, err := this.RPC().SSLCertRPC().CountSSLCerts(this.AdminContext(), &pb.CountSSLCertRequest{
-			UserId:  params.UserId,
-			Keyword: params.Keyword,
+			UserId:   params.UserId,
+			Keyword:  params.Keyword,
+			UserOnly: userOnly,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -72,9 +81,10 @@ func (this *IndexAction) RunGet(params struct {
 
 		// CA
 		resp, err = this.RPC().SSLCertRPC().CountSSLCerts(this.AdminContext(), &pb.CountSSLCertRequest{
-			UserId:  params.UserId,
-			IsCA:    true,
-			Keyword: params.Keyword,
+			UserId:   params.UserId,
+			IsCA:     true,
+			Keyword:  params.Keyword,
+			UserOnly: userOnly,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -87,6 +97,7 @@ func (this *IndexAction) RunGet(params struct {
 			UserId:      params.UserId,
 			IsAvailable: true,
 			Keyword:     params.Keyword,
+			UserOnly:    userOnly,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -99,6 +110,7 @@ func (this *IndexAction) RunGet(params struct {
 			UserId:    params.UserId,
 			IsExpired: true,
 			Keyword:   params.Keyword,
+			UserOnly:  userOnly,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -111,6 +123,7 @@ func (this *IndexAction) RunGet(params struct {
 			UserId:       params.UserId,
 			ExpiringDays: 7,
 			Keyword:      params.Keyword,
+			UserOnly:     userOnly,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -123,6 +136,7 @@ func (this *IndexAction) RunGet(params struct {
 			UserId:       params.UserId,
 			ExpiringDays: 30,
 			Keyword:      params.Keyword,
+			UserOnly:     userOnly,
 		})
 		if err != nil {
 			this.ErrorPage(err)
@@ -146,19 +160,21 @@ func (this *IndexAction) RunGet(params struct {
 	case "":
 		page = this.NewPage(countAll)
 		listResp, err = this.RPC().SSLCertRPC().ListSSLCerts(this.AdminContext(), &pb.ListSSLCertsRequest{
-			UserId:  params.UserId,
-			Offset:  page.Offset,
-			Size:    page.Size,
-			Keyword: params.Keyword,
+			UserId:   params.UserId,
+			Offset:   page.Offset,
+			Size:     page.Size,
+			Keyword:  params.Keyword,
+			UserOnly: userOnly,
 		})
 	case "ca":
 		page = this.NewPage(countCA)
 		listResp, err = this.RPC().SSLCertRPC().ListSSLCerts(this.AdminContext(), &pb.ListSSLCertsRequest{
-			UserId:  params.UserId,
-			IsCA:    true,
-			Offset:  page.Offset,
-			Size:    page.Size,
-			Keyword: params.Keyword,
+			UserId:   params.UserId,
+			IsCA:     true,
+			Offset:   page.Offset,
+			Size:     page.Size,
+			Keyword:  params.Keyword,
+			UserOnly: userOnly,
 		})
 	case "available":
 		page = this.NewPage(countAvailable)
@@ -168,6 +184,7 @@ func (this *IndexAction) RunGet(params struct {
 			Offset:      page.Offset,
 			Size:        page.Size,
 			Keyword:     params.Keyword,
+			UserOnly:    userOnly,
 		})
 	case "expired":
 		page = this.NewPage(countExpired)
@@ -177,6 +194,7 @@ func (this *IndexAction) RunGet(params struct {
 			Offset:    page.Offset,
 			Size:      page.Size,
 			Keyword:   params.Keyword,
+			UserOnly:  userOnly,
 		})
 	case "7days":
 		page = this.NewPage(count7Days)
@@ -195,14 +213,16 @@ func (this *IndexAction) RunGet(params struct {
 			Offset:       page.Offset,
 			Size:         page.Size,
 			Keyword:      params.Keyword,
+			UserOnly:     userOnly,
 		})
 	default:
 		page = this.NewPage(countAll)
 		listResp, err = this.RPC().SSLCertRPC().ListSSLCerts(this.AdminContext(), &pb.ListSSLCertsRequest{
-			UserId:  params.UserId,
-			Keyword: params.Keyword,
-			Offset:  page.Offset,
-			Size:    page.Size,
+			UserId:   params.UserId,
+			Keyword:  params.Keyword,
+			UserOnly: userOnly,
+			Offset:   page.Offset,
+			Size:     page.Size,
 		})
 	}
 	if err != nil {
@@ -221,6 +241,7 @@ func (this *IndexAction) RunGet(params struct {
 	var certMaps = []maps.Map{}
 	var nowTime = time.Now().Unix()
 	for _, certConfig := range certConfigs {
+		// count servers
 		countServersResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledServersWithSSLCertIdRequest{
 			SslCertId: certConfig.Id,
 		})
@@ -229,6 +250,23 @@ func (this *IndexAction) RunGet(params struct {
 			return
 		}
 
+		// user
+		userResp, err := this.RPC().SSLCertRPC().FindSSLCertUser(this.AdminContext(), &pb.FindSSLCertUserRequest{SslCertId: certConfig.Id})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		var certUserMap = maps.Map{
+			"id": 0,
+		}
+		if userResp.User != nil {
+			certUserMap = maps.Map{
+				"id":       userResp.User.Id,
+				"username": userResp.User.Username,
+				"fullname": userResp.User.Fullname,
+			}
+		}
+
 		certMaps = append(certMaps, maps.Map{
 			"isOn":         certConfig.IsOn,
 			"beginDay":     timeutil.FormatTime("Y-m-d", certConfig.TimeBeginAt),
@@ -236,6 +274,7 @@ func (this *IndexAction) RunGet(params struct {
 			"isExpired":    nowTime > certConfig.TimeEndAt,
 			"isAvailable":  nowTime <= certConfig.TimeEndAt,
 			"countServers": countServersResp.Count,
+			"user":         certUserMap,
 		})
 	}
 	this.Data["certInfos"] = certMaps

internal/web/actions/default/servers/components/helper.go

@@ -1,16 +0,0 @@
-package components
-
-import (
-	"github.com/iwind/TeaGo/actions"
-)
-
-type Helper struct {
-}
-
-func NewHelper() *Helper {
-	return &Helper{}
-}
-
-func (this *Helper) BeforeAction(action *actions.ActionObject) {
-	action.Data["teaMenu"] = "servers"
-}

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

@@ -1,118 +0,0 @@
-package components
-
-import (
-	"encoding/json"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/langs/codes"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/iwind/TeaGo/actions"
-)
-
-const (
-	SettingCodeServerGlobalConfig = "serverGlobalConfig"
-)
-
-type IndexAction struct {
-	actionutils.ParentAction
-}
-
-func (this *IndexAction) Init() {
-	this.Nav("", "component", "index")
-	this.SecondMenu("global")
-}
-
-func (this *IndexAction) RunGet(params struct{}) {
-	valueJSONResp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: SettingCodeServerGlobalConfig})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	valueJSON := valueJSONResp.ValueJSON
-	globalConfig := &serverconfigs.GlobalConfig{}
-
-	// 默认值
-	globalConfig.HTTPAll.DomainAuditingIsOn = false
-
-	if len(valueJSON) > 0 {
-		err = json.Unmarshal(valueJSON, globalConfig)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-	}
-	this.Data["globalConfig"] = globalConfig
-
-	this.Show()
-}
-
-func (this *IndexAction) RunPost(params struct {
-	GlobalConfigJSON []byte
-	Must             *actions.Must
-
-	// 不匹配域名相关
-	AllowMismatchDomains                []string
-	DomainMismatchAction                string
-	DomainMismatchActionPageStatusCode  int
-	DomainMismatchActionPageContentHTML string
-
-	// TCP端口设置
-	TcpAllPortRangeMin int
-	TcpAllPortRangeMax int
-	TcpAllDenyPorts    []int
-
-	DefaultDomain string
-}) {
-	// 创建日志
-	defer this.CreateLogInfo(codes.Server_LogUpdateGlobalSettings)
-
-	if len(params.GlobalConfigJSON) == 0 {
-		this.Fail("错误的配置信息，请刷新当前页面后重试")
-	}
-
-	globalConfig := &serverconfigs.GlobalConfig{}
-	err := json.Unmarshal(params.GlobalConfigJSON, globalConfig)
-	if err != nil {
-		this.Fail("配置校验失败：" + err.Error())
-	}
-
-	// TCP端口范围
-	if params.TcpAllPortRangeMin < 1024 {
-		params.TcpAllPortRangeMin = 1024
-	}
-	if params.TcpAllPortRangeMax > 65534 {
-		params.TcpAllPortRangeMax = 65534
-	} else if params.TcpAllPortRangeMax < 1024 {
-		params.TcpAllPortRangeMax = 1024
-	}
-	if params.TcpAllPortRangeMin > params.TcpAllPortRangeMax {
-		params.TcpAllPortRangeMin, params.TcpAllPortRangeMax = params.TcpAllPortRangeMax, params.TcpAllPortRangeMin
-	}
-	globalConfig.TCPAll.DenyPorts = params.TcpAllDenyPorts
-	globalConfig.TCPAll.PortRangeMin = params.TcpAllPortRangeMin
-	globalConfig.TCPAll.PortRangeMax = params.TcpAllPortRangeMax
-
-	// 修改配置
-	globalConfigJSON, err := json.Marshal(globalConfig)
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	_, err = this.RPC().SysSettingRPC().UpdateSysSetting(this.AdminContext(), &pb.UpdateSysSettingRequest{
-		Code:      SettingCodeServerGlobalConfig,
-		ValueJSON: globalConfigJSON,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	//  通知更新
-	_, err = this.RPC().ServerRPC().NotifyServersChange(this.AdminContext(), &pb.NotifyServersChangeRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Success()
-}

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

@@ -1,20 +0,0 @@
-package components
-
-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.AdminModuleCodeServer)).
-			Data("teaMenu", "servers").
-			Data("teaSubMenu", "global").
-			Helper(NewHelper()).
-			Prefix("/servers/components").
-			GetPost("", new(IndexAction)).
-			EndAll()
-	})
-}

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

@@ -71,7 +71,13 @@ func (this *CreateRulePopupAction) RunPost(params struct {
 		Field("prefix", params.Prefix).
 		Require("请选择参数")
 
-	rule := &firewallconfigs.HTTPFirewallRule{
+
+	if len(params.Value) > 4096 {
+		this.FailField("value", "对比值内容长度不能超过4096个字符")
+		return
+	}
+
+	var rule = &firewallconfigs.HTTPFirewallRule{
 		Id:   params.RuleId,
 		IsOn: true,
 	}
@@ -81,7 +87,7 @@ func (this *CreateRulePopupAction) RunPost(params struct {
 		rule.Param = "${" + params.Prefix + "}"
 	}
 
-	paramFilters := []*firewallconfigs.ParamFilter{}
+	var paramFilters = []*firewallconfigs.ParamFilter{}
 	if len(params.ParamFiltersJSON) > 0 {
 		err := json.Unmarshal(params.ParamFiltersJSON, &paramFilters)
 		if err != nil {

internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go

@@ -111,6 +111,7 @@ func (this *SettingAction) RunPost(params struct {
 		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 		ProxyProtocolJSON: proxyProtocolJSON,
 		Retry50X:          reverseProxyConfig.Retry50X,
+		Retry40X:          reverseProxyConfig.Retry40X,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go

@@ -111,6 +111,7 @@ func (this *SettingAction) RunPost(params struct {
 		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 		ProxyProtocolJSON: proxyProtocolJSON,
 		Retry50X:          reverseProxyConfig.Retry50X,
+		Retry40X:          reverseProxyConfig.Retry40X,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -2,6 +2,7 @@ package log
 
 import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
@@ -61,6 +62,27 @@ func (this *HistoryAction) RunGet(params struct {
 		return
 	}
 
+	// 检查当前网站有无开启访问日志
+	this.Data["serverAccessLogIsOn"] = true
+
+	groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{
+		ServerId: params.ServerId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if !groupResp.HasAccessLogConfig {
+		webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if webConfig != nil && webConfig.AccessLogRef != nil && !webConfig.AccessLogRef.IsOn {
+			this.Data["serverAccessLogIsOn"] = false
+		}
+	}
+
 	var day = params.Day
 	var ipList = []string{}
 	var wafMaps = []maps.Map{}

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

@@ -2,6 +2,7 @@ package log
 
 import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/lists"
@@ -41,8 +42,29 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 
+	// 检查当前网站有无开启访问日志
+	this.Data["serverAccessLogIsOn"] = true
+
+	groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{
+		ServerId: params.ServerId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if !groupResp.HasAccessLogConfig {
+		webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if webConfig != nil && webConfig.AccessLogRef != nil && !webConfig.AccessLogRef.IsOn {
+			this.Data["serverAccessLogIsOn"] = false
+		}
+	}
+
 	// 记录最近使用
-	_, err := this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{
+	_, err = this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{
 		ItemType: "server",
 		ItemId:   params.ServerId,
 	})

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

@@ -2,6 +2,7 @@ package log
 
 import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/iplibrary"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/maps"
@@ -55,6 +56,27 @@ func (this *TodayAction) RunGet(params struct {
 		return
 	}
 
+	// 检查当前网站有无开启访问日志
+	this.Data["serverAccessLogIsOn"] = true
+
+	groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{
+		ServerId: params.ServerId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if !groupResp.HasAccessLogConfig {
+		webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if webConfig != nil && webConfig.AccessLogRef != nil && !webConfig.AccessLogRef.IsOn {
+			this.Data["serverAccessLogIsOn"] = false
+		}
+	}
+
 	resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
 		Partition:         params.Partition,
 		RequestId:         params.RequestId,

internal/web/actions/default/servers/server/settings/accessLog/index.go

@@ -21,7 +21,7 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct {
 	ServerId int64
 }) {
-	// 服务分组设置
+	// 网站分组设置
 	groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{
 		ServerId: params.ServerId,
 	})

internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go

@@ -102,6 +102,7 @@ func (this *SettingAction) RunPost(params struct {
 		FollowRedirects:   reverseProxyConfig.FollowRedirects,
 		ProxyProtocolJSON: proxyProtocolJSON,
 		Retry50X:          reverseProxyConfig.Retry50X,
+		Retry40X:          reverseProxyConfig.Retry40X,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/server/settings/pages/createPopup.go

@@ -20,7 +20,7 @@ func (this *CreatePopupAction) Init() {
 }
 
 func (this *CreatePopupAction) RunGet(params struct{}) {
-	this.Data["bodyTypes"] = shared.FindAllBodyTypes()
+	this.Data["bodyTypes"] = serverconfigs.FindAllHTTPPageBodyTypes()
 
 	this.Show()
 }
@@ -32,22 +32,33 @@ func (this *CreatePopupAction) RunPost(params struct {
 	URL  string `alias:"url"`
 	Body string
 
+	ExceptURLPatternsJSON []byte
+	OnlyURLPatternsJSON   []byte
+
 	NewStatus int
 	Must      *actions.Must
 }) {
-	// TODO 对状态码进行更多校验
-
 	params.Must.
 		Field("status", params.Status).
 		Require("请输入响应状态码")
 
+	if len(params.Status) != 3 {
+		this.FailField("status", "状态码长度必须为3位")
+		return
+	}
+
 	switch params.BodyType {
-	case shared.BodyTypeURL:
+	case serverconfigs.HTTPPageBodyTypeURL:
 		params.Must.
 			Field("url", params.URL).
 			Require("请输入要显示的URL").
-			Match(	`^(?i)(http|https)://`, "请输入正确的URL")
-	case shared.BodyTypeHTML:
+			Match(`^(?i)(http|https)://`, "请输入正确的URL")
+	case serverconfigs.HTTPPageBodyTypeRedirectURL:
+		params.Must.
+			Field("url", params.URL).
+			Require("请输入要跳转的URL").
+			Match(`^(?i)(http|https)://`, "请输入正确的URL")
+	case serverconfigs.HTTPPageBodyTypeHTML:
 		params.Must.
 			Field("body", params.Body).
 			Require("请输入要显示的HTML内容")
@@ -58,12 +69,32 @@ func (this *CreatePopupAction) RunPost(params struct {
 		}
 	}
 
+	var exceptURLPatterns = []*shared.URLPattern{}
+	if len(params.ExceptURLPatternsJSON) > 0 {
+		err := json.Unmarshal(params.ExceptURLPatternsJSON, &exceptURLPatterns)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	var onlyURLPatterns = []*shared.URLPattern{}
+	if len(params.OnlyURLPatternsJSON) > 0 {
+		err := json.Unmarshal(params.OnlyURLPatternsJSON, &onlyURLPatterns)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
 	createResp, err := this.RPC().HTTPPageRPC().CreateHTTPPage(this.AdminContext(), &pb.CreateHTTPPageRequest{
-		StatusList: []string{params.Status},
-		BodyType:   params.BodyType,
-		Url:        params.URL,
-		Body:       params.Body,
-		NewStatus:  types.Int32(params.NewStatus),
+		StatusList:            []string{params.Status},
+		BodyType:              params.BodyType,
+		Url:                   params.URL,
+		Body:                  params.Body,
+		NewStatus:             types.Int32(params.NewStatus),
+		ExceptURLPatternsJSON: params.ExceptURLPatternsJSON,
+		OnlyURLPatternsJSON:   params.OnlyURLPatternsJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/server/settings/pages/index.go

@@ -7,7 +7,6 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/types"
 	"regexp"
@@ -77,7 +76,11 @@ func (this *IndexAction) RunPost(params struct {
 			}
 
 			// check url
-			if page.BodyType == shared.BodyTypeURL && !urlReg.MatchString(page.URL) {
+			if page.BodyType == serverconfigs.HTTPPageBodyTypeURL && !urlReg.MatchString(page.URL) {
+				this.Fail("自定义页面中 '" + page.URL + "' 不是一个正确的URL，请进行修改")
+				return
+			}
+			if page.BodyType == serverconfigs.HTTPPageBodyTypeRedirectURL && !urlReg.MatchString(page.URL) {
 				this.Fail("自定义页面中 '" + page.URL + "' 不是一个正确的URL，请进行修改")
 				return
 			}
@@ -99,7 +102,7 @@ func (this *IndexAction) RunPost(params struct {
 			return
 		}
 
-		if shutdownConfig.BodyType == shared.BodyTypeURL {
+		if shutdownConfig.BodyType == serverconfigs.HTTPPageBodyTypeURL {
 			if len(shutdownConfig.URL) > 512 {
 				this.Fail("临时关闭页面中URL过长，不能超过512字节")
 				return
@@ -109,7 +112,17 @@ func (this *IndexAction) RunPost(params struct {
 				this.Fail("临时关闭页面中 '" + shutdownConfig.URL + "' 不是一个正确的URL，请进行修改")
 				return
 			}
-		} else if shutdownConfig.Body == shared.BodyTypeHTML {
+		} else if shutdownConfig.BodyType == serverconfigs.HTTPPageBodyTypeRedirectURL {
+			if len(shutdownConfig.URL) > 512 {
+				this.Fail("临时关闭页面中URL过长，不能超过512字节")
+				return
+			}
+
+			if shutdownConfig.IsOn /** 只有启用的时候才校验 **/ && !urlReg.MatchString(shutdownConfig.URL) {
+				this.Fail("临时关闭页面中 '" + shutdownConfig.URL + "' 不是一个正确的URL，请进行修改")
+				return
+			}
+		} else if shutdownConfig.Body == serverconfigs.HTTPPageBodyTypeHTML {
 			if len(shutdownConfig.Body) > 32*1024 {
 				this.Fail("临时关闭页面中HTML内容长度不能超过32K")
 				return

internal/web/actions/default/servers/server/settings/pages/updatePopup.go

@@ -22,7 +22,7 @@ func (this *UpdatePopupAction) Init() {
 func (this *UpdatePopupAction) RunGet(params struct {
 	PageId int64
 }) {
-	this.Data["bodyTypes"] = shared.FindAllBodyTypes()
+	this.Data["bodyTypes"] = serverconfigs.FindAllHTTPPageBodyTypes()
 
 	configResp, err := this.RPC().HTTPPageRPC().FindEnabledHTTPPageConfig(this.AdminContext(), &pb.FindEnabledHTTPPageConfigRequest{HttpPageId: params.PageId})
 	if err != nil {
@@ -30,12 +30,18 @@ func (this *UpdatePopupAction) RunGet(params struct {
 		return
 	}
 
-	pageConfig := &serverconfigs.HTTPPageConfig{}
+	var pageConfig = &serverconfigs.HTTPPageConfig{}
 	err = json.Unmarshal(configResp.PageJSON, pageConfig)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
+	if pageConfig.ExceptURLPatterns == nil {
+		pageConfig.ExceptURLPatterns = []*shared.URLPattern{}
+	}
+	if pageConfig.OnlyURLPatterns == nil {
+		pageConfig.OnlyURLPatterns = []*shared.URLPattern{}
+	}
 	this.Data["pageConfig"] = pageConfig
 
 	this.Show()
@@ -50,6 +56,9 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	URL      string `alias:"url"`
 	Body     string
 
+	ExceptURLPatternsJSON []byte
+	OnlyURLPatternsJSON   []byte
+
 	NewStatus int
 
 	Must *actions.Must
@@ -61,13 +70,23 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		Field("status", params.Status).
 		Require("请输入响应状态码")
 
+	if len(params.Status) != 3 {
+		this.FailField("status", "状态码长度必须为3位")
+		return
+	}
+
 	switch params.BodyType {
-	case shared.BodyTypeURL:
+	case serverconfigs.HTTPPageBodyTypeURL:
 		params.Must.
 			Field("url", params.URL).
 			Require("请输入要显示的URL").
-			Match(	`^(?i)(http|https)://`, "请输入正确的URL")
-	case shared.BodyTypeHTML:
+			Match(`^(?i)(http|https)://`, "请输入正确的URL")
+	case serverconfigs.HTTPPageBodyTypeRedirectURL:
+		params.Must.
+			Field("url", params.URL).
+			Require("请输入要跳转的URL").
+			Match(`^(?i)(http|https)://`, "请输入正确的URL")
+	case serverconfigs.HTTPPageBodyTypeHTML:
 		params.Must.
 			Field("body", params.Body).
 			Require("请输入要显示的HTML内容")
@@ -78,13 +97,33 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		}
 	}
 
+	var exceptURLPatterns = []*shared.URLPattern{}
+	if len(params.ExceptURLPatternsJSON) > 0 {
+		err := json.Unmarshal(params.ExceptURLPatternsJSON, &exceptURLPatterns)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	var onlyURLPatterns = []*shared.URLPattern{}
+	if len(params.OnlyURLPatternsJSON) > 0 {
+		err := json.Unmarshal(params.OnlyURLPatternsJSON, &onlyURLPatterns)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
 	_, err := this.RPC().HTTPPageRPC().UpdateHTTPPage(this.AdminContext(), &pb.UpdateHTTPPageRequest{
-		HttpPageId: params.PageId,
-		StatusList: []string{params.Status},
-		BodyType:   params.BodyType,
-		Url:        params.URL,
-		Body:       params.Body,
-		NewStatus:  types.Int32(params.NewStatus),
+		HttpPageId:            params.PageId,
+		StatusList:            []string{params.Status},
+		BodyType:              params.BodyType,
+		Url:                   params.URL,
+		Body:                  params.Body,
+		NewStatus:             types.Int32(params.NewStatus),
+		ExceptURLPatternsJSON: params.ExceptURLPatternsJSON,
+		OnlyURLPatternsJSON:   params.OnlyURLPatternsJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/server/settings/redirects/createPopup.go

@@ -52,7 +52,11 @@ func (this *CreatePopupAction) RunPost(params struct {
 	PortAfter       int
 	PortAfterScheme string
 
-	Status    int
+	Status int
+
+	ExceptDomainsJSON []byte
+	OnlyDomainsJSON   []byte
+
 	CondsJSON []byte
 	IsOn      bool
 
@@ -186,6 +190,27 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Field("status", params.Status).
 		Gte(0, "请选择正确的跳转状态码")
 
+	// 域名
+	if len(params.ExceptDomainsJSON) > 0 {
+		var exceptDomains = []string{}
+		err := json.Unmarshal(params.ExceptDomainsJSON, &exceptDomains)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		config.ExceptDomains = exceptDomains
+	}
+
+	if len(params.OnlyDomainsJSON) > 0 {
+		var onlyDomains = []string{}
+		err := json.Unmarshal(params.OnlyDomainsJSON, &onlyDomains)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		config.OnlyDomains = onlyDomains
+	}
+
 	// 校验匹配条件
 	var conds *shared.HTTPRequestCondsConfig
 	if len(params.CondsJSON) > 0 {

internal/web/actions/default/servers/server/settings/reverseProxy/setting.go

@@ -134,6 +134,7 @@ func (this *SettingAction) RunPost(params struct {
 		FollowRedirects:          reverseProxyConfig.FollowRedirects,
 		RequestHostExcludingPort: reverseProxyConfig.RequestHostExcludingPort,
 		Retry50X:                 reverseProxyConfig.Retry50X,
+		Retry40X:                 reverseProxyConfig.Retry40X,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go

@@ -42,6 +42,7 @@ func (this *CountriesAction) RunGet(params struct {
 		this.NotFound("firewallPolicy", params.FirewallPolicyId)
 		return
 	}
+
 	var deniedCountryIds = []int64{}
 	var allowedCountryIds = []int64{}
 	var countryHTML = ""
@@ -95,6 +96,24 @@ func (this *CountriesAction) RunGet(params struct {
 	}
 	this.Data["wafIsOn"] = webConfig.FirewallRef != nil && webConfig.FirewallRef.IsOn
 
+	// 获取当前服务所在集群的WAF设置
+	clusterFirewallPolicy, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyWithServerId(this.AdminContext(), params.ServerId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if clusterFirewallPolicy != nil {
+		this.Data["clusterFirewallPolicy"] = maps.Map{
+			"id":       clusterFirewallPolicy.Id,
+			"name":     clusterFirewallPolicy.Name,
+			"isOn":     clusterFirewallPolicy.IsOn,
+			"mode":     clusterFirewallPolicy.Mode,
+			"modeInfo": firewallconfigs.FindFirewallMode(clusterFirewallPolicy.Mode),
+		}
+	} else {
+		this.Data["clusterFirewallPolicy"] = nil
+	}
+
 	this.Show()
 }
 

internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go

@@ -96,6 +96,24 @@ func (this *ProvincesAction) RunGet(params struct {
 	}
 	this.Data["wafIsOn"] = webConfig.FirewallRef != nil && webConfig.FirewallRef.IsOn
 
+	// 获取当前服务所在集群的WAF设置
+	clusterFirewallPolicy, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyWithServerId(this.AdminContext(), params.ServerId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if clusterFirewallPolicy != nil {
+		this.Data["clusterFirewallPolicy"] = maps.Map{
+			"id":       clusterFirewallPolicy.Id,
+			"name":     clusterFirewallPolicy.Name,
+			"isOn":     clusterFirewallPolicy.IsOn,
+			"mode":     clusterFirewallPolicy.Mode,
+			"modeInfo": firewallconfigs.FindFirewallMode(clusterFirewallPolicy.Mode),
+		}
+	} else {
+		this.Data["clusterFirewallPolicy"] = nil
+	}
+
 	this.Show()
 }
 

internal/web/actions/default/servers/serverutils/server_helper.go

@@ -291,10 +291,11 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri
 			"isOn":     serverConfig.Web != nil && len(serverConfig.Web.RewriteRefs) > 0,
 		})
 		menuItems = append(menuItems, maps.Map{
-			"name":     this.Lang(actionPtr, codes.Server_MenuSettingWAF),
-			"url":      "/servers/server/settings/waf?serverId=" + serverIdString,
-			"isActive": secondMenuItem == "waf",
-			"isOn":     serverConfig.Web != nil && serverConfig.Web.FirewallRef != nil && serverConfig.Web.FirewallRef.IsOn,
+			"name":       this.Lang(actionPtr, codes.Server_MenuSettingWAF),
+			"url":        "/servers/server/settings/waf?serverId=" + serverIdString,
+			"isActive":   secondMenuItem == "waf",
+			"isOn":       serverConfig.Web != nil && serverConfig.Web.FirewallRef != nil && serverConfig.Web.FirewallRef.IsOn,
+			"configCode": serverconfigs.ConfigCodeWAF,
 		})
 		menuItems = append(menuItems, maps.Map{
 			"name":       this.Lang(actionPtr, codes.Server_MenuSettingCache),

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

@@ -5,7 +5,6 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/maps"
@@ -28,17 +27,7 @@ func (this *StatusAction) RunPost(params struct {
 	}
 
 	// 读取全局配置
-	globalConfig, err := dao.SharedSysSettingDAO.ReadGlobalConfig(this.AdminContext())
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	auditingPrompt := ""
-	if globalConfig != nil {
-		auditingPrompt = globalConfig.HTTPAll.DomainAuditingPrompt
-	}
-
-	wg := sync.WaitGroup{}
+	var wg = sync.WaitGroup{}
 	wg.Add(len(params.ServerIds))
 
 	for _, serverId := range params.ServerIds {
@@ -98,6 +87,17 @@ func (this *StatusAction) RunPost(params struct {
 			if serverNamesResp.IsAuditing {
 				m["type"] = "auditing"
 				m["message"] = "审核中"
+
+				auditingPromptResp, err := this.RPC().ServerRPC().FindServerAuditingPrompt(this.AdminContext(), &pb.FindServerAuditingPromptRequest{ServerId: serverId})
+				if err != nil {
+					this.ErrorPage(err)
+					m["type"] = "serverErr"
+					m["message"] = "服务器错误"
+					m["todo"] = "错误信息：FindServerNames(): " + err.Error() + "，请联系管理员修复此问题"
+					return
+				}
+
+				var auditingPrompt = auditingPromptResp.PromptText
 				if len(auditingPrompt) > 0 {
 					m["todo"] = auditingPrompt
 				} else {

internal/web/actions/default/setup/mysql/mysqlinstallers/mysql_installer.go

@@ -408,7 +408,8 @@ func (this *MySQLInstaller) Download() (path string, err error) {
 
 	// check latest version
 	this.log("checking mysql latest version ...")
-	var latestVersion = "8.1.0" // default version
+	var latestVersion = "8.2.0" // default version
+	var majorVersion = "8.2"
 	{
 		req, err := http.NewRequest(http.MethodGet, "https://dev.mysql.com/downloads/mysql/", nil)
 		if err != nil {
@@ -434,6 +435,10 @@ func (this *MySQLInstaller) Download() (path string, err error) {
 			var matches = reg.FindSubmatch(data)
 			if len(matches) > 0 {
 				latestVersion = string(matches[1])
+				var matchPieces = strings.Split(latestVersion, ".")
+				if len(matchPieces) >= 2 {
+					majorVersion = strings.Join(matchPieces[:2], ".")
+				}
 			}
 		}
 	}
@@ -441,7 +446,7 @@ func (this *MySQLInstaller) Download() (path string, err error) {
 
 	// download
 	this.log("start downloading ...")
-	var downloadURL = "https://cdn.mysql.com/Downloads/MySQL-8.1/mysql-" + latestVersion + "-linux-glibc2.17-x86_64-minimal.tar.xz"
+	var downloadURL = "https://cdn.mysql.com/Downloads/MySQL-" + majorVersion + "/mysql-" + latestVersion + "-linux-glibc2.17-x86_64-minimal.tar.xz"
 
 	{
 		this.log("downloading from url '" + downloadURL + "' ...")

internal/web/actions/default/ui/components.go

@@ -71,7 +71,7 @@ func (this *ComponentsAction) RunGet(params struct{}) {
 	} else {
 		buffer.WriteString("window.REQUEST_COND_COMPONENTS = ")
 		buffer.Write(typesJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	// 条件操作符
@@ -81,7 +81,7 @@ func (this *ComponentsAction) RunGet(params struct{}) {
 	} else {
 		buffer.WriteString("window.REQUEST_COND_OPERATORS = ")
 		buffer.Write(requestOperatorsJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	// 请求变量
@@ -91,7 +91,7 @@ func (this *ComponentsAction) RunGet(params struct{}) {
 	} else {
 		buffer.WriteString("window.REQUEST_VARIABLES = ")
 		buffer.Write(requestVariablesJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	// 指标
@@ -101,7 +101,7 @@ func (this *ComponentsAction) RunGet(params struct{}) {
 	} else {
 		buffer.WriteString("window.METRIC_HTTP_KEYS = ")
 		buffer.Write(metricHTTPKeysJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	// IP地址阈值项目
@@ -111,7 +111,7 @@ func (this *ComponentsAction) RunGet(params struct{}) {
 	} else {
 		buffer.WriteString("window.IP_ADDR_THRESHOLD_ITEMS = ")
 		buffer.Write(ipAddrThresholdItemsJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	// IP地址阈值动作
@@ -121,7 +121,7 @@ func (this *ComponentsAction) RunGet(params struct{}) {
 	} else {
 		buffer.WriteString("window.IP_ADDR_THRESHOLD_ACTIONS = ")
 		buffer.Write(ipAddrThresholdActionsJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	// WAF操作符
@@ -131,7 +131,17 @@ func (this *ComponentsAction) RunGet(params struct{}) {
 	} else {
 		buffer.WriteString("window.WAF_RULE_OPERATORS = ")
 		buffer.Write(wafOperatorsJSON)
-		buffer.Write([]byte{'\n', '\n'})
+		buffer.Write([]byte{';', '\n', '\n'})
+	}
+
+	// WAF验证码类型
+	captchaTypesJSON, err := json.Marshal(firewallconfigs.FindAllCaptchaTypes())
+	if err != nil {
+		logs.Println("ComponentsAction marshal captcha types failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.WAF_CAPTCHA_TYPES = ")
+		buffer.Write(captchaTypesJSON)
+		buffer.Write([]byte{';', '\n', '\n'})
 	}
 
 	componentsData = buffer.Bytes()

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

@@ -13,6 +13,7 @@ func init() {
 			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeUser)).
 			Data("teaMenu", "users").
 			Prefix("/users").
+			Data("teaSubMenu", "users").
 			Get("", new(IndexAction)).
 			GetPost("/createPopup", new(CreatePopupAction)).
 

internal/web/helpers/menu.go

@@ -147,6 +147,13 @@ func FindAllMenuMaps(langCode string, nodeLogsType string, countUnreadNodeLogs i
 			"module": configloaders.AdminModuleCodeUser,
 			"name":   langs.Message(langCode, codes.AdminMenu_Users),
 			"icon":   "users",
+			"subItems": []maps.Map{
+				{
+					"name": langs.Message(langCode, codes.AdminMenu_UserList),
+					"url":  "/users",
+					"code": "users",
+				},
+			},
 		},
 		{
 			"code":     "admins",

internal/web/import.go

@@ -37,7 +37,6 @@ import (
 	// 服务相关
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/certs"
-	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/cache"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/cache/batch"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/log"

web/public/js/components/common/chart-columns-grid.js

@@ -0,0 +1,80 @@
+Vue.component("chart-columns-grid", {
+	props: [],
+	mounted: function () {
+		this.columns = this.calculateColumns()
+
+		let that = this
+		window.addEventListener("resize", function () {
+			that.columns = that.calculateColumns()
+		})
+	},
+	updated: function () {
+		let totalElements = this.$el.getElementsByClassName("column").length
+		if (totalElements == this.totalElements) {
+			return
+		}
+		this.totalElements = totalElements
+		this.calculateColumns()
+	},
+	data: function () {
+		return {
+			columns: "four",
+			totalElements: 0
+		}
+	},
+	methods: {
+		calculateColumns: function () {
+			let w = window.innerWidth
+			let columns = Math.floor(w / 500)
+			if (columns == 0) {
+				columns = 1
+			}
+
+			let columnElements = this.$el.getElementsByClassName("column")
+			if (columnElements.length == 0) {
+				return "one"
+			}
+			let maxColumns = columnElements.length
+			if (columns > maxColumns) {
+				columns = maxColumns
+			}
+
+			// 添加右侧边框
+			for (let index = 0; index < columnElements.length; index++) {
+				let el = columnElements[index]
+				el.className = el.className.replace("with-border", "")
+				if (index % columns == columns - 1 || index == columnElements.length - 1 /** 最后一个 **/) {
+					el.className += " with-border"
+				}
+			}
+
+			switch (columns) {
+				case 1:
+					return "one"
+				case 2:
+					return "two"
+				case 3:
+					return "three"
+				case 4:
+					return "four"
+				case 5:
+					return "five"
+				case 6:
+					return "six"
+				case 7:
+					return "seven"
+				case 8:
+					return "eight"
+				case 9:
+					return "nine"
+				case 10:
+					return "ten"
+				default:
+					return "ten"
+			}
+		}
+	},
+	template: `<div :class="'ui ' + columns + ' columns grid chart-grid'">
+	<slot></slot>
+</div>`
+})

web/public/js/components/common/links.js

@@ -1,12 +1,18 @@
 // 使用Icon的链接方式
 Vue.component("link-icon", {
-	props: ["href", "title", "target"],
+	props: ["href", "title", "target", "size"],
 	data: function () {
+		let realSize = this.size
+		if (realSize == null || realSize.length == 0) {
+			realSize = "small"
+		}
+
 		return {
-			vTitle: (this.title == null) ? "打开链接" : this.title
+			vTitle: (this.title == null) ? "打开链接" : this.title,
+			realSize: realSize
 		}
 	},
-	template: `<span><slot></slot>&nbsp;<a :href="href" :title="vTitle" class="link grey" :target="target"><i class="icon linkify small"></i></a></span>`
+	template: `<span><slot></slot>&nbsp;<a :href="href" :title="vTitle" class="link grey" :target="target"><i class="icon linkify" :class="realSize"></i></a></span>`
 })
 
 // 带有下划虚线的连接

web/public/js/components/common/url-patterns-box.js

@@ -5,12 +5,17 @@ Vue.component("url-patterns-box", {
 		if (this.value != null) {
 			patterns = this.value
 		}
+
 		return {
 			patterns: patterns,
 			isAdding: false,
 
 			addingPattern: {"type": "wildcard", "pattern": ""},
-			editingIndex: -1
+			editingIndex: -1,
+
+			patternIsInvalid: false,
+
+			windowIsSmall: window.innerWidth < 600
 		}
 	},
 	methods: {
@@ -71,6 +76,27 @@ Vue.component("url-patterns-box", {
 		},
 		notifyChange: function () {
 			this.$emit("input", this.patterns)
+		},
+		changePattern: function () {
+			this.patternIsInvalid = false
+			let pattern = this.addingPattern.pattern
+			switch (this.addingPattern.type) {
+				case "wildcard":
+					if (pattern.indexOf("?") >= 0) {
+						this.patternIsInvalid = true
+					}
+					break
+				case "regexp":
+					if (pattern.indexOf("?") >= 0) {
+						let pieces = pattern.split("?")
+						for (let i = 0; i < pieces.length - 1; i++) {
+							if (pieces[i].length == 0 || pieces[i][pieces[i].length - 1] != "\\") {
+								this.patternIsInvalid = true
+							}
+						}
+					}
+					break
+			}
 		}
 	},
 	template: `<div>
@@ -82,7 +108,7 @@ Vue.component("url-patterns-box", {
 		</div>
 	</div>
 	<div v-show="isAdding" style="margin-top: 0.5em">
-		<div class="ui fields inline">
+		<div :class="{'ui fields inline': !windowIsSmall}">
 			<div class="ui field">
 				<select class="ui dropdown auto-width" v-model="addingPattern.type">
 					<option value="wildcard">通配符</option>
@@ -90,14 +116,15 @@ Vue.component("url-patterns-box", {
 				</select>
 			</div>
 			<div class="ui field">
-				<input type="text" :placeholder="(addingPattern.type == 'wildcard') ? '可以使用星号（*）通配符，不区分大小写' : '可以使用正则表达式，不区分大小写'" v-model="addingPattern.pattern" size="36" ref="patternInput" @keyup.enter="confirm()" @keypress.enter.prevent="1" spellcheck="false"/>
+				<input type="text" :placeholder="(addingPattern.type == 'wildcard') ? '可以使用星号（*）通配符，不区分大小写' : '可以使用正则表达式，不区分大小写'" v-model="addingPattern.pattern" @input="changePattern" size="36" ref="patternInput" @keyup.enter="confirm()" @keypress.enter.prevent="1" spellcheck="false"/>
+				<p class="comment" v-if="patternIsInvalid"><span class="red" style="font-weight: normal"><span v-if="addingPattern.type == 'wildcard'">通配符</span><span v-if="addingPattern.type == 'regexp'">正则表达式</span>中不能包含问号（?）及问号以后的内容。</span></p>
 			</div>
 			<div class="ui field" style="padding-left: 0">
 				<tip-icon content="通配符示例：<br/>单个路径开头：/hello/world/*<br/>单个路径结尾：*/hello/world<br/>包含某个路径：*/article/*<br/>某个域名下的所有URL：*example.com/*" v-if="addingPattern.type == 'wildcard'"></tip-icon>
 				<tip-icon content="正则表达式示例：<br/>单个路径开头：^/hello/world<br/>单个路径结尾：/hello/world$<br/>包含某个路径：/article/<br/>匹配某个数字路径：/article/(\\d+)<br/>某个域名下的所有URL：^(http|https)://example.com/" v-if="addingPattern.type == 'regexp'"></tip-icon>
 			</div>
 			<div class="ui field">
-				<button class="ui button tiny" type="button" @click.prevent="confirm">确定</button><a href="" title="取消" @click.prevent="cancel"><i class="icon remove small"></i></a>
+				<button class="ui button tiny" :class="{disabled:this.patternIsInvalid}" type="button" @click.prevent="confirm">确定</button><a href="" title="取消" @click.prevent="cancel"><i class="icon remove small"></i></a>
 			</div>
 		</div>
 	</div>

web/public/js/components/maps/traffic-map-box.js

@@ -34,6 +34,14 @@ Vue.component("traffic-map-box", {
 	},
 	methods: {
 		render: function () {
+			if (this.$el.offsetWidth < 300) {
+				let that = this
+				setTimeout(function () {
+					that.render()
+				}, 100)
+				return
+			}
+
 			this.chart = teaweb.initChart(document.getElementById("traffic-map-box"));
 			let that = this
 			this.chart.setOption({

web/public/js/components/messages/message-row.js

@@ -64,7 +64,7 @@ Vue.component("message-row", {
 	</tr>
 	<tr :class="{error: message.level == 'error', positive: message.level == 'success', warning: message.level == 'warning'}">
 		<td>
-			{{message.body}}
+			<pre style="padding: 0; margin:0; word-break: break-all;">{{message.body}}</pre>
 			
 			<!-- 健康检查 -->
 			<div v-if="message.type == 'HealthCheckFailed'" style="margin-top: 0.8em">

web/public/js/components/server/http-access-log-search-box.js

@@ -82,7 +82,7 @@ Vue.component("http-access-log-search-box", {
 				<a class="ui label basic" :class="{disabled: keyword.length == 0}" @click.prevent="cleanKeyword"><i class="icon remove small"></i></a>
 			</div>
 		</div>
-		<div class="ui field"><tip-icon content="一些特殊的关键词：<br/>单个状态码：status:200<br/>状态码范围：status:500-504<br/>查询IP：ip:192.168.1.100<br/>查询URL：https://goedge.cn/docs<br/>查询路径部分：requestPath:/hello/world<br/>查询协议版本：proto:HTTP/1.1<br/>协议：scheme:http<br/>请求方法：method:POST"></tip-icon></div>
+		<div class="ui field"><tip-icon content="一些特殊的关键词：<br/>单个状态码：status:200<br/>状态码范围：status:500-504<br/>查询IP：ip:192.168.1.100<br/>查询URL：https://goedge.cn/docs<br/>查询路径部分：requestPath:/hello/world<br/>查询协议版本：proto:HTTP/1.1<br/>协议：scheme:http<br/>请求方法：method:POST<br/>请求来源：referer:example.com"></tip-icon></div>
 	</div>
 	<div class="ui fields inline" style="margin-top: 0.5em">
 		<div class="ui field">

web/public/js/components/server/http-cache-config-box.js

@@ -122,10 +122,10 @@ Vue.component("http-cache-config-box", {
 				</td>
 			</tr>
 			<tr>
-				<td>添加X-Cache Header</td>
+				<td>添加X-Cache报头</td>
 				<td>
 					<checkbox v-model="cacheConfig.addStatusHeader"></checkbox>
-					<p class="comment">选中后自动在响应Header中增加<code-label>X-Cache: BYPASS|MISS|HIT|PURGE</code-label>。</p>
+					<p class="comment">选中后自动在响应Header中增加<code-label>X-Cache: BYPASS|MISS|HIT|PURGE</code-label>；在浏览器端查看X-Cache值时请先禁用浏览器缓存，避免影响观察。</p>
 				</td>
 			</tr>
 			<tr>

web/public/js/components/server/http-firewall-actions-box.js

@@ -338,6 +338,9 @@ Vue.component("http-firewall-actions-box", {
 			this.editingIndex = index
 
 			this.actionCode = config.code
+			this.action = this.actions.$find(function (k, v) {
+				return v.code == config.code
+			})
 
 			switch (config.code) {
 				case "block":
@@ -499,9 +502,12 @@ Vue.component("http-firewall-actions-box", {
 				if (isNaN(timeout)) {
 					timeout = 0
 				}
-				if (this.recordIPListId <= 0) {
+				if (this.recordIPListId < 0) {
 					return
 				}
+
+				// recordIPListId can be 0
+
 				this.actionOptions = {
 					type: this.recordIPType,
 					level: this.recordIPLevel,
@@ -768,7 +774,7 @@ Vue.component("http-firewall-actions-box", {
 						<input type="text" style="width: 5em" maxlength="9" v-model="captchaMaxFails" @keyup.enter="confirm()" @keypress.enter.prevent="1"/>
 						<span class="ui label">次</span>
 					</div>
-					<p class="comment">允许用户失败尝试的最多次数，超过这个次数将被自动加入黑名单；如果为空或者为0表示默认。</p>
+					<p class="comment"><span v-if="captchaMaxFails > 0 && captchaMaxFails < 5" class="red">建议填入一个不小于5的数字，以减少误判几率。</span>允许用户失败尝试的最多次数，超过这个次数将被自动加入黑名单；如果为空或者为0表示默认。</p>
 				</td>
 			</tr>
 			<tr v-if="actionCode == 'captcha'">
@@ -849,7 +855,7 @@ Vue.component("http-firewall-actions-box", {
 				</td>
 			</tr>
 			<tr v-if="actionCode == 'record_ip'">
-				<td>选择IP名单 *</td>
+				<td>选择IP名单</td>
 				<td>
 					<div v-if="recordIPListId > 0" class="ui label basic small">{{recordIPListName}} <a href="" @click.prevent="removeRecordIPList"><i class="icon remove small"></i></a></div>
 					<button type="button" class="ui button tiny" @click.prevent="selectRecordIPList">+</button>

web/public/js/components/server/http-firewall-captcha-options-viewer.js

@@ -25,7 +25,8 @@ Vue.component("http-firewall-captcha-options-viewer", {
 		}
 		return {
 			options: options,
-			summary: ""
+			summary: "",
+			captchaTypes: window.WAF_CAPTCHA_TYPES
 		}
 	},
 	methods: {
@@ -43,8 +44,18 @@ Vue.component("http-firewall-captcha-options-viewer", {
 			if (this.options.failBlockScopeAll) {
 				summaryList.push("全局封禁")
 			}
-			if (this.options.uiIsOn) {
-				summaryList.push("定制UI")
+			let that = this
+			let typeDef = this.captchaTypes.$find(function (k, v) {
+				return v.code == that.options.captchaType
+			})
+			if (typeDef != null) {
+				summaryList.push("默认验证方式：" + typeDef.name)
+			}
+
+			if (this.options.captchaType == "default") {
+				if (this.options.uiIsOn) {
+					summaryList.push("定制UI")
+				}
 			}
 			if (summaryList.length == 0) {
 				this.summary = "默认配置"

web/public/js/components/server/http-firewall-captcha-options.js

@@ -7,6 +7,7 @@ Vue.component("http-firewall-captcha-options", {
 		let options = this.vCaptchaOptions
 		if (options == null) {
 			options = {
+				captchaType: "default",
 				countLetters: 0,
 				life: 0,
 				maxFails: 0,
@@ -27,11 +28,17 @@ Vue.component("http-firewall-captcha-options", {
 		if (options.countLetters <= 0) {
 			options.countLetters = 6
 		}
+
+		if (options.captchaType == null || options.captchaType.length == 0) {
+			options.captchaType = "default"
+		}
+
 		return {
 			options: options,
 			isEditing: false,
 			summary: "",
-			uiBodyWarning: ""
+			uiBodyWarning: "",
+			captchaTypes: window.WAF_CAPTCHA_TYPES
 		}
 	},
 	watch: {
@@ -73,6 +80,9 @@ Vue.component("http-firewall-captcha-options", {
 		"options.failBlockScopeAll": function (v) {
 			this.updateSummary()
 		},
+		"options.captchaType": function (v) {
+			this.updateSummary()
+		},
 		"options.uiIsOn": function (v) {
 			this.updateSummary()
 		},
@@ -102,9 +112,21 @@ Vue.component("http-firewall-captcha-options", {
 			if (this.options.failBlockScopeAll) {
 				summaryList.push("全局封禁")
 			}
-			if (this.options.uiIsOn) {
-				summaryList.push("定制UI")
+
+			let that = this
+			let typeDef = this.captchaTypes.$find(function (k, v) {
+				return v.code == that.options.captchaType
+			})
+			if (typeDef != null) {
+				summaryList.push("默认验证方式：" + typeDef.name)
 			}
+
+			if (this.options.captchaType == "default") {
+				if (this.options.uiIsOn) {
+					summaryList.push("定制UI")
+				}
+			}
+
 			if (summaryList.length == 0) {
 				this.summary = "默认配置"
 			} else {
@@ -121,6 +143,15 @@ Vue.component("http-firewall-captcha-options", {
 	<div v-show="isEditing" style="margin-top: 0.5em">
 		<table class="ui table definition selectable">
 			<tbody>
+				<tr>
+					<td>默认验证方式</td>
+					<td>
+						<select class="ui dropdown auto-width" v-model="options.captchaType">
+							<option v-for="captchaDef in captchaTypes" :value="captchaDef.code">{{captchaDef.name}}</option>
+						</select>
+						<p class="comment" v-for="captchaDef in captchaTypes" v-if="captchaDef.code == options.captchaType">{{captchaDef.description}}</p>
+					</td>
+				</tr>
 				<tr>
 					<td class="title">有效时间</td>
 					<td>
@@ -138,7 +169,7 @@ Vue.component("http-firewall-captcha-options", {
 							<input type="text" style="width: 5em" maxlength="9" v-model="options.maxFails" @keyup.enter="confirm()" @keypress.enter.prevent="1"/>
 							<span class="ui label">次</span>
 						</div>
-						<p class="comment">允许用户失败尝试的最多次数，超过这个次数将被自动加入黑名单。如果为空或者为0，表示不限制。</p>
+						<p class="comment"><span v-if="options.maxFails > 0 && options.maxFails < 5" class="red">建议填入一个不小于5的数字，以减少误判几率。</span>允许用户失败尝试的最多次数，超过这个次数将被自动加入黑名单。如果为空或者为0，表示不限制。</p>
 					</td>
 				</tr>
 				<tr>
@@ -158,7 +189,8 @@ Vue.component("http-firewall-captcha-options", {
 						<p class="comment">是否在失败时全局封禁，默认为只封禁对单个网站的访问。</p>
 					</td>
 				</tr>
-				<tr>
+				
+				<tr v-show="options.captchaType == 'default'">
 					<td>验证码中数字个数</td>
 					<td>
 						<select class="ui dropdown auto-width" v-model="options.countLetters">
@@ -166,12 +198,13 @@ Vue.component("http-firewall-captcha-options", {
 						</select>
 					</td>
 				</tr>
-				<tr>
+				<tr v-show="options.captchaType == 'default'">
 					<td class="color-border">定制UI</td>
 					<td><checkbox v-model="options.uiIsOn"></checkbox></td>
 				</tr>
+				
 			</tbody>
-			<tbody v-show="options.uiIsOn">
+			<tbody v-show="options.uiIsOn && options.captchaType == 'default'">
 				<tr>
 					<td class="color-border">页面标题</td>
 					<td>

web/public/js/components/server/http-firewall-config-box.js

@@ -7,14 +7,20 @@ Vue.component("http-firewall-config-box", {
 				isPrior: false,
 				isOn: false,
 				firewallPolicyId: 0,
-				ignoreGlobalRules: false
+				ignoreGlobalRules: false,
+				defaultCaptchaType: "none"
 			}
 		}
 
+		if (firewall.defaultCaptchaType == null || firewall.defaultCaptchaType.length == 0) {
+			firewall.defaultCaptchaType = "none"
+		}
+
 		return {
 			firewall: firewall,
 			moreOptionsVisible: false,
-			execGlobalRules: !firewall.ignoreGlobalRules
+			execGlobalRules: !firewall.ignoreGlobalRules,
+			captchaTypes: window.WAF_CAPTCHA_TYPES
 		}
 	},
 	watch: {
@@ -46,7 +52,7 @@ Vue.component("http-firewall-config-box", {
 		<prior-checkbox :v-config="firewall" v-if="vIsLocation || vIsGroup"></prior-checkbox>
 		<tbody v-show="(!vIsLocation && !vIsGroup) || firewall.isPrior">
 			<tr>
-				<td class="title">启用WAF</td>
+				<td class="title">启用Web防火墙</td>
 				<td>
 					<checkbox v-model="firewall.isOn"></checkbox>
 					<p class="comment">选中后，表示启用当前网站的WAF功能。</p>
@@ -55,6 +61,17 @@ Vue.component("http-firewall-config-box", {
 		</tbody>
 		<more-options-tbody @change="changeOptionsVisible" v-show="firewall.isOn"></more-options-tbody>
 		<tbody v-show="moreOptionsVisible">
+			<tr>
+				<td>人机识别验证方式</td>
+				<td>
+					<select class="ui dropdown auto-width" v-model="firewall.defaultCaptchaType">
+						<option value="none">默认</option>
+						<option v-for="captchaType in captchaTypes" :value="captchaType.code">{{captchaType.name}}</option>
+					</select>
+					<p class="comment" v-if="firewall.defaultCaptchaType == 'none'">使用系统默认的设置。</p>
+					<p class="comment" v-for="captchaType in captchaTypes" v-if="captchaType.code == firewall.defaultCaptchaType">{{captchaType.description}}</p>
+				</td>
+			</tr>
 			<tr>
 				<td>启用系统全局规则</td>
 				<td>

web/public/js/components/server/http-header-policy-box.js

@@ -93,6 +93,7 @@ Vue.component("http-header-policy-box", {
 		},
 		addSettingHeader: function (policyId) {
 			teaweb.popup("/servers/server/settings/headers/createSetPopup?" + this.vParams + "&headerPolicyId=" + policyId + "&type=" + this.type, {
+				height: "22em",
 				callback: function () {
 					teaweb.successRefresh("保存成功")
 				}
@@ -114,6 +115,7 @@ Vue.component("http-header-policy-box", {
 		},
 		updateSettingPopup: function (policyId, headerId) {
 			teaweb.popup("/servers/server/settings/headers/updateSetPopup?" + this.vParams + "&headerPolicyId=" + policyId + "&headerId=" + headerId + "&type=" + this.type, {
+				height: "22em",
 				callback: function () {
 					teaweb.successRefresh("保存成功")
 				}

web/public/js/components/server/http-host-redirect-box.js

@@ -45,7 +45,7 @@ Vue.component("http-host-redirect-box", {
 
 			teaweb.popup("/servers/server/settings/redirects/createPopup", {
 				width: "50em",
-				height: "30em",
+				height: "36em",
 				callback: function (resp) {
 					that.id++
 					resp.data.redirect.id = that.id
@@ -60,7 +60,7 @@ Vue.component("http-host-redirect-box", {
 
 			teaweb.popup("/servers/server/settings/redirects/createPopup", {
 				width: "50em",
-				height: "30em",
+				height: "36em",
 				callback: function (resp) {
 					resp.data.redirect.id = redirect.id
 					Vue.set(that.redirects, index, resp.data.redirect)
@@ -119,6 +119,8 @@ Vue.component("http-host-redirect-box", {
 								<grey-label v-if="redirect.matchPrefix">匹配前缀</grey-label>
 								<grey-label v-if="redirect.matchRegexp">正则匹配</grey-label>
 								<grey-label v-if="!redirect.matchPrefix && !redirect.matchRegexp">精准匹配</grey-label>
+								<grey-label v-if="redirect.exceptDomains != null && redirect.exceptDomains.length > 0" v-for="domain in redirect.exceptDomains">排除:{{domain}}</grey-label>
+								<grey-label v-if="redirect.onlyDomains != null && redirect.onlyDomains.length > 0" v-for="domain in redirect.onlyDomains">仅限:{{domain}}</grey-label>
 							</div>
 						</div>
 						<div v-if="redirect.type == 'domain'">

web/public/js/components/server/http-pages-and-shutdown-box.js

@@ -48,29 +48,32 @@ Vue.component("http-pages-and-shutdown-box", {
 		addPage: function () {
 			let that = this
 			teaweb.popup("/servers/server/settings/pages/createPopup", {
-				height: "26em",
+				height: "30em",
 				callback: function (resp) {
 					that.pages.push(resp.data.page)
+					that.notifyChange()
 				}
 			})
 		},
 		updatePage: function (pageIndex, pageId) {
 			let that = this
 			teaweb.popup("/servers/server/settings/pages/updatePopup?pageId=" + pageId, {
-				height: "26em",
+				height: "30em",
 				callback: function (resp) {
 					Vue.set(that.pages, pageIndex, resp.data.page)
+					that.notifyChange()
 				}
 			})
 		},
 		removePage: function (pageIndex) {
 			let that = this
-			teaweb.confirm("确定要移除此页面吗？", function () {
+			teaweb.confirm("确定要删除此自定义页面吗？", function () {
 				that.pages.$remove(pageIndex)
+				that.notifyChange()
 			})
 		},
 		addShutdownHTMLTemplate: function () {
-			this.shutdownConfig.body  = `<!DOCTYPE html>
+			this.shutdownConfig.body = `<!DOCTYPE html>
 <html lang="en">
 <head>
 \t<title>升级中</title>
@@ -89,80 +92,157 @@ Vue.component("http-pages-and-shutdown-box", {
 
 </body>
 </html>`
+		},
+		notifyChange: function () {
+			let parent = this.$el.parentNode
+			while (true) {
+				if (parent == null) {
+					break
+				}
+				if (parent.tagName == "FORM") {
+					break
+				}
+				parent = parent.parentNode
+			}
+			if (parent != null) {
+				setTimeout(function () {
+					Tea.runActionOn(parent)
+				}, 100)
+			}
 		}
 	},
 	template: `<div>
 <input type="hidden" name="pagesJSON" :value="JSON.stringify(pages)"/>
 <input type="hidden" name="shutdownJSON" :value="JSON.stringify(shutdownConfig)"/>
-<table class="ui table selectable definition">
-	<tr>
-		<td class="title">自定义页面</td>
-		<td>
-			<div v-if="pages.length > 0">
-				<div class="ui label small basic" v-for="(page,index) in pages">
-					{{page.status}} -&gt; <span v-if="page.bodyType == 'url'">{{page.url}}</span><span v-if="page.bodyType == 'html'">[HTML内容]</span> <a href="" title="修改" @click.prevent="updatePage(index, page.id)"><i class="icon pencil small"></i></a> <a href="" title="删除" @click.prevent="removePage(index)"><i class="icon remove"></i></a>
+<h4 style="margin-bottom: 0.5em">自定义页面</h4>
+
+<p class="comment" style="padding-top: 0; margin-top: 0">根据响应状态码返回一些自定义页面，比如404，500等错误页面。</p>
+
+<div v-if="pages.length > 0">
+	<table class="ui table selectable celled">
+		<thead>
+			<tr>
+				<th class="two wide">响应状态码</th>
+				<th>页面类型</th>
+				<th class="two wide">新状态码</th>
+				<th>例外URL</th>
+				<th>限制URL</th>
+				<th class="two op">操作</th>
+			</tr>	
+		</thead>
+		<tr v-for="(page,index) in pages">
+			<td>
+				<a href="" @click.prevent="updatePage(index, page.id)">
+					<span v-if="page.status != null && page.status.length == 1">{{page.status[0]}}</span>
+					<span v-else>{{page.status}}</span>
+					
+					<i class="icon expand small"></i>
+				</a>
+			</td>
+			<td style="word-break: break-all">
+				<div v-if="page.bodyType == 'url'">
+					{{page.url}}
+					<div>
+						<grey-label>读取URL</grey-label>
+					</div>
 				</div>
-				<div class="ui divider"></div>
-			</div>
-			<div>
-				<button class="ui button small" type="button" @click.prevent="addPage()">+</button>
-			</div>
-			<p class="comment">根据响应状态码返回一些自定义页面，比如404，500等错误页面。</p>
-		</td>
-	</tr>	
-	<tr>
-		<td>临时关闭页面</td>
-		<td>
-			<div>
-				<table class="ui table selectable definition">
-					<prior-checkbox :v-config="shutdownConfig" v-if="vIsLocation"></prior-checkbox>
-					<tbody v-show="!vIsLocation || shutdownConfig.isPrior">
-						<tr>
-							<td class="title">临时关闭网站</td>
-							<td>
-								<div class="ui checkbox">
-									<input type="checkbox" value="1" v-model="shutdownConfig.isOn" />
-									<label></label>
-								</div>
-								<p class="comment">选中后，表示临时关闭当前网站，并显示自定义内容。</p>
-							</td>
-						</tr>
-					</tbody>
-					<tbody v-show="(!vIsLocation || shutdownConfig.isPrior) && shutdownConfig.isOn">
-						<tr>
-							<td>显示内容类型 *</td>
-							<td>
-								<select class="ui dropdown auto-width" v-model="shutdownConfig.bodyType">
-									<option value="html">HTML</option>
-									<option value="url">读取URL</option>
-								</select>
-							</td>
-						</tr>
-						<tr v-show="shutdownConfig.bodyType == 'url'">
-							<td class="title">显示页面URL *</td>
-							<td>
-								<input type="text" v-model="shutdownConfig.url" placeholder="类似于 https://example.com/page.html"/>
-								<p class="comment">将从此URL中读取内容。</p>
-							</td>
-						</tr>
-						<tr v-show="shutdownConfig.bodyType == 'html'">
-							<td>显示页面HTML *</td>
-							<td>
-								<textarea name="body" ref="shutdownHTMLBody" v-model="shutdownConfig.body"></textarea>
-								<p class="comment"><a href="" @click.prevent="addShutdownHTMLTemplate">[使用模板]</a>。填写页面的HTML内容，支持请求变量。</p>
-							</td>
-						</tr>
-						<tr>
-							<td>状态码</td>
-							<td><input type="text" size="3" maxlength="3" name="shutdownStatus" style="width:5.2em" placeholder="状态码" v-model="shutdownStatus"/></td>
-						</tr>
-					</tbody>
-				</table>
-				<p class="comment">开启临时关闭页面时，所有请求都会直接显示此页面。可用于临时升级网站或者禁止用户访问某个网页。</p>
-			</div>
-		</td>
-	</tr>
-</table>
+				<div v-if="page.bodyType == 'redirectURL'">
+					{{page.url}}
+					<div>
+						<grey-label>跳转URL</grey-label>	
+						<grey-label v-if="page.newStatus > 0">{{page.newStatus}}</grey-label>
+					</div>
+				</div>
+				<div v-if="page.bodyType == 'html'">
+					[HTML内容]
+					<div>
+						<grey-label v-if="page.newStatus > 0">{{page.newStatus}}</grey-label>
+					</div>
+				</div>
+			</td>
+			<td>
+				<span v-if="page.newStatus > 0">{{page.newStatus}}</span>
+				<span v-else class="disabled">保持</span>	
+			</td>
+			<td>
+				<div v-if="page.exceptURLPatterns != null && page.exceptURLPatterns">
+					<span v-for="urlPattern in page.exceptURLPatterns" class="ui basic label small">{{urlPattern.pattern}}</span>
+				</div>
+				<span v-else class="disabled">-</span>
+			</td>
+			<td>
+				<div v-if="page.onlyURLPatterns != null && page.onlyURLPatterns">
+					<span v-for="urlPattern in page.onlyURLPatterns" class="ui basic label small">{{urlPattern.pattern}}</span>
+				</div>
+				<span v-else class="disabled">-</span>
+			</td>
+			<td>
+				<a href="" title="修改" @click.prevent="updatePage(index, page.id)">修改</a> &nbsp; 
+				<a href="" title="删除" @click.prevent="removePage(index)">删除</a>
+			</td>
+		</tr>
+	</table>
+</div>
+<div style="margin-top: 1em">
+	<button class="ui button small" type="button" @click.prevent="addPage()">+添加自定义页面</button>
+</div>
+
+<h4 style="margin-top: 2em;">临时关闭页面</h4>
+<p class="comment" style="margin-top: 0; padding-top: 0">开启临时关闭页面时，所有请求都会直接显示此页面。可用于临时升级网站或者禁止用户访问某个网页。</p>	
+<div>
+	<table class="ui table selectable definition">
+		<prior-checkbox :v-config="shutdownConfig" v-if="vIsLocation"></prior-checkbox>
+		<tbody v-show="!vIsLocation || shutdownConfig.isPrior">
+			<tr>
+				<td class="title">启用临时关闭网站</td>
+				<td>
+					<div class="ui checkbox">
+						<input type="checkbox" value="1" v-model="shutdownConfig.isOn" />
+						<label></label>
+					</div>
+					<p class="comment">选中后，表示临时关闭当前网站，并显示自定义内容。</p>
+				</td>
+			</tr>
+		</tbody>
+		<tbody v-show="(!vIsLocation || shutdownConfig.isPrior) && shutdownConfig.isOn">
+			<tr>
+				<td>显示内容类型 *</td>
+				<td>
+					<select class="ui dropdown auto-width" v-model="shutdownConfig.bodyType">
+						<option value="html">HTML</option>
+						<option value="url">读取URL</option>
+						<option value="redirectURL">跳转URL</option>
+					</select>
+				</td>
+			</tr>
+			<tr v-if="shutdownConfig.bodyType == 'url'">
+				<td class="title">显示页面URL *</td>
+				<td>
+					<input type="text" v-model="shutdownConfig.url" placeholder="类似于 https://example.com/page.html"/>
+					<p class="comment">将从此URL中读取内容。</p>
+				</td>
+			</tr>
+			<tr v-if="shutdownConfig.bodyType == 'redirectURL'">
+				<td class="title">跳转到URL *</td>
+				<td>
+					<input type="text" v-model="shutdownConfig.url" placeholder="类似于 https://example.com/page.html"/>
+					 <p class="comment">将会跳转到此URL。</p>
+				</td>
+			</tr>
+			<tr v-show="shutdownConfig.bodyType == 'html'">
+				<td>显示页面HTML *</td>
+				<td>
+					<textarea name="body" ref="shutdownHTMLBody" v-model="shutdownConfig.body"></textarea>
+					<p class="comment"><a href="" @click.prevent="addShutdownHTMLTemplate">[使用模板]</a>。填写页面的HTML内容，支持请求变量。</p>
+				</td>
+			</tr>
+			<tr>
+				<td>状态码</td>
+				<td><input type="text" size="3" maxlength="3" name="shutdownStatus" style="width:5.2em" placeholder="状态码" v-model="shutdownStatus"/></td>
+			</tr>
+		</tbody>
+	</table>
+</div>
 <div class="ui margin"></div>
 </div>`
 })

web/public/js/components/server/http-pages-box.js

@@ -17,6 +17,7 @@ Vue.component("http-pages-box", {
 				height: "26em",
 				callback: function (resp) {
 					that.pages.push(resp.data.page)
+					that.notifyChange()
 				}
 			})
 		},
@@ -26,6 +27,7 @@ Vue.component("http-pages-box", {
 				height: "26em",
 				callback: function (resp) {
 					Vue.set(that.pages, pageIndex, resp.data.page)
+					that.notifyChange()
 				}
 			})
 		},
@@ -33,28 +35,98 @@ Vue.component("http-pages-box", {
 			let that = this
 			teaweb.confirm("确定要移除此页面吗？", function () {
 				that.pages.$remove(pageIndex)
+				that.notifyChange()
 			})
+		},
+		notifyChange: function () {
+			let parent = this.$el.parentNode
+			while (true) {
+				if (parent == null) {
+					break
+				}
+				if (parent.tagName == "FORM") {
+					break
+				}
+				parent = parent.parentNode
+			}
+			if (parent != null) {
+				setTimeout(function () {
+					Tea.runActionOn(parent)
+				}, 100)
+			}
 		}
 	},
 	template: `<div>
 <input type="hidden" name="pagesJSON" :value="JSON.stringify(pages)"/>
-<table class="ui table selectable definition">
-	<tr>
-		<td class="title">自定义页面</td>
-		<td>
-			<div v-if="pages.length > 0">
-				<div class="ui label small basic" v-for="(page,index) in pages">
-					{{page.status}} -&gt; <span v-if="page.bodyType == 'url'">{{page.url}}</span><span v-if="page.bodyType == 'html'">[HTML内容]</span> <a href="" title="修改" @click.prevent="updatePage(index, page.id)"><i class="icon pencil small"></i></a> <a href="" title="删除" @click.prevent="removePage(index)"><i class="icon remove"></i></a>
+
+<div v-if="pages.length > 0">
+	<table class="ui table selectable celled">
+		<thead>
+			<tr>
+				<th class="two wide">响应状态码</th>
+				<th>页面类型</th>
+				<th class="two wide">新状态码</th>
+				<th>例外URL</th>
+				<th>限制URL</th>
+				<th class="two op">操作</th>
+			</tr>	
+		</thead>
+		<tr v-for="(page,index) in pages">
+			<td>
+				<a href="" @click.prevent="updatePage(index, page.id)">
+					<span v-if="page.status != null && page.status.length == 1">{{page.status[0]}}</span>
+					<span v-else>{{page.status}}</span>
+					
+					<i class="icon expand small"></i>
+				</a>
+			</td>
+			<td style="word-break: break-all">
+				<div v-if="page.bodyType == 'url'">
+					{{page.url}}
+					<div>
+						<grey-label>读取URL</grey-label>
+					</div>
 				</div>
-				<div class="ui divider"></div>
-			</div>
-			<div>
-				<button class="ui button small" type="button" @click.prevent="addPage()">+</button>
-			</div>
-			<p class="comment">根据响应状态码返回一些自定义页面，比如404，500等错误页面。</p>
-		</td>
-	</tr>
-</table>
+				<div v-if="page.bodyType == 'redirectURL'">
+					{{page.url}}
+					<div>
+						<grey-label>跳转URL</grey-label>	
+						<grey-label v-if="page.newStatus > 0">{{page.newStatus}}</grey-label>
+					</div>
+				</div>
+				<div v-if="page.bodyType == 'html'">
+					[HTML内容]
+					<div>
+						<grey-label v-if="page.newStatus > 0">{{page.newStatus}}</grey-label>
+					</div>
+				</div>
+			</td>
+			<td>
+				<span v-if="page.newStatus > 0">{{page.newStatus}}</span>
+				<span v-else class="disabled">保持</span>	
+			</td>
+			<td>
+				<div v-if="page.exceptURLPatterns != null && page.exceptURLPatterns">
+					<span v-for="urlPattern in page.exceptURLPatterns" class="ui basic label small">{{urlPattern.pattern}}</span>
+				</div>
+				<span v-else class="disabled">-</span>
+			</td>
+			<td>
+				<div v-if="page.onlyURLPatterns != null && page.onlyURLPatterns">
+					<span v-for="urlPattern in page.onlyURLPatterns" class="ui basic label small">{{urlPattern.pattern}}</span>
+				</div>
+				<span v-else class="disabled">-</span>
+			</td>
+			<td>
+				<a href="" title="修改" @click.prevent="updatePage(index, page.id)">修改</a> &nbsp; 
+				<a href="" title="删除" @click.prevent="removePage(index)">删除</a>
+			</td>
+		</tr>
+	</table>
+</div>
+<div style="margin-top: 1em">
+	<button class="ui button small" type="button" @click.prevent="addPage()">+添加自定义页面</button>
+</div>
 <div class="ui margin"></div>
 </div>`
 })

web/public/js/components/server/metric-charts.js

@@ -1,6 +1,6 @@
 // 指标图表
 Vue.component("metric-chart", {
-	props: ["v-chart", "v-stats", "v-item"],
+	props: ["v-chart", "v-stats", "v-item", "v-column" /** in column? **/],
 	mounted: function () {
 		this.load()
 	},
@@ -188,7 +188,7 @@ Vue.component("metric-chart", {
 							color: teaweb.DefaultChartColor
 						},
 						areaStyle: {},
-						barWidth: "20em"
+						barWidth: "10em"
 					}
 				]
 			})
@@ -346,7 +346,7 @@ Vue.component("metric-chart", {
 							color: teaweb.DefaultChartColor
 						},
 						areaStyle: {},
-						barWidth: "20em"
+						barWidth: "10em"
 					}
 				]
 			})
@@ -414,7 +414,7 @@ Vue.component("metric-chart", {
 			return time
 		}
 	},
-	template: `<div style="float: left" :style="{'width': width}">
+	template: `<div style="float: left" :style="{'width': this.vColumn ?  '' : width}" :class="{'ui column':this.vColumn}">
 	<h4>{{chart.name}} <span>（{{valueTypeName}}）</span></h4>
 	<div class="ui divider"></div>
 	<div style="height: 14em; padding-bottom: 1em; " :id="chartId" :class="{'scroll-box': chart.type == 'table'}"></div>

web/public/js/components/server/reverse-proxy-box.js

@@ -26,7 +26,8 @@ Vue.component("reverse-proxy-box", {
 				maxConns: 0,
 				maxIdleConns: 0,
 				followRedirects: false,
-				retry50X: true
+				retry50X: false,
+				retry40X: false
 			}
 		}
 		if (reverseProxyConfig.addHeaders == null) {
@@ -236,6 +237,38 @@ Vue.component("reverse-proxy-box", {
 					<p class="comment">开启后将自动刷新缓冲区数据到客户端，在类似于SSE（server-sent events）等场景下很有用。</p>
 				</td>
 			</tr>
+			<tr v-show="family == null || family == 'http'">
+            	<td>自动重试50X</td>
+            	<td>
+            		<checkbox v-model="reverseProxyConfig.retry50X"></checkbox>
+            		<p class="comment">选中后，表示当源站返回状态码为50X（比如502、504等）时，自动重试其他源站。</p>
+				</td>
+			</tr>
+			<tr v-show="family == null || family == 'http'">
+            	<td>自动重试40X</td>
+            	<td>
+            		<checkbox v-model="reverseProxyConfig.retry40X"></checkbox>
+            		<p class="comment">选中后，表示当源站返回状态码为40X（403或404）时，自动重试其他源站。</p>
+				</td>
+			</tr>
+            <tr v-show="family != 'unix'">
+            	<td>PROXY Protocol</td>
+            	<td>
+            		<checkbox name="proxyProtocolIsOn" v-model="reverseProxyConfig.proxyProtocol.isOn"></checkbox>
+            		<p class="comment">选中后表示启用PROXY Protocol，每次连接源站时都会在头部写入客户端地址信息。</p>
+				</td>
+			</tr>
+			<tr v-show="family != 'unix' && reverseProxyConfig.proxyProtocol.isOn">
+				<td>PROXY Protocol版本</td>
+				<td>
+					<select class="ui dropdown auto-width" name="proxyProtocolVersion" v-model="reverseProxyConfig.proxyProtocol.version">
+						<option value="1">1</option>
+						<option value="2">2</option>
+					</select>
+					<p class="comment" v-if="reverseProxyConfig.proxyProtocol.version == 1">发送类似于<code-label>PROXY TCP4 192.168.1.1 192.168.1.10 32567 443</code-label>的头部信息。</p>
+					<p class="comment" v-if="reverseProxyConfig.proxyProtocol.version == 2">发送二进制格式的头部信息。</p>
+				</td>
+			</tr>
 			<tr v-if="family == null || family == 'http'">
                 <td class="color-border">源站连接失败超时时间</td>
                 <td>
@@ -300,31 +333,6 @@ Vue.component("reverse-proxy-box", {
                     <p class="comment">源站保持等待的空闲超时时间，0表示使用默认时间。</p>
                 </td>
             </tr>
-            <tr v-show="family == null || family == 'http'">
-            	<td>自动重试50X</td>
-            	<td>
-            		<checkbox v-model="reverseProxyConfig.retry50X"></checkbox>
-            		<p class="comment">选中后，表示当源站返回状态码为50X（比如502、504）时，自动重试。</p>
-				</td>
-			</tr>
-            <tr v-show="family != 'unix'">
-            	<td>PROXY Protocol</td>
-            	<td>
-            		<checkbox name="proxyProtocolIsOn" v-model="reverseProxyConfig.proxyProtocol.isOn"></checkbox>
-            		<p class="comment">选中后表示启用PROXY Protocol，每次连接源站时都会在头部写入客户端地址信息。</p>
-				</td>
-			</tr>
-			<tr v-show="family != 'unix' && reverseProxyConfig.proxyProtocol.isOn">
-				<td>PROXY Protocol版本</td>
-				<td>
-					<select class="ui dropdown auto-width" name="proxyProtocolVersion" v-model="reverseProxyConfig.proxyProtocol.version">
-						<option value="1">1</option>
-						<option value="2">2</option>
-					</select>
-					<p class="comment" v-if="reverseProxyConfig.proxyProtocol.version == 1">发送类似于<code-label>PROXY TCP4 192.168.1.1 192.168.1.10 32567 443</code-label>的头部信息。</p>
-					<p class="comment" v-if="reverseProxyConfig.proxyProtocol.version == 2">发送二进制格式的头部信息。</p>
-				</td>
-			</tr>
 		</tbody>
 	</table>
 	<div class="margin"></div>

web/public/js/utils.js

@@ -592,7 +592,8 @@ window.teaweb = {
 					itemStyle: {
 						color: this.DefaultChartColor
 					},
-					barWidth: "20em"
+					barWidth: "10em",
+					areaStyle: {}
 				}
 			],
 			animation: true,

web/views/@default/@grids.less

@@ -41,10 +41,37 @@
 	}
 
 	.column:hover {
-		background: rgba(0, 0, 0, .03)!important;
+		background: rgba(0, 0, 0, .03) !important;
 
 		a {
 			display: inline;
 		}
 	}
+}
+
+.grid.chart-grid {
+	margin-top: 1em !important;
+	margin-left: 0.4em !important;
+
+	.column {
+		margin-bottom: 1em;
+		border: 1px rgba(0, 0, 0, .1) solid;
+		border-right: 0;
+
+		.menu {
+			margin-top: -0.6em !important;
+			margin-bottom: -0.6em !important;
+		}
+
+		h4 {
+			span {
+				font-size: 0.8em;
+				color: grey;
+			}
+		}
+	}
+
+	.column.with-border {
+		border-right: 1px rgba(0, 0, 0, .1) solid;
+	}
 }