优化文字

build/build.sh

@@ -20,6 +20,18 @@ function build() {
 		TAG="community"
 	fi
 
+	# checking environment
+	echo "checking required commands ..."
+	commands=("zip" "unzip" "go" "find" "sed")
+	for cmd in "${commands[@]}"; do
+		if [ `which ${cmd}` ]; then
+			echo "checking ${cmd}: ok"
+		else
+			echo "checking ${cmd}: not found"
+			return
+		fi
+	done
+
 	VERSION=$(lookup-version $ROOT/../internal/const/const.go)
 	ZIP="${NAME}-${OS}-${ARCH}-${TAG}-v${VERSION}.zip"
 
@@ -38,6 +50,10 @@ function build() {
 	echo "=============================="
 	cd -
 
+    # generate files
+    echo "generating files ..."
+	go run -tags $TAG $ROOT/../cmd/edge-admin/main.go generate
+
 	# create dir & copy files
 	echo "copying ..."
 	if [ ! -d $DIST ]; then
@@ -51,6 +67,19 @@ function build() {
 	rm -f $DIST/web/tmp/*
 	cp $ROOT/configs/server.template.yaml $DIST/configs/
 
+	# change _plus.[ext] to .[ext]
+	if [ "${TAG}" = "plus" ]; then
+		echo "converting filenames ..."
+		exts=("html" "js" "css")
+		for ext in "${exts[@]}"; do
+			pattern="*_plus."${ext}
+			find $DIST/web/views -type f -name $pattern | \
+				while read filename; do
+					mv ${filename} "${filename/_plus."${ext}"/."${ext}"}"
+				done
+		done
+	fi
+
 	EDGE_API_ZIP_FILE=$ROOT"/../../EdgeAPI/dist/edge-api-${OS}-${ARCH}-${TAG}-v${APINodeVersion}.zip"
 	cp $EDGE_API_ZIP_FILE $DIST/
 	cd $DIST/
@@ -58,10 +87,6 @@ function build() {
 	rm -f $(basename $EDGE_API_ZIP_FILE)
 	cd -
 
-    # generate files
-    echo "generating files ..."
-	go run  -tags $TAG $ROOT/../cmd/edge-admin/main.go generate
-
 	# build
 	echo "building "${NAME}" ..."
 	env GOOS=$OS GOARCH=$ARCH go build -tags $TAG -ldflags="-s -w" -o $DIST/bin/${NAME} $ROOT/../cmd/edge-admin/main.go

build/generate.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+go run -tags=community ../cmd/edge-admin/main.go  generate

internal/configs/plus_config.go

@@ -11,7 +11,9 @@ import (
 var plusConfigFile = "plus.cache.json"
 
 type PlusConfig struct {
-	IsPlus bool `json:"isPlus"`
+	IsPlus     bool     `json:"isPlus"`
+	Components []string `json:"components"`
+	DayTo      string   `json:"dayTo"`
 }
 
 func ReadPlusConfig() *PlusConfig {

internal/const/const.go

@@ -1,9 +1,9 @@
 package teaconst
 
 const (
-	Version = "0.3.5.1"
+	Version = "0.3.7"
 
-	APINodeVersion = "0.3.5"
+	APINodeVersion = "0.3.7"
 
 	ProductName   = "Edge Admin"
 	ProcessName   = "edge-admin"
@@ -18,4 +18,5 @@ const (
 	CookieSID = "edgesid"
 
 	SystemdServiceName = "edge-admin"
+	UpdatesURL         = "https://goedge.cn/api/boot/versions?os=${os}&arch=${arch}"
 )

internal/const/plus.go

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

internal/rpc/rpc_client_test.go

@@ -18,7 +18,7 @@ func TestRPCClient_NodeRPC(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	rpc, err := NewRPCClient(config)
+	rpc, err := NewRPCClient(config, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -41,7 +41,7 @@ func TestRPC_Dial_HTTP(t *testing.T) {
 		},
 		NodeId: "a7e55782dab39bce0901058a1e14a0e6",
 		Secret: "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
-	})
+	}, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -62,7 +62,7 @@ func TestRPC_Dial_HTTP_2(t *testing.T) {
 		},
 		NodeId: "a7e55782dab39bce0901058a1e14a0e6",
 		Secret: "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
-	})
+	}, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -83,7 +83,7 @@ func TestRPC_Dial_HTTPS(t *testing.T) {
 		},
 		NodeId: "a7e55782dab39bce0901058a1e14a0e6",
 		Secret: "lvyPobI3BszkJopz5nPTocOs0OLkEJ7y",
-	})
+	}, true)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/tasks/task_sync_cluster.go

@@ -51,7 +51,7 @@ func (this *SyncClusterTask) loop() error {
 	}
 	ctx := rpcClient.Context(0)
 
-	tasksResp, err := rpcClient.NodeTaskRPC().FindNotifyingNodeTasks(ctx, &pb.FindNotifyingNodeTasksRequest{Size: 100})
+	tasksResp, err := rpcClient.NodeTaskRPC().FindNotifyingNodeTasks(ctx, &pb.FindNotifyingNodeTasksRequest{Size: 500})
 	if err != nil {
 		return err
 	}

internal/utils/ip_utils.go

@@ -1,14 +1,17 @@
 package utils
 
 import (
+	"bytes"
 	"encoding/binary"
+	"errors"
+	"github.com/iwind/TeaGo/types"
 	"math/big"
 	"net"
 	"regexp"
 	"strings"
 )
 
-// 将IP转换为整型
+// IP2Long 将IP转换为整型
 func IP2Long(ip string) uint64 {
 	s := net.ParseIP(ip)
 	if len(s) != 16 {
@@ -23,7 +26,7 @@ func IP2Long(ip string) uint64 {
 	return uint64(binary.BigEndian.Uint32(s.To4()))
 }
 
-// 判断是否为IPv4
+// IsIPv4 判断是否为IPv4
 func IsIPv4(ip string) bool {
 	if !regexp.MustCompile(`^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$`).MatchString(ip) {
 		return false
@@ -34,10 +37,100 @@ func IsIPv4(ip string) bool {
 	return true
 }
 
-// 判断是否为IPv6
+// IsIPv6 判断是否为IPv6
 func IsIPv6(ip string) bool {
 	if !strings.Contains(ip, ":") {
 		return false
 	}
 	return len(net.ParseIP(ip)) == net.IPv6len
 }
+
+// ExtractIP 分解IP
+// 只支持D段掩码的CIDR
+// 最多只记录255个值
+func ExtractIP(ipStrings string) ([]string, error) {
+	ipStrings = strings.ReplaceAll(ipStrings, " ", "")
+
+	// CIDR
+	if strings.Contains(ipStrings, "/") {
+		_, cidrNet, err := net.ParseCIDR(ipStrings)
+		if err != nil {
+			return nil, err
+		}
+
+		var index = strings.Index(ipStrings, "/")
+		var ipFrom = ipStrings[:index]
+		var bits = types.Int(ipStrings[index+1:])
+		if bits < 24 {
+			return nil, errors.New("CIDR bits should be greater than 24")
+		}
+
+		var ipv4 = net.ParseIP(ipFrom).To4()
+		if len(ipv4) == 0 {
+			return nil, errors.New("support IPv4 only")
+		}
+
+		var result = []string{}
+		ipv4[3] = 0 // 从0开始
+		for i := 0; i <= 255; i++ {
+			if cidrNet.Contains(ipv4) {
+				result = append(result, ipv4.String())
+			}
+			ipv4 = NextIP(ipv4)
+		}
+		return result, nil
+	}
+
+	// IP Range
+	if strings.Contains(ipStrings, "-") {
+		var index = strings.Index(ipStrings, "-")
+		var ipFromString = ipStrings[:index]
+		var ipToString = ipStrings[index+1:]
+
+		var ipFrom = net.ParseIP(ipFromString).To4()
+		if len(ipFrom) == 0 {
+			return nil, errors.New("invalid ip '" + ipFromString + "'")
+		}
+
+		var ipTo = net.ParseIP(ipToString).To4()
+		if len(ipTo) == 0 {
+			return nil, errors.New("invalid ip '" + ipToString + "'")
+		}
+
+		if bytes.Compare(ipFrom, ipTo) > 0 {
+			ipFrom, ipTo = ipTo, ipFrom
+		}
+
+		var result = []string{}
+		for i := 0; i < 255; i++ {
+			if bytes.Compare(ipFrom, ipTo) > 0 {
+				break
+			}
+			result = append(result, ipFrom.String())
+			ipFrom = NextIP(ipFrom)
+		}
+		return result, nil
+	}
+
+	return []string{ipStrings}, nil
+}
+
+// NextIP IP增加1
+func NextIP(prevIP net.IP) net.IP {
+	var ip = make(net.IP, len(prevIP))
+	copy(ip, prevIP)
+	var index = len(ip) - 1
+	for {
+		if ip[index] == 255 {
+			ip[index] = 0
+			index--
+			if index < 0 {
+				break
+			}
+		} else {
+			ip[index]++
+			break
+		}
+	}
+	return ip
+}

internal/utils/ip_utils_test.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"net"
 	"testing"
 )
 
@@ -83,3 +84,27 @@ func TestIsIPv6(t *testing.T) {
 		}
 	}
 }
+
+func TestExtractIP(t *testing.T) {
+	t.Log(ExtractIP("192.168.1.100"))
+}
+
+func TestExtractIP_CIDR(t *testing.T) {
+	t.Log(ExtractIP("192.168.2.100/24"))
+}
+
+func TestExtractIP_Range(t *testing.T) {
+	t.Log(ExtractIP("192.168.2.100 - 192.168.4.2"))
+}
+
+func TestNextIP(t *testing.T) {
+	for _, ip := range []string{"192.168.1.1", "0.0.0.0", "255.255.255.255", "192.168.2.255", "192.168.255.255"} {
+		t.Log(ip+":", NextIP(net.ParseIP(ip).To4()))
+	}
+}
+
+func TestNextIP_Copy(t *testing.T) {
+	var ip = net.ParseIP("192.168.1.100")
+	var nextIP = NextIP(ip)
+	t.Log(ip, nextIP)
+}

internal/utils/numberutils/utils.go

@@ -13,38 +13,30 @@ func FormatInt(value int) string {
 	return strconv.Itoa(value)
 }
 
-func FormatBytes(bytes int64) string {
-	if bytes < 1024 {
-		return FormatInt64(bytes) + "B"
-	} else if bytes < 1024*1024 {
-		return fmt.Sprintf("%.2fKB", float64(bytes)/1024)
-	} else if bytes < 1024*1024*1024 {
-		return fmt.Sprintf("%.2fMB", float64(bytes)/1024/1024)
-	} else if bytes < 1024*1024*1024*1024 {
-		return fmt.Sprintf("%.2fGB", float64(bytes)/1024/1024/1024)
-	} else if bytes < 1024*1024*1024*1024*1024 {
-		return fmt.Sprintf("%.2fTB", float64(bytes)/1024/1024/1024/1024)
-	} else if bytes < 1024*1024*1024*1024*1024*1024 {
-		return fmt.Sprintf("%.2fPB", float64(bytes)/1024/1024/1024/1024/1024)
-	} else {
-		return fmt.Sprintf("%.2fEB", float64(bytes)/1024/1024/1024/1024/1024/1024)
+func Pow1024(n int) int64 {
+	if n <= 0 {
+		return 1
 	}
+	if n == 1 {
+		return 1024
+	}
+	return Pow1024(n-1) * 1024
 }
 
-func FormatBits(bits int64) string {
-	if bits < 1000 {
-		return FormatInt64(bits) + "B"
-	} else if bits < 1000*1000 {
-		return fmt.Sprintf("%.2fKB", float64(bits)/1000)
-	} else if bits < 1000*1000*1000 {
-		return fmt.Sprintf("%.2fMB", float64(bits)/1000/1000)
-	} else if bits < 1000*1000*1000*1000 {
-		return fmt.Sprintf("%.2fGB", float64(bits)/1000/1000/1000)
-	} else if bits < 1000*1000*1000*1000*1000 {
-		return fmt.Sprintf("%.2fTB", float64(bits)/1000/1000/1000/1000)
-	} else if bits < 1000*1000*1000*1000*1000*1000 {
-		return fmt.Sprintf("%.2fPB", float64(bits)/1000/1000/1000/1000/1000)
+func FormatBytes(bytes int64) string {
+	if bytes < Pow1024(1) {
+		return FormatInt64(bytes) + "B"
+	} else if bytes < Pow1024(2) {
+		return fmt.Sprintf("%.2fKB", float64(bytes)/float64(Pow1024(1)))
+	} else if bytes < Pow1024(3) {
+		return fmt.Sprintf("%.2fMB", float64(bytes)/float64(Pow1024(2)))
+	} else if bytes < Pow1024(4) {
+		return fmt.Sprintf("%.2fGB", float64(bytes)/float64(Pow1024(3)))
+	} else if bytes < Pow1024(5) {
+		return fmt.Sprintf("%.2fTB", float64(bytes)/float64(Pow1024(4)))
+	} else if bytes < Pow1024(6) {
+		return fmt.Sprintf("%.2fPB", float64(bytes)/float64(Pow1024(5)))
 	} else {
-		return fmt.Sprintf("%.2fEB", float64(bits)/1000/1000/1000/1000/1000/1000)
+		return fmt.Sprintf("%.2fEB", float64(bytes)/float64(Pow1024(6)))
 	}
 }

internal/utils/numberutils/utils_test.go

@@ -0,0 +1,16 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package numberutils
+
+import "testing"
+
+func TestFormatBytes(t *testing.T) {
+	t.Log(FormatBytes(1))
+	t.Log(FormatBytes(1000))
+	t.Log(FormatBytes(1_000_000))
+	t.Log(FormatBytes(1_000_000_000))
+	t.Log(FormatBytes(1_000_000_000_000))
+	t.Log(FormatBytes(1_000_000_000_000_000))
+	t.Log(FormatBytes(1_000_000_000_000_000_000))
+	t.Log(FormatBytes(9_000_000_000_000_000_000))
+}

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

@@ -3,6 +3,7 @@ package cluster
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
@@ -167,9 +168,13 @@ func (this *CreateNodeAction) RunPost(params struct {
 	nodeId := createResp.NodeId
 
 	// IP地址
+	var resultIPAddresses = []string{}
 	for _, addr := range ipAddresses {
+		var resultAddrIds = []int64{}
+
 		addrId := addr.GetInt64("id")
 		if addrId > 0 {
+			resultAddrIds = append(resultAddrIds, addrId)
 			_, err = this.RPC().NodeIPAddressRPC().UpdateNodeIPAddressNodeId(this.AdminContext(), &pb.UpdateNodeIPAddressNodeIdRequest{
 				NodeIPAddressId: addrId,
 				NodeId:          nodeId,
@@ -178,20 +183,50 @@ func (this *CreateNodeAction) RunPost(params struct {
 				this.ErrorPage(err)
 				return
 			}
+
+			resultIPAddresses = append(resultIPAddresses, addr.GetString("ip"))
 		} else {
-			createResp, err := this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
-				NodeId:    nodeId,
-				Role:      nodeconfigs.NodeRoleNode,
-				Name:      addr.GetString("name"),
-				Ip:        addr.GetString("ip"),
-				CanAccess: addr.GetBool("canAccess"),
-				IsUp:      addr.GetBool("isUp"),
-			})
+			var ipStrings = addr.GetString("ip")
+			result, err := utils.ExtractIP(ipStrings)
 			if err != nil {
-				this.ErrorPage(err)
-				return
+				this.Fail("节点创建成功，但是保存IP失败：" + err.Error())
+			}
+
+			resultIPAddresses = append(resultIPAddresses, result...)
+
+			if len(result) == 1 {
+				// 单个创建
+				createResp, err := this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
+					NodeId:    nodeId,
+					Role:      nodeconfigs.NodeRoleNode,
+					Name:      addr.GetString("name"),
+					Ip:        result[0],
+					CanAccess: addr.GetBool("canAccess"),
+					IsUp:      addr.GetBool("isUp"),
+				})
+				if err != nil {
+					this.ErrorPage(err)
+					return
+				}
+				addrId = createResp.NodeIPAddressId
+				resultAddrIds = append(resultAddrIds, addrId)
+			} else if len(result) > 1 {
+				// 批量创建
+				createResp, err := this.RPC().NodeIPAddressRPC().CreateNodeIPAddresses(this.AdminContext(), &pb.CreateNodeIPAddressesRequest{
+					NodeId:     nodeId,
+					Role:       nodeconfigs.NodeRoleNode,
+					Name:       addr.GetString("name"),
+					IpList:     result,
+					CanAccess:  addr.GetBool("canAccess"),
+					IsUp:       addr.GetBool("isUp"),
+					GroupValue: ipStrings,
+				})
+				if err != nil {
+					this.ErrorPage(err)
+					return
+				}
+				resultAddrIds = append(resultAddrIds, createResp.NodeIPAddressIds...)
 			}
-			addrId = createResp.NodeIPAddressId
 		}
 
 		// 阈值
@@ -202,13 +237,16 @@ func (this *CreateNodeAction) RunPost(params struct {
 				this.ErrorPage(err)
 				return
 			}
-			_, err = this.RPC().NodeIPAddressThresholdRPC().UpdateAllNodeIPAddressThresholds(this.AdminContext(), &pb.UpdateAllNodeIPAddressThresholdsRequest{
-				NodeIPAddressId:             addrId,
-				NodeIPAddressThresholdsJSON: thresholdsJSON,
-			})
-			if err != nil {
-				this.ErrorPage(err)
-				return
+
+			for _, addrId := range resultAddrIds {
+				_, err = this.RPC().NodeIPAddressThresholdRPC().UpdateAllNodeIPAddressThresholds(this.AdminContext(), &pb.UpdateAllNodeIPAddressThresholdsRequest{
+					NodeIPAddressId:             addrId,
+					NodeIPAddressThresholdsJSON: thresholdsJSON,
+				})
+				if err != nil {
+					this.ErrorPage(err)
+					return
+				}
 			}
 		}
 	}
@@ -224,11 +262,6 @@ func (this *CreateNodeAction) RunPost(params struct {
 		return
 	}
 	if nodeResp.Node != nil {
-		var addresses = []string{}
-		for _, addrMap := range ipAddresses {
-			addresses = append(addresses, addrMap.GetString("ip"))
-		}
-
 		var grantMap maps.Map = nil
 		grantId := params.GrantId
 		if grantId > 0 {
@@ -253,7 +286,7 @@ func (this *CreateNodeAction) RunPost(params struct {
 			"name":      nodeResp.Node.Name,
 			"uniqueId":  nodeResp.Node.UniqueId,
 			"secret":    nodeResp.Node.Secret,
-			"addresses": addresses,
+			"addresses": resultIPAddresses,
 			"login": maps.Map{
 				"id":   0,
 				"name": "SSH",

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

@@ -86,9 +86,16 @@ func (this *DetailAction) RunGet(params struct {
 			return
 		}
 
+		// 是否有备用IP
+		var originIP = addr.Ip
+		if len(addr.BackupIP) > 0 {
+			addr.Ip = addr.BackupIP
+		}
+
 		ipAddressMaps = append(ipAddressMaps, maps.Map{
 			"id":         addr.Id,
 			"name":       addr.Name,
+			"originIP":   originIP,
 			"ip":         addr.Ip,
 			"canAccess":  addr.CanAccess,
 			"isOn":       addr.IsOn,

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

@@ -8,6 +8,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
 )
 
 type IndexAction struct {
@@ -65,22 +66,32 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["timeZoneLocation"] = nodeconfigs.FindTimeZoneLocation(cluster.TimeZone)
 
 	this.Data["cluster"] = maps.Map{
-		"id":         cluster.Id,
-		"name":       cluster.Name,
-		"installDir": cluster.InstallDir,
-		"timeZone":   cluster.TimeZone,
+		"id":                    cluster.Id,
+		"name":                  cluster.Name,
+		"installDir":            cluster.InstallDir,
+		"timeZone":              cluster.TimeZone,
+		"nodeMaxThreads":        cluster.NodeMaxThreads,
+		"nodeTCPMaxConnections": cluster.NodeTCPMaxConnections,
 	}
 
+	// 默认值
+	this.Data["defaultNodeMaxThreads"] = nodeconfigs.DefaultMaxThreads
+	this.Data["defaultNodeMaxThreadsMin"] = nodeconfigs.DefaultMaxThreadsMin
+	this.Data["defaultNodeMaxThreadsMax"] = nodeconfigs.DefaultMaxThreadsMax
+	this.Data["defaultNodeTCPMaxConnections"] = nodeconfigs.DefaultTCPMaxConnections
+
 	this.Show()
 }
 
 // RunPost 保存设置
 func (this *IndexAction) RunPost(params struct {
-	ClusterId  int64
-	Name       string
-	GrantId    int64
-	InstallDir string
-	TimeZone   string
+	ClusterId             int64
+	Name                  string
+	GrantId               int64
+	InstallDir            string
+	TimeZone              string
+	NodeMaxThreads        int32
+	NodeTCPMaxConnections int32
 
 	Must *actions.Must
 }) {
@@ -91,12 +102,21 @@ func (this *IndexAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入集群名称")
 
+	if params.NodeMaxThreads > 0 {
+		params.Must.
+			Field("nodeMaxThreads", params.NodeMaxThreads).
+			Gte(int64(nodeconfigs.DefaultMaxThreadsMin), "单节点最大线程数最小值不能小于"+types.String(nodeconfigs.DefaultMaxThreadsMin)).
+			Lte(int64(nodeconfigs.DefaultMaxThreadsMax), "单节点最大线程数最大值不能大于"+types.String(nodeconfigs.DefaultMaxThreadsMax))
+	}
+
 	_, err := this.RPC().NodeClusterRPC().UpdateNodeCluster(this.AdminContext(), &pb.UpdateNodeClusterRequest{
-		NodeClusterId: params.ClusterId,
-		Name:          params.Name,
-		NodeGrantId:   params.GrantId,
-		InstallDir:    params.InstallDir,
-		TimeZone:      params.TimeZone,
+		NodeClusterId:         params.ClusterId,
+		Name:                  params.Name,
+		NodeGrantId:           params.GrantId,
+		InstallDir:            params.InstallDir,
+		TimeZone:              params.TimeZone,
+		NodeMaxThreads:        params.NodeMaxThreads,
+		NodeTCPMaxConnections: params.NodeTCPMaxConnections,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -30,6 +30,7 @@ func (this *CreateAction) RunPost(params struct {
 	PrivateKey  string
 	Passphrase  string
 	Description string
+	Su          bool
 
 	Must *actions.Must
 }) {
@@ -61,6 +62,7 @@ func (this *CreateAction) RunPost(params struct {
 		PrivateKey:  params.PrivateKey,
 		Passphrase:  params.Passphrase,
 		Description: params.Description,
+		Su:          params.Su,
 		NodeId:      0,
 	})
 	if err != nil {

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

@@ -31,6 +31,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	PrivateKey  string
 	Passphrase  string
 	Description string
+	Su          bool
 
 	Must *actions.Must
 }) {
@@ -62,6 +63,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		PrivateKey:  params.PrivateKey,
 		Passphrase:  params.Passphrase,
 		Description: params.Description,
+		Su:          params.Su,
 		NodeId:      0,
 	})
 	if err != nil {
@@ -74,6 +76,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		"name":       params.Name,
 		"method":     params.Method,
 		"methodName": grantutils.FindGrantMethodName(params.Method),
+		"username":   params.Username,
 	}
 
 	// 创建日志

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

@@ -60,6 +60,7 @@ func (this *UpdateAction) RunPost(params struct {
 	PrivateKey  string
 	Passphrase  string
 	Description string
+	Su          bool
 
 	Must *actions.Must
 }) {
@@ -97,6 +98,7 @@ func (this *UpdateAction) RunPost(params struct {
 		PrivateKey:  params.PrivateKey,
 		Passphrase:  params.Passphrase,
 		Description: params.Description,
+		Su:          params.Su,
 		NodeId:      0,
 	})
 	if err != nil {

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

@@ -44,6 +44,7 @@ func (this *UpdatePopupAction) RunGet(params struct {
 		"description": grant.Description,
 		"privateKey":  grant.PrivateKey,
 		"passphrase":  grant.Passphrase,
+		"su":          grant.Su,
 	}
 
 	this.Show()
@@ -59,6 +60,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	PrivateKey  string
 	Passphrase  string
 	Description string
+	Su          bool
 
 	Must *actions.Must
 }) {
@@ -96,6 +98,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		Passphrase:  params.Passphrase,
 		Description: params.Description,
 		NodeId:      params.NodeId,
+		Su:          params.Su,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -108,6 +111,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		"name":       params.Name,
 		"method":     params.Method,
 		"methodName": grantutils.FindGrantMethodName(params.Method),
+		"username":   params.Username,
 	}
 
 	this.Success()

internal/web/actions/default/clusters/tasks/check.go

@@ -10,7 +10,9 @@ type CheckAction struct {
 }
 
 func (this *CheckAction) RunPost(params struct{}) {
-	resp, err := this.RPC().NodeTaskRPC().ExistsNodeTasks(this.AdminContext(), &pb.ExistsNodeTasksRequest{})
+	resp, err := this.RPC().NodeTaskRPC().ExistsNodeTasks(this.AdminContext(), &pb.ExistsNodeTasksRequest{
+		ExcludeTypes: []string{"ipItemChanged"},
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return

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

@@ -3,6 +3,7 @@ package ipAddresses
 import (
 	"encoding/json"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/iwind/TeaGo/actions"
@@ -39,9 +40,15 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Field("ip", params.IP).
 		Require("请输入IP地址")
 
-	ip := net.ParseIP(params.IP)
-	if len(ip) == 0 {
-		this.FailField("ip", "请输入正确的IP")
+	result, err := utils.ExtractIP(params.IP)
+	if err != nil {
+		this.Fail("IP格式错误'" + params.IP + "'")
+	}
+
+	for _, ip := range result {
+		if len(net.ParseIP(ip)) == 0 {
+			this.FailField("ip", "请输入正确的IP")
+		}
 	}
 
 	// 阈值设置

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

@@ -2,6 +2,7 @@ package ipaddressutils
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -16,8 +17,11 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 		return err
 	}
 	for _, addr := range addresses {
+		var resultAddrIds = []int64{}
 		addrId := addr.GetInt64("id")
 		if addrId > 0 {
+			resultAddrIds = append(resultAddrIds, addrId)
+
 			var isOn = false
 			if !addr.Has("isOn") { // 兼容老版本
 				isOn = true
@@ -37,18 +41,40 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 				return err
 			}
 		} else {
-			createResp, err := parentAction.RPC().NodeIPAddressRPC().CreateNodeIPAddress(parentAction.AdminContext(), &pb.CreateNodeIPAddressRequest{
-				NodeId:    nodeId,
-				Role:      role,
-				Name:      addr.GetString("name"),
-				Ip:        addr.GetString("ip"),
-				CanAccess: addr.GetBool("canAccess"),
-				IsUp:      addr.GetBool("isUp"),
-			})
-			if err != nil {
-				return err
+			var ipStrings = addr.GetString("ip")
+			result, _ := utils.ExtractIP(ipStrings)
+
+			if len(result) == 1 {
+				// 单个创建
+				createResp, err := parentAction.RPC().NodeIPAddressRPC().CreateNodeIPAddress(parentAction.AdminContext(), &pb.CreateNodeIPAddressRequest{
+					NodeId:    nodeId,
+					Role:      role,
+					Name:      addr.GetString("name"),
+					Ip:        result[0],
+					CanAccess: addr.GetBool("canAccess"),
+					IsUp:      addr.GetBool("isUp"),
+				})
+				if err != nil {
+					return err
+				}
+				addrId = createResp.NodeIPAddressId
+				resultAddrIds = append(resultAddrIds, addrId)
+			} else if len(result) > 1 {
+				// 批量创建
+				createResp, err := parentAction.RPC().NodeIPAddressRPC().CreateNodeIPAddresses(parentAction.AdminContext(), &pb.CreateNodeIPAddressesRequest{
+					NodeId:     nodeId,
+					Role:       role,
+					Name:       addr.GetString("name"),
+					IpList:     result,
+					CanAccess:  addr.GetBool("canAccess"),
+					IsUp:       addr.GetBool("isUp"),
+					GroupValue: ipStrings,
+				})
+				if err != nil {
+					return err
+				}
+				resultAddrIds = append(resultAddrIds, createResp.NodeIPAddressIds...)
 			}
-			addrId = createResp.NodeIPAddressId
 		}
 
 		// 保存阈值
@@ -58,12 +84,25 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 			if err != nil {
 				return err
 			}
-			_, err = parentAction.RPC().NodeIPAddressThresholdRPC().UpdateAllNodeIPAddressThresholds(parentAction.AdminContext(), &pb.UpdateAllNodeIPAddressThresholdsRequest{
-				NodeIPAddressId:             addrId,
-				NodeIPAddressThresholdsJSON: thresholdsJSON,
-			})
-			if err != nil {
-				return err
+
+			for _, addrId := range resultAddrIds {
+				_, err = parentAction.RPC().NodeIPAddressThresholdRPC().UpdateAllNodeIPAddressThresholds(parentAction.AdminContext(), &pb.UpdateAllNodeIPAddressThresholdsRequest{
+					NodeIPAddressId:             addrId,
+					NodeIPAddressThresholdsJSON: thresholdsJSON,
+				})
+				if err != nil {
+					return err
+				}
+			}
+		} else {
+			for _, addrId := range resultAddrIds {
+				_, err = parentAction.RPC().NodeIPAddressThresholdRPC().UpdateAllNodeIPAddressThresholds(parentAction.AdminContext(), &pb.UpdateAllNodeIPAddressThresholdsRequest{
+					NodeIPAddressId:             addrId,
+					NodeIPAddressThresholdsJSON: []byte("[]"),
+				})
+				if err != nil {
+					return err
+				}
 			}
 		}
 	}

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

@@ -3,6 +3,7 @@ package ipAddresses
 import (
 	"encoding/json"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -57,9 +58,22 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		}
 	}
 
-	ip := net.ParseIP(params.IP)
-	if len(ip) == 0 {
-		this.Fail("请输入正确的IP")
+	if params.AddressId > 0 {
+		ip := net.ParseIP(params.IP)
+		if len(ip) == 0 {
+			this.Fail("请输入正确的IP")
+		}
+	} else {
+		result, err := utils.ExtractIP(params.IP)
+		if err != nil {
+			this.Fail("IP格式错误'" + params.IP + "'")
+		}
+
+		for _, ip := range result {
+			if len(net.ParseIP(ip)) == 0 {
+				this.FailField("ip", "请输入正确的IP")
+			}
+		}
 	}
 
 	var thresholds = []*nodeconfigs.IPAddressThresholdConfig{}

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

@@ -3,6 +3,7 @@ package cluster
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -87,14 +88,31 @@ func (this *CreateNodeAction) RunPost(params struct {
 				NodeId:          nodeId,
 			})
 		} else {
-			_, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
-				NodeId:    nodeId,
-				Role:      nodeconfigs.NodeRoleDNS,
-				Name:      addrMap.GetString("name"),
-				Ip:        addrMap.GetString("ip"),
-				CanAccess: addrMap.GetBool("canAccess"),
-				IsUp:      addrMap.GetBool("isUp"),
-			})
+			var ipStrings = addrMap.GetString("ip")
+			result, _ := utils.ExtractIP(ipStrings)
+
+			if len(result) == 1 {
+				// 单个创建
+				_, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
+					NodeId:    nodeId,
+					Role:      nodeconfigs.NodeRoleDNS,
+					Name:      addrMap.GetString("name"),
+					Ip:        result[0],
+					CanAccess: addrMap.GetBool("canAccess"),
+					IsUp:      addrMap.GetBool("isUp"),
+				})
+			} else if len(result) > 1 {
+				// 批量创建
+				_, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddresses(this.AdminContext(), &pb.CreateNodeIPAddressesRequest{
+					NodeId:     nodeId,
+					Role:       nodeconfigs.NodeRoleDNS,
+					Name:       addrMap.GetString("name"),
+					IpList:     result,
+					CanAccess:  addrMap.GetBool("canAccess"),
+					IsUp:       addrMap.GetBool("isUp"),
+					GroupValue: ipStrings,
+				})
+			}
 		}
 		if err != nil {
 			this.ErrorPage(err)

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

@@ -33,7 +33,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 	globalConfig := &serverconfigs.GlobalConfig{}
 
 	// 默认值
-	globalConfig.HTTPAll.DomainAuditingIsOn = true
+	globalConfig.HTTPAll.DomainAuditingIsOn = false
 
 	if len(valueJSON) > 0 {
 		err = json.Unmarshal(valueJSON, globalConfig)

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

@@ -30,6 +30,7 @@ func (this *CreateGroupPopupAction) RunPost(params struct {
 	Type             string
 
 	Name        string
+	Code        string
 	Description string
 	IsOn        bool
 
@@ -52,6 +53,7 @@ func (this *CreateGroupPopupAction) RunPost(params struct {
 	createResp, err := this.RPC().HTTPFirewallRuleGroupRPC().CreateHTTPFirewallRuleGroup(this.AdminContext(), &pb.CreateHTTPFirewallRuleGroupRequest{
 		IsOn:        params.IsOn,
 		Name:        params.Name,
+		Code:        params.Code,
 		Description: params.Description,
 	})
 	if err != nil {

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

@@ -73,6 +73,7 @@ func (this *CreateSetPopupAction) RunPost(params struct {
 	RulesJSON   []byte
 	Connector   string
 	ActionsJSON []byte
+	IgnoreLocal bool
 
 	Must *actions.Must
 }) {
@@ -124,6 +125,7 @@ func (this *CreateSetPopupAction) RunPost(params struct {
 		RuleRefs:    nil,
 		Rules:       rules,
 		Actions:     actionConfigs,
+		IgnoreLocal: params.IgnoreLocal,
 	}
 
 	setConfigJSON, err := json.Marshal(setConfig)

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

@@ -32,24 +32,36 @@ func (this *ExportAction) RunGet(params struct {
 		return
 	}
 
-	inboundGroups := []*firewallconfigs.HTTPFirewallRuleGroup{}
-	outboundGroups := []*firewallconfigs.HTTPFirewallRuleGroup{}
+	enabledInboundGroups := []*firewallconfigs.HTTPFirewallRuleGroup{}
+	enabledOutboundGroups := []*firewallconfigs.HTTPFirewallRuleGroup{}
+
+	disabledInboundGroups := []*firewallconfigs.HTTPFirewallRuleGroup{}
+	disabledOutboundGroups := []*firewallconfigs.HTTPFirewallRuleGroup{}
+
 	if policy.Inbound != nil {
 		for _, g := range policy.Inbound.Groups {
 			if g.IsOn {
-				inboundGroups = append(inboundGroups, g)
+				enabledInboundGroups = append(enabledInboundGroups, g)
+			} else {
+				disabledInboundGroups = append(disabledInboundGroups, g)
 			}
 		}
 	}
 	if policy.Outbound != nil {
 		for _, g := range policy.Outbound.Groups {
 			if g.IsOn {
-				outboundGroups = append(outboundGroups, g)
+				enabledOutboundGroups = append(enabledOutboundGroups, g)
+			} else {
+				disabledOutboundGroups = append(disabledOutboundGroups, g)
 			}
 		}
 	}
-	this.Data["inboundGroups"] = inboundGroups
-	this.Data["outboundGroups"] = outboundGroups
+
+	this.Data["enabledInboundGroups"] = enabledInboundGroups
+	this.Data["enabledOutboundGroups"] = enabledOutboundGroups
+
+	this.Data["disabledInboundGroups"] = disabledInboundGroups
+	this.Data["disabledOutboundGroups"] = disabledOutboundGroups
 
 	this.Show()
 }
@@ -116,5 +128,6 @@ func (this *ExportAction) RunPost(params struct {
 	ttlcache.DefaultCache.Write(key, configJSON, time.Now().Unix()+600)
 
 	this.Data["key"] = key
+	this.Data["id"] = params.FirewallPolicyId
 	this.Success()
 }

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

@@ -3,6 +3,7 @@ package waf
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/ttlcache"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/types"
 	"strconv"
 )
 
@@ -15,7 +16,8 @@ func (this *ExportDownloadAction) Init() {
 }
 
 func (this *ExportDownloadAction) RunGet(params struct {
-	Key string
+	Key      string
+	PolicyId int64
 }) {
 	item := ttlcache.DefaultCache.Read(params.Key)
 	if item == nil || item.Value == nil {
@@ -27,7 +29,7 @@ func (this *ExportDownloadAction) RunGet(params struct {
 
 	data, ok := item.Value.([]byte)
 	if ok {
-		this.AddHeader("Content-Disposition", "attachment; filename=\"WAF.json\";")
+		this.AddHeader("Content-Disposition", "attachment; filename=\"WAF-"+types.String(params.PolicyId)+".json\";")
 		this.AddHeader("Content-Length", strconv.Itoa(len(data)))
 		this.Write(data)
 	} else {

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

@@ -43,7 +43,8 @@ func (this *GroupsAction) RunGet(params struct {
 					"isOn":        g.IsOn,
 					"description": g.Description,
 					"countSets":   len(g.Sets),
-					"canDelete":   len(g.Code) == 0,
+					"isTemplate":  g.IsTemplate,
+					"canDelete":   !g.IsTemplate,
 				})
 			}
 		}
@@ -60,7 +61,8 @@ func (this *GroupsAction) RunGet(params struct {
 					"isOn":        g.IsOn,
 					"description": g.Description,
 					"countSets":   len(g.Sets),
-					"canDelete":   len(g.Code) == 0,
+					"isTemplate":  g.IsTemplate,
+					"canDelete":   !g.IsTemplate,
 				})
 			}
 		}

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

@@ -41,6 +41,7 @@ func init() {
 			GetPost("/updateSetPopup", new(UpdateSetPopupAction)).
 			Post("/count", new(CountAction)).
 			Get("/selectPopup", new(SelectPopupAction)).
+			Post("/testRegexp", new(TestRegexpAction)).
 
 			// IP管理
 			GetPost("/ipadmin", new(ipadmin.IndexAction)).

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

@@ -0,0 +1,48 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package waf
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/iwind/TeaGo/maps"
+	"regexp"
+	"strings"
+)
+
+type TestRegexpAction struct {
+	actionutils.ParentAction
+}
+
+func (this *TestRegexpAction) RunPost(params struct {
+	Regexp            string
+	IsCaseInsensitive bool
+	Body              string
+}) {
+	var exp = params.Regexp
+	if params.IsCaseInsensitive && !strings.HasPrefix(params.Regexp, "(?i)") {
+		exp = "(?i)" + exp
+	}
+	reg, err := regexp.Compile(exp)
+	if err != nil {
+		this.Data["result"] = maps.Map{
+			"isOk":    false,
+			"message": "解析正则出错：" + err.Error(),
+		}
+		this.Success()
+	}
+
+	if reg.MatchString(params.Body) {
+		this.Data["result"] = maps.Map{
+			"isOk":    true,
+			"message": "匹配成功",
+		}
+		this.Success()
+	}
+
+	this.Data["result"] = maps.Map{
+		"isOk":    false,
+		"message": "匹配失败",
+	}
+
+	this.Success()
+}

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

@@ -35,6 +35,7 @@ func (this *UpdateGroupPopupAction) RunGet(params struct {
 		"name":        groupConfig.Name,
 		"description": groupConfig.Description,
 		"isOn":        groupConfig.IsOn,
+		"code":        groupConfig.Code,
 	}
 
 	this.Show()
@@ -43,6 +44,7 @@ func (this *UpdateGroupPopupAction) RunGet(params struct {
 func (this *UpdateGroupPopupAction) RunPost(params struct {
 	GroupId     int64
 	Name        string
+	Code        string
 	Description string
 	IsOn        bool
 
@@ -59,6 +61,7 @@ func (this *UpdateGroupPopupAction) RunPost(params struct {
 		FirewallRuleGroupId: params.GroupId,
 		IsOn:                params.IsOn,
 		Name:                params.Name,
+		Code:                params.Code,
 		Description:         params.Description,
 	})
 	if err != nil {

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

@@ -97,6 +97,7 @@ func (this *UpdateSetPopupAction) RunPost(params struct {
 	RulesJSON   []byte
 	Connector   string
 	ActionsJSON []byte
+	IgnoreLocal bool
 
 	Must *actions.Must
 }) {
@@ -144,6 +145,7 @@ func (this *UpdateSetPopupAction) RunPost(params struct {
 	setConfig.Connector = params.Connector
 	setConfig.Rules = rules
 	setConfig.Actions = actionConfigs
+	setConfig.IgnoreLocal = params.IgnoreLocal
 
 	setConfigJSON, err := json.Marshal(setConfig)
 	if err != nil {

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

@@ -89,6 +89,7 @@ func (this *CreateAction) RunPost(params struct {
 	CacheIsOn      bool
 	WafIsOn        bool
 	RemoteAddrIsOn bool
+	StatIsOn       bool
 
 	WebRoot string
 
@@ -364,7 +365,7 @@ func (this *CreateAction) RunPost(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		webId = webResp.WebId
+		webId = webResp.HttpWebId
 	}
 
 	// 包含条件
@@ -462,11 +463,11 @@ func (this *CreateAction) RunPost(params struct {
 			// 访问日志
 			if params.AccessLogIsOn {
 				_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebAccessLog(this.AdminContext(), &pb.UpdateHTTPWebAccessLogRequest{
-					WebId: webConfig.Id,
+					HttpWebId: webConfig.Id,
 					AccessLogJSON: []byte(`{
 			"isPrior": false,
 			"isOn": true,
-			"fields": [],
+			"fields": [1, 2, 6, 7],
 			"status1": true,
 			"status2": true,
 			"status3": true,
@@ -501,7 +502,7 @@ func (this *CreateAction) RunPost(params struct {
 				} else {
 					websocketId := createWebSocketResp.WebsocketId
 					_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebsocket(this.AdminContext(), &pb.UpdateHTTPWebWebsocketRequest{
-						WebId: webConfig.Id,
+						HttpWebId: webConfig.Id,
 						WebsocketJSON: []byte(` {
 				"isPrior": false,
 				"isOn": true,
@@ -530,7 +531,7 @@ func (this *CreateAction) RunPost(params struct {
 					return
 				}
 				_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCache(this.AdminContext(), &pb.UpdateHTTPWebCacheRequest{
-					WebId:     webConfig.Id,
+					HttpWebId: webConfig.Id,
 					CacheJSON: cacheConfigJSON,
 				})
 				if err != nil {
@@ -552,7 +553,7 @@ func (this *CreateAction) RunPost(params struct {
 					return
 				}
 				_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebFirewall(this.AdminContext(), &pb.UpdateHTTPWebFirewallRequest{
-					WebId:        webConfig.Id,
+					HttpWebId:    webConfig.Id,
 					FirewallJSON: firewallRefJSON,
 				})
 				if err != nil {
@@ -575,13 +576,34 @@ func (this *CreateAction) RunPost(params struct {
 				return
 			}
 			_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRemoteAddr(this.AdminContext(), &pb.UpdateHTTPWebRemoteAddrRequest{
-				WebId:          webConfig.Id,
+				HttpWebId:      webConfig.Id,
 				RemoteAddrJSON: remoteAddrConfigJSON,
 			})
 			if err != nil {
 				this.ErrorPage(err)
 				return
 			}
+
+			// 统计
+			if params.StatIsOn {
+				var statConfig = &serverconfigs.HTTPStatRef{
+					IsPrior: false,
+					IsOn:    true,
+				}
+				statJSON, err := json.Marshal(statConfig)
+				if err != nil {
+					this.ErrorPage(err)
+					return
+				}
+				_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebStat(this.AdminContext(), &pb.UpdateHTTPWebStatRequest{
+					HttpWebId: webConfig.Id,
+					StatJSON:  statJSON,
+				})
+				if err != nil {
+					this.ErrorPage(err)
+					return
+				}
+			}
 		}
 	}
 

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

@@ -12,9 +12,9 @@ type FixLogAction struct {
 }
 
 func (this *FixLogAction) RunPost(params struct {
-	LogId int64
+	LogIds []int64
 }) {
-	_, err := this.RPC().NodeLogRPC().FixNodeLog(this.AdminContext(), &pb.FixNodeLogRequest{NodeLogId: params.LogId})
+	_, err := this.RPC().NodeLogRPC().FixNodeLogs(this.AdminContext(), &pb.FixNodeLogsRequest{NodeLogIds: params.LogIds})
 	if err != nil {
 		this.ErrorPage(err)
 		return

internal/web/actions/default/servers/groups/group/servergrouputils/utils.go

@@ -144,6 +144,15 @@ func InitGroup(parent *actionutils.ParentAction, groupId int64, menuItem string)
 			"isActive": menuItem == "remoteAddr",
 			"isOn":     configInfoResp.HasRemoteAddrConfig,
 		})
+
+		if teaconst.IsPlus {
+			leftMenuItems = append(leftMenuItems, maps.Map{
+				"name":     "请求限制",
+				"url":      urlPrefix + "/requestLimit?groupId=" + types.String(groupId),
+				"isActive": menuItem == "requestLimit",
+				"isOn":     configInfoResp.HasRequestLimitConfig,
+			})
+		}
 		parent.Data["leftMenuItems"] = leftMenuItems
 	}
 

internal/web/actions/default/servers/groups/group/settings/accessLog/index.go

@@ -56,7 +56,7 @@ func (this *IndexAction) RunPost(params struct {
 	// TODO 检查参数
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebAccessLog(this.AdminContext(), &pb.UpdateHTTPWebAccessLogRequest{
-		WebId:         params.WebId,
+		HttpWebId:     params.WebId,
 		AccessLogJSON: params.AccessLogJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/groups/group/settings/cache/index.go

@@ -76,7 +76,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCache(this.AdminContext(), &pb.UpdateHTTPWebCacheRequest{
-		WebId:     params.WebId,
+		HttpWebId: params.WebId,
 		CacheJSON: cacheJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/groups/group/settings/charset/index.go

@@ -52,7 +52,7 @@ func (this *IndexAction) RunPost(params struct {
 	defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的字符集设置", params.WebId)
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCharset(this.AdminContext(), &pb.UpdateHTTPWebCharsetRequest{
-		WebId:       params.WebId,
+		HttpWebId:   params.WebId,
 		CharsetJSON: params.CharsetJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/groups/group/settings/compression/index.go

@@ -66,7 +66,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCompression(this.AdminContext(), &pb.UpdateHTTPWebCompressionRequest{
-		WebId:           params.WebId,
+		HttpWebId:       params.WebId,
 		CompressionJSON: params.CompressionJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/groups/group/settings/headers/index.go

@@ -55,7 +55,7 @@ func (this *IndexAction) RunGet(params struct {
 			return
 		}
 		_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRequestHeader(this.AdminContext(), &pb.UpdateHTTPWebRequestHeaderRequest{
-			WebId:      webId,
+			HttpWebId:  webId,
 			HeaderJSON: refJSON,
 		})
 		if err != nil {
@@ -82,7 +82,7 @@ func (this *IndexAction) RunGet(params struct {
 			return
 		}
 		_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebResponseHeader(this.AdminContext(), &pb.UpdateHTTPWebResponseHeaderRequest{
-			WebId:      webId,
+			HttpWebId:  webId,
 			HeaderJSON: refJSON,
 		})
 		if err != nil {
@@ -129,7 +129,7 @@ func (this *IndexAction) RunPost(params struct {
 		}
 
 		_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRequestHeader(this.AdminContext(), &pb.UpdateHTTPWebRequestHeaderRequest{
-			WebId:      params.WebId,
+			HttpWebId:  params.WebId,
 			HeaderJSON: params.RequestHeaderJSON,
 		})
 		if err != nil {
@@ -145,7 +145,7 @@ func (this *IndexAction) RunPost(params struct {
 		}
 
 		_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebResponseHeader(this.AdminContext(), &pb.UpdateHTTPWebResponseHeaderRequest{
-			WebId:      params.WebId,
+			HttpWebId:  params.WebId,
 			HeaderJSON: params.ResponseHeaderJSON,
 		})
 		if err != nil {

internal/web/actions/default/servers/groups/group/settings/pages/index.go

@@ -52,7 +52,7 @@ func (this *IndexAction) RunPost(params struct {
 	// TODO 检查配置
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebPages(this.AdminContext(), &pb.UpdateHTTPWebPagesRequest{
-		WebId:     params.WebId,
+		HttpWebId: params.WebId,
 		PagesJSON: []byte(params.PagesJSON),
 	})
 	if err != nil {
@@ -61,7 +61,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebShutdown(this.AdminContext(), &pb.UpdateHTTPWebShutdownRequest{
-		WebId:        params.WebId,
+		HttpWebId:    params.WebId,
 		ShutdownJSON: []byte(params.ShutdownJSON),
 	})
 	if err != nil {

internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go

@@ -56,7 +56,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRemoteAddr(this.AdminContext(), &pb.UpdateHTTPWebRemoteAddrRequest{
-		WebId:          params.WebId,
+		HttpWebId:      params.WebId,
 		RemoteAddrJSON: params.RemoteAddrJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/groups/group/settings/requestLimit/index.go

@@ -0,0 +1,62 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package requestlimit
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/servergrouputils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "index")
+	this.SecondMenu("requestLimit")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	GroupId int64
+}) {
+	_, err := servergrouputils.InitGroup(this.Parent(), params.GroupId, "requestLimit")
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerGroupId(this.AdminContext(), params.GroupId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["webId"] = webConfig.Id
+	this.Data["requestLimitConfig"] = webConfig.RequestLimit
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	WebId            int64
+	RequestLimitJSON []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改Web %d 请求限制", params.WebId)
+
+	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebRequestLimit(this.AdminContext(), &pb.UpdateHTTPWebRequestLimitRequest{
+		HttpWebId:        params.WebId,
+		RequestLimitJSON: params.RequestLimitJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/groups/group/settings/requestLimit/init.go

@@ -0,0 +1,19 @@
+package requestlimit
+
+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", "group").
+			Prefix("/servers/groups/group/settings/requestLimit").
+			GetPost("", new(IndexAction)).
+			EndAll()
+	})
+}

internal/web/actions/default/servers/groups/group/settings/stat/index.go

@@ -49,8 +49,8 @@ func (this *IndexAction) RunPost(params struct {
 	// TODO 校验配置
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebStat(this.AdminContext(), &pb.UpdateHTTPWebStatRequest{
-		WebId:    params.WebId,
-		StatJSON: params.StatJSON,
+		HttpWebId: params.WebId,
+		StatJSON:  params.StatJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/groups/group/settings/waf/index.go

@@ -64,7 +64,7 @@ func (this *IndexAction) RunPost(params struct {
 	// TODO 检查配置
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebFirewall(this.AdminContext(), &pb.UpdateHTTPWebFirewallRequest{
-		WebId:        params.WebId,
+		HttpWebId:    params.WebId,
 		FirewallJSON: params.FirewallJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/groups/group/settings/web/index.go

@@ -47,8 +47,8 @@ func (this *IndexAction) RunPost(params struct {
 	defer this.CreateLogInfo("修改Web %d 的首页文件名", params.WebId)
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWeb(this.AdminContext(), &pb.UpdateHTTPWebRequest{
-		WebId:    params.WebId,
-		RootJSON: params.RootJSON,
+		HttpWebId: params.WebId,
+		RootJSON:  params.RootJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/groups/group/settings/webp/index.go

@@ -56,8 +56,8 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebP(this.AdminContext(), &pb.UpdateHTTPWebWebPRequest{
-		WebId:    params.WebId,
-		WebpJSON: params.WebpJSON,
+		HttpWebId: params.WebId,
+		WebpJSON:  params.WebpJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/groups/group/settings/websocket/index.go

@@ -110,7 +110,7 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebsocket(this.AdminContext(), &pb.UpdateHTTPWebWebsocketRequest{
-		WebId:         params.WebId,
+		HttpWebId:     params.WebId,
 		WebsocketJSON: websocketRefJSON,
 	})
 	if err != nil {

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

@@ -199,6 +199,12 @@ func (this *IndexAction) RunGet(params struct {
 			}
 		}
 
+		// 提交审核时间
+		var auditingTime = ""
+		if server.AuditingAt > 0 {
+			auditingTime = timeutil.FormatTime("Y-m-d", server.AuditingAt)
+		}
+
 		serverMaps = append(serverMaps, maps.Map{
 			"id":   server.Id,
 			"isOn": server.IsOn,
@@ -215,6 +221,7 @@ func (this *IndexAction) RunGet(params struct {
 			"isAuditing":       server.IsAuditing,
 			"auditingIsOk":     auditingIsOk,
 			"user":             userMap,
+			"auditingTime":     auditingTime,
 		})
 	}
 	this.Data["servers"] = serverMaps
@@ -258,7 +265,7 @@ func (this *IndexAction) RunGet(params struct {
 		NodeId:     0,
 		Role:       nodeconfigs.NodeRoleNode,
 		Offset:     0,
-		Size:       10,
+		Size:       20,
 		Level:      "",
 		FixedState: int32(configutils.BoolStateNo),
 		AllServers: true,
@@ -279,7 +286,7 @@ func (this *IndexAction) RunGet(params struct {
 		var server = serverResp.Server
 		if server == nil {
 			// 设置为已修复
-			_, err = this.RPC().NodeLogRPC().FixNodeLog(this.AdminContext(), &pb.FixNodeLogRequest{NodeLogId: errorLog.Id})
+			_, err = this.RPC().NodeLogRPC().FixNodeLogs(this.AdminContext(), &pb.FixNodeLogsRequest{NodeLogIds: []int64{errorLog.Id}})
 			if err != nil {
 				this.ErrorPage(err)
 				return
@@ -297,7 +304,7 @@ func (this *IndexAction) RunGet(params struct {
 		var node = nodeResp.Node
 		if node == nil || node.NodeCluster == nil {
 			// 设置为已修复
-			_, err = this.RPC().NodeLogRPC().FixNodeLog(this.AdminContext(), &pb.FixNodeLogRequest{NodeLogId: errorLog.Id})
+			_, err = this.RPC().NodeLogRPC().FixNodeLogs(this.AdminContext(), &pb.FixNodeLogsRequest{NodeLogIds: []int64{errorLog.Id}})
 			if err != nil {
 				this.ErrorPage(err)
 				return

internal/web/actions/default/servers/ipbox/addIP.go

@@ -14,19 +14,30 @@ type AddIPAction struct {
 }
 
 func (this *AddIPAction) RunPost(params struct {
-	ListId int64
-	Ip     string
+	ListId    int64
+	Ip        string
+	ExpiredAt int64
 }) {
+	var itemId int64 = 0
+
+	defer func() {
+		this.CreateLogInfo("在名单 %d 中创建IP %d", params.ListId, itemId)
+	}()
+
 	var ipType = "ipv4"
 	if strings.Contains(params.Ip, ":") {
 		ipType = "ipv6"
 	}
 
-	_, err := this.RPC().IPItemRPC().CreateIPItem(this.AdminContext(), &pb.CreateIPItemRequest{
+	if params.ExpiredAt <= 0 {
+		params.ExpiredAt = time.Now().Unix() + 86400
+	}
+
+	createResp, err := this.RPC().IPItemRPC().CreateIPItem(this.AdminContext(), &pb.CreateIPItemRequest{
 		IpListId:   params.ListId,
 		IpFrom:     params.Ip,
 		IpTo:       "",
-		ExpiredAt:  time.Now().Unix() + 86400, // TODO 可以自定义时间
+		ExpiredAt:  params.ExpiredAt,
 		Reason:     "从IPBox中加入名单",
 		Type:       ipType,
 		EventLevel: "critical",
@@ -36,5 +47,7 @@ func (this *AddIPAction) RunPost(params struct {
 		return
 	}
 
+	itemId = createResp.IpItemId
+
 	this.Success()
 }

internal/web/actions/default/servers/ipbox/deleteFromList.go

@@ -0,0 +1,27 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package ipbox
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type DeleteFromListAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteFromListAction) RunPost(params struct {
+	ListId int64
+	ItemId int64
+}) {
+	defer this.CreateLogInfo("从IP名单 %d 中删除IP %d", params.ListId, params.ItemId)
+
+	_, err := this.RPC().IPItemRPC().DeleteIPItem(this.AdminContext(), &pb.DeleteIPItemRequest{IpItemId: params.ItemId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -37,17 +37,44 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["isp"] = regionResp.IpRegion.Isp
 
 	// IP列表
-	ipListResp, err := this.RPC().IPListRPC().FindEnabledIPListContainsIP(this.AdminContext(), &pb.FindEnabledIPListContainsIPRequest{Ip: params.Ip})
+	ipListResp, err := this.RPC().IPListRPC().FindEnabledIPListContainsIP(this.AdminContext(), &pb.FindEnabledIPListContainsIPRequest{
+		Ip: params.Ip,
+	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	var ipListMaps = []maps.Map{}
 	for _, ipList := range ipListResp.IpLists {
+		itemsResp, err := this.RPC().IPItemRPC().ListIPItemsWithListId(this.AdminContext(), &pb.ListIPItemsWithListIdRequest{
+			IpListId: ipList.Id,
+			Keyword:  "",
+			IpFrom:   params.Ip,
+			IpTo:     "",
+			Offset:   0,
+			Size:     1,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		var items = itemsResp.IpItems
+		if len(items) == 0 {
+			continue
+		}
+		var item = items[0]
+
+		var expiredTime = ""
+		if item.ExpiredAt > 0 {
+			expiredTime = timeutil.FormatTime("Y-m-d H:i:s", item.ExpiredAt)
+		}
+
 		ipListMaps = append(ipListMaps, maps.Map{
-			"id":   ipList.Id,
-			"name": ipList.Name,
-			"type": ipList.Type,
+			"id":              ipList.Id,
+			"name":            ipList.Name,
+			"type":            ipList.Type,
+			"itemExpiredTime": expiredTime,
+			"itemId":          item.Id,
 		})
 	}
 	this.Data["ipLists"] = ipListMaps
@@ -58,7 +85,7 @@ func (this *IndexAction) RunGet(params struct {
 		IsPublic: true,
 		Keyword:  "",
 		Offset:   0,
-		Size:     10, // TODO 将来考虑到支持更多的黑名单
+		Size:     20, // TODO 将来考虑到支持更多的黑名单
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -15,6 +15,7 @@ func init() {
 			Prefix("/servers/ipbox").
 			Get("", new(IndexAction)).
 			Post("/addIP", new(AddIPAction)).
+			Post("/deleteFromList", new(DeleteFromListAction)).
 			EndAll()
 	})
 }

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

@@ -3,12 +3,14 @@
 package logs
 
 import (
+	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/lists"
 	timeutil "github.com/iwind/TeaGo/utils/time"
 	"regexp"
 	"strings"
+	"time"
 )
 
 type IndexAction struct {
@@ -29,6 +31,8 @@ func (this *IndexAction) RunGet(params struct {
 
 	RequestId string
 	ServerId  int64
+
+	PageSize int64
 }) {
 	if len(params.Day) == 0 {
 		params.Day = timeutil.Format("Y-m-d")
@@ -43,16 +47,23 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["accessLogs"] = []interface{}{}
 	this.Data["hasError"] = params.HasError
 	this.Data["hasWAF"] = params.HasWAF
+	this.Data["pageSize"] = params.PageSize
+	this.Data["isSlowQuery"] = false
+	this.Data["slowQueryCost"] = ""
 
 	day := params.Day
 	ipList := []string{}
 
 	if len(day) > 0 && regexp.MustCompile(`\d{4}-\d{2}-\d{2}`).MatchString(day) {
 		day = strings.ReplaceAll(day, "-", "")
-		size := int64(10)
+		size := params.PageSize
+		if size < 1 {
+			size = 20
+		}
 
 		this.Data["hasError"] = params.HasError
 
+		var before = time.Now()
 		resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
 			RequestId:         params.RequestId,
 			ServerId:          params.ServerId,
@@ -69,6 +80,12 @@ func (this *IndexAction) RunGet(params struct {
 			return
 		}
 
+		var cost = time.Since(before).Seconds()
+		if cost > 5 {
+			this.Data["slowQueryCost"] = fmt.Sprintf("%.2f", cost)
+			this.Data["isSlowQuery"] = true
+		}
+
 		if len(resp.HttpAccessLogs) == 0 {
 			this.Data["accessLogs"] = []interface{}{}
 		} else {

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

@@ -16,6 +16,7 @@ func init() {
 			Data("teaSubMenu", "log").
 			Prefix("/servers/logs").
 			Get("", new(IndexAction)).
+			GetPost("/settings", new(SettingsAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/servers/logs/settings.go

@@ -0,0 +1,94 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package logs
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
+	"github.com/iwind/TeaGo/actions"
+)
+
+type SettingsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SettingsAction) Init() {
+	this.Nav("", "", "settings")
+}
+
+func (this *SettingsAction) RunGet(params struct{}) {
+	settingsResp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: systemconfigs.SettingCodeAccessLogQueue})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	var config = &serverconfigs.AccessLogQueueConfig{
+		MaxLength:      0,
+		CountPerSecond: 0,
+		Percent:        100,
+	}
+	if len(settingsResp.ValueJSON) > 0 {
+		err = json.Unmarshal(settingsResp.ValueJSON, config)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	} else {
+		configJSON, err := json.Marshal(config)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		_, err = this.RPC().SysSettingRPC().UpdateSysSetting(this.AdminContext(), &pb.UpdateSysSettingRequest{
+			Code:      systemconfigs.SettingCodeAccessLogQueue,
+			ValueJSON: configJSON,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	this.Data["config"] = config
+
+	this.Show()
+}
+
+func (this *SettingsAction) RunPost(params struct {
+	Percent        int
+	CountPerSecond int
+	MaxLength      int
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	params.Must.
+		Field("percent", params.Percent).
+		Gte(0, "请输入大于0的整数").
+		Lte(100, "请输入小于100的整数")
+
+	var config = &serverconfigs.AccessLogQueueConfig{
+		MaxLength:      params.MaxLength,
+		CountPerSecond: params.CountPerSecond,
+		Percent:        params.Percent,
+	}
+	configJSON, err := json.Marshal(config)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	_, err = this.RPC().SysSettingRPC().UpdateSysSetting(this.AdminContext(), &pb.UpdateSysSettingRequest{
+		Code:      systemconfigs.SettingCodeAccessLogQueue,
+		ValueJSON: configJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -1,7 +1,9 @@
 package boards
 
 import (
+	"fmt"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
@@ -120,6 +122,22 @@ func (this *IndexAction) RunPost(params struct {
 		this.Data["topDomainStats"] = statMaps
 	}
 
+	// 地区排行
+	{
+		var countryMaps = []maps.Map{}
+		for _, stat := range resp.TopCountryStats {
+			countryMaps = append(countryMaps, maps.Map{
+				"name":                stat.CountryName,
+				"bytes":               stat.Bytes,
+				"formattedBytes":      numberutils.FormatBytes(stat.Bytes),
+				"countRequests":       stat.CountRequests,
+				"countAttackRequests": stat.CountAttackRequests,
+				"percent":             fmt.Sprintf("%.2f", stat.Percent),
+			})
+		}
+		this.Data["topCountryStats"] = countryMaps
+	}
+
 	// 指标
 	{
 		var chartMaps = []maps.Map{}
@@ -157,5 +175,6 @@ func (this *IndexAction) RunPost(params struct {
 		}
 		this.Data["metricCharts"] = chartMaps
 	}
+
 	this.Success()
 }

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

@@ -28,6 +28,8 @@ func (this *HistoryAction) RunGet(params struct {
 
 	RequestId string
 	HasError  int
+
+	PageSize int
 }) {
 	if len(params.Day) == 0 {
 		params.Day = timeutil.Format("Y-m-d")
@@ -41,13 +43,17 @@ func (this *HistoryAction) RunGet(params struct {
 	this.Data["accessLogs"] = []interface{}{}
 	this.Data["hasError"] = params.HasError
 	this.Data["hasWAF"] = params.HasWAF
+	this.Data["pageSize"] = params.PageSize
 
 	day := params.Day
 	ipList := []string{}
 
 	if len(day) > 0 && regexp.MustCompile(`\d{4}-\d{2}-\d{2}`).MatchString(day) {
 		day = strings.ReplaceAll(day, "-", "")
-		size := int64(10)
+		size := int64(params.PageSize)
+		if size < 1 {
+			size = 20
+		}
 
 		this.Data["hasError"] = params.HasError
 

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

@@ -24,8 +24,15 @@ func (this *TodayAction) RunGet(params struct {
 	Keyword   string
 	Ip        string
 	Domain    string
+
+	PageSize int
 }) {
-	size := int64(10)
+	this.Data["pageSize"] = params.PageSize
+
+	size := int64(params.PageSize)
+	if size < 1 {
+		size = 20
+	}
 
 	this.Data["path"] = this.Request.URL.Path
 	this.Data["hasError"] = params.HasError

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

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 	"net/http"
+	"strings"
 )
 
 type ViewPopupAction struct {
@@ -98,5 +99,19 @@ func (this *ViewPopupAction) RunGet(params struct {
 	}
 	this.Data["region"] = regionMap
 
+	// 请求内容
+	this.Data["requestBody"] = string(accessLog.RequestBody)
+	this.Data["requestContentType"] = "text/plain"
+
+	requestContentType, ok := accessLog.Header["Content-Type"]
+	if ok {
+		if len(requestContentType.Values) > 0 {
+			var contentType = requestContentType.Values[0]
+			if strings.HasSuffix(contentType, "/json") || strings.Contains(contentType, "/json;") {
+				this.Data["requestContentType"] = "application/json"
+			}
+		}
+	}
+
 	this.Show()
 }

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

@@ -64,8 +64,8 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebAuth(this.AdminContext(), &pb.UpdateHTTPWebAuthRequest{
-		WebId:    params.WebId,
-		AuthJSON: configJSON,
+		HttpWebId: params.WebId,
+		AuthJSON:  configJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -61,7 +61,7 @@ func (this *IndexAction) RunPost(params struct {
 	// TODO 检查参数
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebAccessLog(this.AdminContext(), &pb.UpdateHTTPWebAccessLogRequest{
-		WebId:         params.WebId,
+		HttpWebId:     params.WebId,
 		AccessLogJSON: params.AccessLogJSON,
 	})
 	if err != nil {

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

@@ -97,7 +97,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCache(this.AdminContext(), &pb.UpdateHTTPWebCacheRequest{
-		WebId:     params.WebId,
+		HttpWebId: params.WebId,
 		CacheJSON: cacheJSON,
 	})
 	if err != nil {

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

@@ -57,7 +57,7 @@ func (this *IndexAction) RunPost(params struct {
 	defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的字符集设置", params.WebId)
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCharset(this.AdminContext(), &pb.UpdateHTTPWebCharsetRequest{
-		WebId:       params.WebId,
+		HttpWebId:   params.WebId,
 		CharsetJSON: params.CharsetJSON,
 	})
 	if err != nil {

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

@@ -0,0 +1,61 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package common
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "index")
+	this.SecondMenu("common")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ServerId int64
+}) {
+	this.Data["hasGroupConfig"] = false
+
+	webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["webId"] = webConfig.Id
+
+	this.Data["commonConfig"] = maps.Map{
+		"mergeSlashes": webConfig.MergeSlashes,
+	}
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	WebId        int64
+	MergeSlashes bool
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改服务Web %d 设置的其他设置", params.WebId)
+
+	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCommon(this.AdminContext(), &pb.UpdateHTTPWebCommonRequest{
+		HttpWebId:    params.WebId,
+		MergeSlashes: params.MergeSlashes,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/server/settings/common/init.go

@@ -0,0 +1,19 @@
+package common
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
+	"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)).
+			Helper(serverutils.NewServerHelper()).
+			Prefix("/servers/server/settings/common").
+			GetPost("", new(IndexAction)).
+			EndAll()
+	})
+}

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

@@ -71,7 +71,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCompression(this.AdminContext(), &pb.UpdateHTTPWebCompressionRequest{
-		WebId:           params.WebId,
+		HttpWebId:       params.WebId,
 		CompressionJSON: params.CompressionJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/conds/condutils/utils.go

@@ -10,12 +10,13 @@ import (
 )
 
 type CondJSComponent struct {
-	Type        string `json:"type"`
-	Name        string `json:"name"`
-	Description string `json:"description"`
-	Component   string `json:"component"`
-	ParamsTitle string `json:"paramsTitle"`
-	IsRequest   bool   `json:"isRequest"`
+	Type            string `json:"type"`
+	Name            string `json:"name"`
+	Description     string `json:"description"`
+	Component       string `json:"component"`
+	ParamsTitle     string `json:"paramsTitle"`
+	IsRequest       bool   `json:"isRequest"`
+	CaseInsensitive bool   `json:"caseInsensitive"`
 }
 
 // ReadAllAvailableCondTypes 读取所有可用的条件

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

@@ -58,7 +58,7 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebFastcgi(this.AdminContext(), &pb.UpdateHTTPWebFastcgiRequest{
-		WebId:       params.WebId,
+		HttpWebId:   params.WebId,
 		FastcgiJSON: fastcgiRefJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/headers/createSetPopup.go

@@ -19,8 +19,10 @@ func (this *CreateSetPopupAction) Init() {
 
 func (this *CreateSetPopupAction) RunGet(params struct {
 	HeaderPolicyId int64
+	Type           string
 }) {
 	this.Data["headerPolicyId"] = params.HeaderPolicyId
+	this.Data["type"] = params.Type
 
 	this.Show()
 }
@@ -30,6 +32,14 @@ func (this *CreateSetPopupAction) RunPost(params struct {
 	Name           string
 	Value          string
 
+	StatusListJSON    []byte
+	MethodsJSON       []byte
+	DomainsJSON       []byte
+	ShouldAppend      bool
+	DisableRedirect   bool
+	ShouldReplace     bool
+	ReplaceValuesJSON []byte
+
 	Must *actions.Must
 }) {
 	// 日志
@@ -51,10 +61,57 @@ func (this *CreateSetPopupAction) RunPost(params struct {
 		return
 	}
 
+	// status list
+	var statusList = []int32{}
+	if len(params.StatusListJSON) > 0 {
+		err = json.Unmarshal(params.StatusListJSON, &statusList)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	// methods
+	var methods = []string{}
+	if len(params.MethodsJSON) > 0 {
+		err = json.Unmarshal(params.MethodsJSON, &methods)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	// domains
+	var domains = []string{}
+	if len(params.DomainsJSON) > 0 {
+		err = json.Unmarshal(params.DomainsJSON, &domains)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	// replace values
+	var replaceValues = []*shared.HTTPHeaderReplaceValue{}
+	if len(params.ReplaceValuesJSON) > 0 {
+		err = json.Unmarshal(params.ReplaceValuesJSON, &replaceValues)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
 	// 创建Header
 	createHeaderResp, err := this.RPC().HTTPHeaderRPC().CreateHTTPHeader(this.AdminContext(), &pb.CreateHTTPHeaderRequest{
-		Name:  params.Name,
-		Value: params.Value,
+		Name:              params.Name,
+		Value:             params.Value,
+		Status:            statusList,
+		Methods:           methods,
+		Domains:           domains,
+		ShouldAppend:      params.ShouldAppend,
+		DisableRedirect:   params.DisableRedirect,
+		ShouldReplace:     params.ShouldReplace,
+		ReplaceValuesJSON: params.ReplaceValuesJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/server/settings/headers/delete.go

@@ -35,26 +35,6 @@ func (this *DeleteAction) RunPost(params struct {
 	}
 
 	switch params.Type {
-	case "addHeader":
-		result := []*shared.HTTPHeaderRef{}
-		for _, h := range policyConfig.AddHeaderRefs {
-			if h.HeaderId != params.HeaderId {
-				result = append(result, h)
-			}
-		}
-		resultJSON, err := json.Marshal(result)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicyAddingHeaders(this.AdminContext(), &pb.UpdateHTTPHeaderPolicyAddingHeadersRequest{
-			HeaderPolicyId: params.HeaderPolicyId,
-			HeadersJSON:    resultJSON,
-		})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
 	case "setHeader":
 		result := []*shared.HTTPHeaderRef{}
 		for _, h := range policyConfig.SetHeaderRefs {
@@ -75,46 +55,6 @@ func (this *DeleteAction) RunPost(params struct {
 			this.ErrorPage(err)
 			return
 		}
-	case "replace":
-		result := []*shared.HTTPHeaderRef{}
-		for _, h := range policyConfig.ReplaceHeaderRefs {
-			if h.HeaderId != params.HeaderId {
-				result = append(result, h)
-			}
-		}
-		resultJSON, err := json.Marshal(result)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicyReplacingHeaders(this.AdminContext(), &pb.UpdateHTTPHeaderPolicyReplacingHeadersRequest{
-			HeaderPolicyId: params.HeaderPolicyId,
-			HeadersJSON:    resultJSON,
-		})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-	case "addTrailer":
-		result := []*shared.HTTPHeaderRef{}
-		for _, h := range policyConfig.AddTrailerRefs {
-			if h.HeaderId != params.HeaderId {
-				result = append(result, h)
-			}
-		}
-		resultJSON, err := json.Marshal(result)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		_, err = this.RPC().HTTPHeaderPolicyRPC().UpdateHTTPHeaderPolicyAddingTrailers(this.AdminContext(), &pb.UpdateHTTPHeaderPolicyAddingTrailersRequest{
-			HeaderPolicyId: params.HeaderPolicyId,
-			HeadersJSON:    resultJSON,
-		})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
 	}
 
 	this.Success()

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

@@ -59,7 +59,7 @@ func (this *IndexAction) RunGet(params struct {
 			return
 		}
 		_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRequestHeader(this.AdminContext(), &pb.UpdateHTTPWebRequestHeaderRequest{
-			WebId:      webId,
+			HttpWebId:  webId,
 			HeaderJSON: refJSON,
 		})
 		if err != nil {
@@ -86,7 +86,7 @@ func (this *IndexAction) RunGet(params struct {
 			return
 		}
 		_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebResponseHeader(this.AdminContext(), &pb.UpdateHTTPWebResponseHeaderRequest{
-			WebId:      webId,
+			HttpWebId:  webId,
 			HeaderJSON: refJSON,
 		})
 		if err != nil {

internal/web/actions/default/servers/server/settings/headers/updateSetPopup.go

@@ -20,9 +20,11 @@ func (this *UpdateSetPopupAction) Init() {
 func (this *UpdateSetPopupAction) RunGet(params struct {
 	HeaderPolicyId int64
 	HeaderId       int64
+	Type           string
 }) {
 	this.Data["headerPolicyId"] = params.HeaderPolicyId
 	this.Data["headerId"] = params.HeaderId
+	this.Data["type"] = params.Type
 
 	headerResp, err := this.RPC().HTTPHeaderRPC().FindEnabledHTTPHeaderConfig(this.AdminContext(), &pb.FindEnabledHTTPHeaderConfigRequest{HeaderId: params.HeaderId})
 	if err != nil {
@@ -45,6 +47,14 @@ func (this *UpdateSetPopupAction) RunPost(params struct {
 	Name     string
 	Value    string
 
+	StatusListJSON    []byte
+	MethodsJSON       []byte
+	DomainsJSON       []byte
+	ShouldAppend      bool
+	DisableRedirect   bool
+	ShouldReplace     bool
+	ReplaceValuesJSON []byte
+
 	Must *actions.Must
 }) {
 	// 日志
@@ -54,10 +64,57 @@ func (this *UpdateSetPopupAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入Header名称")
 
+	// status list
+	var statusList = []int32{}
+	if len(params.StatusListJSON) > 0 {
+		err := json.Unmarshal(params.StatusListJSON, &statusList)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	// methods
+	var methods = []string{}
+	if len(params.MethodsJSON) > 0 {
+		err := json.Unmarshal(params.MethodsJSON, &methods)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	// domains
+	var domains = []string{}
+	if len(params.DomainsJSON) > 0 {
+		err := json.Unmarshal(params.DomainsJSON, &domains)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	// replace values
+	var replaceValues = []*shared.HTTPHeaderReplaceValue{}
+	if len(params.ReplaceValuesJSON) > 0 {
+		err := json.Unmarshal(params.ReplaceValuesJSON, &replaceValues)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
 	_, err := this.RPC().HTTPHeaderRPC().UpdateHTTPHeader(this.AdminContext(), &pb.UpdateHTTPHeaderRequest{
-		HeaderId: params.HeaderId,
-		Name:     params.Name,
-		Value:    params.Value,
+		HeaderId:          params.HeaderId,
+		Name:              params.Name,
+		Value:             params.Value,
+		Status:            statusList,
+		Methods:           methods,
+		Domains:           domains,
+		ShouldAppend:      params.ShouldAppend,
+		DisableRedirect:   params.DisableRedirect,
+		ShouldReplace:     params.ShouldReplace,
+		ReplaceValuesJSON: params.ReplaceValuesJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -129,7 +129,7 @@ func (this *IndexAction) RunPost(params struct {
 	// 设置跳转到HTTPS
 	// TODO 校验设置
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRedirectToHTTPS(this.AdminContext(), &pb.UpdateHTTPWebRedirectToHTTPSRequest{
-		WebId:               params.WebId,
+		HttpWebId:           params.WebId,
 		RedirectToHTTPSJSON: params.RedirectToHTTPSJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/locations/access/index.go

@@ -64,8 +64,8 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebAuth(this.AdminContext(), &pb.UpdateHTTPWebAuthRequest{
-		WebId:    params.WebId,
-		AuthJSON: configJSON,
+		HttpWebId: params.WebId,
+		AuthJSON:  configJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -45,7 +45,7 @@ func (this *IndexAction) RunPost(params struct {
 	// TODO 检查参数
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebAccessLog(this.AdminContext(), &pb.UpdateHTTPWebAccessLogRequest{
-		WebId:         params.WebId,
+		HttpWebId:     params.WebId,
 		AccessLogJSON: params.AccessLogJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/locations/cache/index.go

@@ -81,7 +81,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCache(this.AdminContext(), &pb.UpdateHTTPWebCacheRequest{
-		WebId:     params.WebId,
+		HttpWebId: params.WebId,
 		CacheJSON: cacheJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/locations/charset/index.go

@@ -42,7 +42,7 @@ func (this *IndexAction) RunPost(params struct {
 	defer this.CreateLogInfo("修改Web %d 的字符集设置", params.WebId)
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCharset(this.AdminContext(), &pb.UpdateHTTPWebCharsetRequest{
-		WebId:       params.WebId,
+		HttpWebId:   params.WebId,
 		CharsetJSON: params.CharsetJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/locations/compression/index.go

@@ -57,7 +57,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCompression(this.AdminContext(), &pb.UpdateHTTPWebCompressionRequest{
-		WebId:           params.WebId,
+		HttpWebId:       params.WebId,
 		CompressionJSON: params.CompressionJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/locations/create.go

@@ -51,8 +51,12 @@ func (this *CreateAction) RunPost(params struct {
 	IsReverse         bool
 	CondsJSON         []byte
 
+	DomainsJSON []byte
+
 	Must *actions.Must
 }) {
+	defer this.CreateLogInfo("创建路由规则：%s", params.Pattern)
+
 	params.Must.
 		Field("pattern", params.Pattern).
 		Require("请输入路径匹配规则")
@@ -85,6 +89,21 @@ func (this *CreateAction) RunPost(params struct {
 		params.Pattern = "/" + strings.TrimLeft(params.Pattern, "/")
 	}
 
+	// 域名
+	var domains = []string{}
+	if len(params.DomainsJSON) > 0 {
+		err := json.Unmarshal(params.DomainsJSON, &domains)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		// 去除可能误加的斜杠
+		for index, domain := range domains {
+			domains[index] = strings.TrimSuffix(domain, "/")
+		}
+	}
+
 	location := &serverconfigs.HTTPLocationConfig{}
 	location.SetPattern(params.Pattern, params.PatternType, params.IsCaseInsensitive, params.IsReverse)
 	resultPattern := location.Pattern
@@ -96,6 +115,7 @@ func (this *CreateAction) RunPost(params struct {
 		Pattern:     resultPattern,
 		IsBreak:     params.IsBreak,
 		CondsJSON:   params.CondsJSON,
+		Domains:     domains,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -123,7 +143,7 @@ func (this *CreateAction) RunPost(params struct {
 		return
 	}
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebLocations(this.AdminContext(), &pb.UpdateHTTPWebLocationsRequest{
-		WebId:         params.WebId,
+		HttpWebId:     params.WebId,
 		LocationsJSON: refJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/locations/delete.go

@@ -28,7 +28,7 @@ func (this *DeleteAction) RunPost(params struct {
 		return
 	}
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebLocations(this.AdminContext(), &pb.UpdateHTTPWebLocationsRequest{
-		WebId:         params.WebId,
+		HttpWebId:     params.WebId,
 		LocationsJSON: refJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/locations/fastcgi/index.go

@@ -57,7 +57,7 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebFastcgi(this.AdminContext(), &pb.UpdateHTTPWebFastcgiRequest{
-		WebId:       params.WebId,
+		HttpWebId:   params.WebId,
 		FastcgiJSON: fastcgiRefJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/locations/headers/index.go

@@ -48,7 +48,7 @@ func (this *IndexAction) RunGet(params struct {
 			return
 		}
 		_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRequestHeader(this.AdminContext(), &pb.UpdateHTTPWebRequestHeaderRequest{
-			WebId:      webId,
+			HttpWebId:  webId,
 			HeaderJSON: refJSON,
 		})
 		isChanged = true
@@ -71,7 +71,7 @@ func (this *IndexAction) RunGet(params struct {
 			return
 		}
 		_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebResponseHeader(this.AdminContext(), &pb.UpdateHTTPWebResponseHeaderRequest{
-			WebId:      webId,
+			HttpWebId:  webId,
 			HeaderJSON: refJSON,
 		})
 		isChanged = true
@@ -109,7 +109,7 @@ func (this *IndexAction) RunPost(params struct {
 	switch params.Type {
 	case "request":
 		_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebRequestHeader(this.AdminContext(), &pb.UpdateHTTPWebRequestHeaderRequest{
-			WebId:      params.WebId,
+			HttpWebId:  params.WebId,
 			HeaderJSON: params.RequestHeaderJSON,
 		})
 		if err != nil {
@@ -118,7 +118,7 @@ func (this *IndexAction) RunPost(params struct {
 		}
 	case "response":
 		_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebResponseHeader(this.AdminContext(), &pb.UpdateHTTPWebResponseHeaderRequest{
-			WebId:      params.WebId,
+			HttpWebId:  params.WebId,
 			HeaderJSON: params.ResponseHeaderJSON,
 		})
 		if err != nil {

internal/web/actions/default/servers/server/settings/locations/http/index.go

@@ -40,7 +40,7 @@ func (this *IndexAction) RunPost(params struct {
 	// 设置跳转到HTTPS
 	// TODO 校验设置
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebRedirectToHTTPS(this.AdminContext(), &pb.UpdateHTTPWebRedirectToHTTPSRequest{
-		WebId:               params.WebId,
+		HttpWebId:           params.WebId,
 		RedirectToHTTPSJSON: params.RedirectToHTTPSJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/locations/location/index.go

@@ -31,6 +31,7 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["isReverse"] = locationConfig.IsReverse()
 	this.Data["isCaseInsensitive"] = locationConfig.IsCaseInsensitive()
 	this.Data["conds"] = locationConfig.Conds
+	this.Data["domains"] = locationConfig.Domains
 
 	this.Show()
 }
@@ -50,6 +51,8 @@ func (this *IndexAction) RunPost(params struct {
 
 	CondsJSON []byte
 
+	DomainsJSON []byte
+
 	Must *actions.Must
 }) {
 	defer this.CreateLogInfo("修改路由规则 %d 设置", params.LocationId)
@@ -86,6 +89,21 @@ func (this *IndexAction) RunPost(params struct {
 		}
 	}
 
+	// 域名
+	var domains = []string{}
+	if len(params.DomainsJSON) > 0 {
+		err := json.Unmarshal(params.DomainsJSON, &domains)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		// 去除可能误加的斜杠
+		for index, domain := range domains {
+			domains[index] = strings.TrimSuffix(domain, "/")
+		}
+	}
+
 	location := &serverconfigs.HTTPLocationConfig{}
 	location.SetPattern(params.Pattern, params.PatternType, params.IsCaseInsensitive, params.IsReverse)
 	resultPattern := location.Pattern
@@ -98,6 +116,7 @@ func (this *IndexAction) RunPost(params struct {
 		IsBreak:     params.IsBreak,
 		IsOn:        params.IsOn,
 		CondsJSON:   params.CondsJSON,
+		Domains:     domains,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -41,7 +41,7 @@ func (this *IndexAction) RunPost(params struct {
 	// TODO 检查配置
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebPages(this.AdminContext(), &pb.UpdateHTTPWebPagesRequest{
-		WebId:     params.WebId,
+		HttpWebId: params.WebId,
 		PagesJSON: []byte(params.PagesJSON),
 	})
 	if err != nil {
@@ -50,7 +50,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebShutdown(this.AdminContext(), &pb.UpdateHTTPWebShutdownRequest{
-		WebId:        params.WebId,
+		HttpWebId:    params.WebId,
 		ShutdownJSON: []byte(params.ShutdownJSON),
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go

@@ -48,7 +48,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRemoteAddr(this.AdminContext(), &pb.UpdateHTTPWebRemoteAddrRequest{
-		WebId:          params.WebId,
+		HttpWebId:      params.WebId,
 		RemoteAddrJSON: params.RemoteAddrJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/locations/sort.go

@@ -47,7 +47,7 @@ func (this *SortAction) RunPost(params struct {
 		return
 	}
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebLocations(this.AdminContext(), &pb.UpdateHTTPWebLocationsRequest{
-		WebId:         params.WebId,
+		HttpWebId:     params.WebId,
 		LocationsJSON: newRefsJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/settings/locations/stat/index.go

@@ -40,8 +40,8 @@ func (this *IndexAction) RunPost(params struct {
 	// TODO 校验配置
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebStat(this.AdminContext(), &pb.UpdateHTTPWebStatRequest{
-		WebId:    params.WebId,
-		StatJSON: params.StatJSON,
+		HttpWebId: params.WebId,
+		StatJSON:  params.StatJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/server/settings/locations/waf/index.go

@@ -61,7 +61,7 @@ func (this *IndexAction) RunPost(params struct {
 	// TODO 检查配置
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebFirewall(this.AdminContext(), &pb.UpdateHTTPWebFirewallRequest{
-		WebId:        params.WebId,
+		HttpWebId:    params.WebId,
 		FirewallJSON: params.FirewallJSON,
 	})
 	if err != nil {

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

@@ -38,8 +38,8 @@ func (this *IndexAction) RunPost(params struct {
 	defer this.CreateLogInfo("修改Web %d 的根目录等设置", params.WebId)
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWeb(this.AdminContext(), &pb.UpdateHTTPWebRequest{
-		WebId:    params.WebId,
-		RootJSON: params.RootJSON,
+		HttpWebId: params.WebId,
+		RootJSON:  params.RootJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/server/settings/locations/webp/index.go

@@ -48,8 +48,8 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebP(this.AdminContext(), &pb.UpdateHTTPWebWebPRequest{
-		WebId:    params.WebId,
-		WebpJSON: params.WebpJSON,
+		HttpWebId: params.WebId,
+		WebpJSON:  params.WebpJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/server/settings/locations/websocket/index.go

@@ -102,7 +102,7 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebsocket(this.AdminContext(), &pb.UpdateHTTPWebWebsocketRequest{
-		WebId:         params.WebId,
+		HttpWebId:     params.WebId,
 		WebsocketJSON: websocketRefJSON,
 	})
 	if err != nil {

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

@@ -57,7 +57,7 @@ func (this *IndexAction) RunPost(params struct {
 	// TODO 检查配置
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebPages(this.AdminContext(), &pb.UpdateHTTPWebPagesRequest{
-		WebId:     params.WebId,
+		HttpWebId: params.WebId,
 		PagesJSON: []byte(params.PagesJSON),
 	})
 	if err != nil {
@@ -66,7 +66,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebShutdown(this.AdminContext(), &pb.UpdateHTTPWebShutdownRequest{
-		WebId:        params.WebId,
+		HttpWebId:    params.WebId,
 		ShutdownJSON: []byte(params.ShutdownJSON),
 	})
 	if err != nil {

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

@@ -42,7 +42,7 @@ func (this *IndexAction) RunPost(params struct {
 	defer this.CreateLogInfo("修改Web %d 的URL跳转设置", params.WebId)
 
 	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebHostRedirects(this.AdminContext(), &pb.UpdateHTTPWebHostRedirectsRequest{
-		WebId:             params.WebId,
+		HttpWebId:         params.WebId,
 		HostRedirectsJSON: params.HostRedirectsJSON,
 	})
 	if err != nil {

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

@@ -61,7 +61,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRemoteAddr(this.AdminContext(), &pb.UpdateHTTPWebRemoteAddrRequest{
-		WebId:          params.WebId,
+		HttpWebId:      params.WebId,
 		RemoteAddrJSON: params.RemoteAddrJSON,
 	})
 	if err != nil {

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

@@ -0,0 +1,69 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package requestlimit
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/types"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "index")
+	this.SecondMenu("requestLimit")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ServerId int64
+}) {
+	// 服务分组设置
+	groupResp, err := this.RPC().ServerGroupRPC().FindEnabledServerGroupConfigInfo(this.AdminContext(), &pb.FindEnabledServerGroupConfigInfoRequest{
+		ServerId: params.ServerId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["hasGroupConfig"] = groupResp.HasRequestLimitConfig
+	this.Data["groupSettingURL"] = "/servers/groups/group/settings/requestLimit?groupId=" + types.String(groupResp.ServerGroupId)
+
+	this.Data["serverId"] = params.ServerId
+
+	webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithServerId(this.AdminContext(), params.ServerId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["webId"] = webConfig.Id
+	this.Data["requestLimitConfig"] = webConfig.RequestLimit
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	WebId            int64
+	RequestLimitJSON []byte
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("修改Web %d 请求限制", params.WebId)
+
+	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebRequestLimit(this.AdminContext(), &pb.UpdateHTTPWebRequestLimitRequest{
+		HttpWebId:        params.WebId,
+		RequestLimitJSON: params.RequestLimitJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

internal/web/actions/default/servers/server/settings/requestLimit/init.go

@@ -0,0 +1,19 @@
+package requestlimit
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils"
+	"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)).
+			Helper(serverutils.NewServerHelper()).
+			Prefix("/servers/server/settings/requestLimit").
+			GetPost("", new(IndexAction)).
+			EndAll()
+	})
+}