修改域名变更时是否需要审核的初始状态

build/build.sh

@@ -58,6 +58,10 @@ 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
@@ -67,6 +71,7 @@ function build() {
 	find $DIST -name ".gitignore" -delete
 	find $DIST -name "*.less" -delete
 	find $DIST -name "*.css.map" -delete
+	find $DIST -name "*.js.map" -delete
 
 	# zip
 	echo "zip files ..."

cmd/edge-admin/main.go

@@ -5,6 +5,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/apps"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"github.com/TeaOSLab/EdgeAdmin/internal/gen"
 	"github.com/TeaOSLab/EdgeAdmin/internal/nodes"
 	_ "github.com/TeaOSLab/EdgeAdmin/internal/web"
 	_ "github.com/iwind/TeaGo/bootstrap"
@@ -70,6 +71,13 @@ func main() {
 		}
 		fmt.Println("change demo mode successfully")
 	})
+	app.On("generate", func() {
+		err := gen.Generate()
+		if err != nil {
+			fmt.Println("generate failed: " + err.Error())
+			return
+		}
+	})
 	app.Run(func() {
 		adminNode := nodes.NewAdminNode()
 		adminNode.Run()

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/go-yaml/yaml v2.1.0+incompatible
 	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24
-	github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3
+	github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/miekg/dns v1.1.35
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

go.sum

@@ -68,6 +68,8 @@ github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24 h1:1cGulkD2SNJJRok5OKw
 github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc=
 github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3 h1:aBSonas7vFcgTj9u96/bWGILGv1ZbUSTLiOzcI1ZT6c=
 github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA=
+github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4 h1:VWGsCqTzObdlbf7UUE3oceIpcEKi4C/YBUszQXk118A=
+github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA=
 github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=

internal/const/const.go

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

internal/gen/generate.go

@@ -0,0 +1,129 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package gen
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/conds/condutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/files"
+	"github.com/iwind/TeaGo/logs"
+	"io"
+	"os"
+	"path/filepath"
+)
+
+func Generate() error {
+	err := generateComponentsJSFile()
+	if err != nil {
+		return errors.New("generate 'components.js' failed: " + err.Error())
+	}
+
+	return nil
+}
+
+// 生成Javascript文件
+func generateComponentsJSFile() error {
+	var buffer = bytes.NewBuffer([]byte{})
+
+	var webRoot string
+	if Tea.IsTesting() {
+		webRoot = Tea.Root + "/../web/public/js/components/"
+	} else {
+		webRoot = Tea.Root + "/web/public/js/components/"
+	}
+	f := files.NewFile(webRoot)
+
+	f.Range(func(file *files.File) {
+		if !file.IsFile() {
+			return
+		}
+		if file.Ext() != ".js" {
+			return
+		}
+		data, err := file.ReadAll()
+		if err != nil {
+			logs.Error(err)
+			return
+		}
+		buffer.Write(data)
+		buffer.Write([]byte{'\n', '\n'})
+	})
+
+	// 条件组件
+	typesJSON, err := json.Marshal(condutils.ReadAllAvailableCondTypes())
+	if err != nil {
+		logs.Println("ComponentsAction marshal request cond types failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.REQUEST_COND_COMPONENTS = ")
+		buffer.Write(typesJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// 条件操作符
+	requestOperatorsJSON, err := json.Marshal(shared.AllRequestOperators())
+	if err != nil {
+		logs.Println("ComponentsAction marshal request operators failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.REQUEST_COND_OPERATORS = ")
+		buffer.Write(requestOperatorsJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// 请求变量
+	requestVariablesJSON, err := json.Marshal(shared.DefaultRequestVariables())
+	if err != nil {
+		logs.Println("ComponentsAction marshal request variables failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.REQUEST_VARIABLES = ")
+		buffer.Write(requestVariablesJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// 指标
+	metricHTTPKeysJSON, err := json.Marshal(serverconfigs.FindAllMetricKeyDefinitions(serverconfigs.MetricItemCategoryHTTP))
+	if err != nil {
+		logs.Println("ComponentsAction marshal metric http keys failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.METRIC_HTTP_KEYS = ")
+		buffer.Write(metricHTTPKeysJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// IP地址阈值项目
+	ipAddrThresholdItemsJSON, err := json.Marshal(nodeconfigs.FindAllIPAddressThresholdItems())
+	if err != nil {
+		logs.Println("ComponentsAction marshal ip addr threshold items failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.IP_ADDR_THRESHOLD_ITEMS = ")
+		buffer.Write(ipAddrThresholdItemsJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	// IP地址阈值动作
+	ipAddrThresholdActionsJSON, err := json.Marshal(nodeconfigs.FindAllIPAddressThresholdActions())
+	if err != nil {
+		logs.Println("ComponentsAction marshal ip addr threshold actions failed: " + err.Error())
+	} else {
+		buffer.WriteString("window.IP_ADDR_THRESHOLD_ACTIONS = ")
+		buffer.Write(ipAddrThresholdActionsJSON)
+		buffer.Write([]byte{'\n', '\n'})
+	}
+
+	fp, err := os.OpenFile(filepath.Clean(Tea.PublicFile("/js/components.js")), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0777)
+	if err != nil {
+		return err
+	}
+
+	_, err = io.Copy(fp, buffer)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/gen/generate_test.go

@@ -0,0 +1,13 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package gen
+
+import "testing"
+
+func TestGenerate(t *testing.T) {
+	err := Generate()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}

internal/nodes/admin_node.go

@@ -326,6 +326,16 @@ func (this *AdminNode) listenSock() error {
 			case "demo":
 				teaconst.IsDemoMode = !teaconst.IsDemoMode
 				_ = cmd.ReplyOk()
+			case "info":
+				exePath, _ := os.Executable()
+				_ = cmd.Reply(&gosock.Command{
+					Code: "info",
+					Params: map[string]interface{}{
+						"pid":     os.Getpid(),
+						"version": teaconst.Version,
+						"path":    exePath,
+					},
+				})
 			}
 		})
 

internal/rpc/rpc_client.go

@@ -27,11 +27,11 @@ type RPCClient struct {
 	apiConfig *configs.APIConfig
 	conns     []*grpc.ClientConn
 
-	locker sync.Mutex
+	locker sync.RWMutex
 }
 
 // NewRPCClient 构造新的RPC客户端
-func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) {
+func NewRPCClient(apiConfig *configs.APIConfig, isPrimary bool) (*RPCClient, error) {
 	if apiConfig == nil {
 		return nil, errors.New("api config should not be nil")
 	}
@@ -46,7 +46,9 @@ func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) {
 	}
 
 	// 设置RPC
-	dao.SetRPC(client)
+	if isPrimary {
+		dao.SetRPC(client)
+	}
 
 	return client, nil
 }
@@ -380,6 +382,18 @@ func (this *RPCClient) UserBillRPC() pb.UserBillServiceClient {
 	return pb.NewUserBillServiceClient(this.pickConn())
 }
 
+func (this *RPCClient) UserAccountRPC() pb.UserAccountServiceClient {
+	return pb.NewUserAccountServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) UserAccountLogRPC() pb.UserAccountLogServiceClient {
+	return pb.NewUserAccountLogServiceClient(this.pickConn())
+}
+
+func (this *RPCClient) UserAccountDailyStatRPC() pb.UserAccountDailyStatServiceClient {
+	return pb.NewUserAccountDailyStatServiceClient(this.pickConn())
+}
+
 func (this *RPCClient) UserAccessKeyRPC() pb.UserAccessKeyServiceClient {
 	return pb.NewUserAccessKeyServiceClient(this.pickConn())
 }
@@ -521,7 +535,11 @@ func (this *RPCClient) APIContext(apiNodeId int64) context.Context {
 // UpdateConfig 修改配置
 func (this *RPCClient) UpdateConfig(config *configs.APIConfig) error {
 	this.apiConfig = config
-	return this.init()
+
+	this.locker.Lock()
+	err := this.init()
+	this.locker.Unlock()
+	return err
 }
 
 // 初始化
@@ -599,3 +617,20 @@ func (this *RPCClient) pickConn() *grpc.ClientConn {
 
 	return this.conns[rands.Int(0, len(this.conns)-1)]
 }
+
+// Close 关闭
+func (this *RPCClient) Close() error {
+	this.locker.Lock()
+	defer this.locker.Unlock()
+
+	var lastErr error
+	for _, conn := range this.conns {
+		var err = conn.Close()
+		if err != nil {
+			lastErr = err
+			continue
+		}
+	}
+
+	return lastErr
+}

internal/rpc/rpc_utils.go

@@ -20,7 +20,7 @@ func SharedRPC() (*RPCClient, error) {
 	if err != nil {
 		return nil, err
 	}
-	client, err := NewRPCClient(config)
+	client, err := NewRPCClient(config, true)
 	if err != nil {
 		return nil, err
 	}

internal/setup/utils.go

@@ -2,6 +2,8 @@ package setup
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
+	"os"
 )
 
 var isConfigured bool
@@ -16,3 +18,16 @@ func IsConfigured() bool {
 	isConfigured = err == nil
 	return isConfigured
 }
+
+// IsNewInstalled IsNew 检查是否新安装
+func IsNewInstalled() bool {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return false
+	}
+	_, err = os.Stat(homeDir + "/." + teaconst.ProcessName + "/api.yaml")
+	if err != nil {
+		return true
+	}
+	return false
+}

internal/tasks/task_sync_api_nodes.go

@@ -66,7 +66,7 @@ func (this *SyncAPINodesTask) Loop() error {
 	}
 
 	newEndpoints := []string{}
-	for _, node := range resp.Nodes {
+	for _, node := range resp.ApiNodes {
 		if !node.IsOn {
 			continue
 		}

internal/web/actions/default/api/delete.go

@@ -13,16 +13,35 @@ type DeleteAction struct {
 func (this *DeleteAction) RunPost(params struct {
 	NodeId int64
 }) {
-	// TODO 检查权限
+	// 创建日志
+	defer this.CreateLog(oplogs.LevelInfo, "删除API节点 %d", params.NodeId)
 
-	_, err := this.RPC().APINodeRPC().DeleteAPINode(this.AdminContext(), &pb.DeleteAPINodeRequest{NodeId: params.NodeId})
+	// 检查是否是唯一的节点
+	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{ApiNodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var apiNode = nodeResp.ApiNode
+	if apiNode == nil {
+		this.Success()
+	}
+	if apiNode.IsOn {
+		countResp, err := this.RPC().APINodeRPC().CountAllEnabledAndOnAPINodes(this.AdminContext(), &pb.CountAllEnabledAndOnAPINodesRequest{})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if countResp.Count == 1 {
+			this.Fail("无法删除此节点：必须保留至少一个可用的API节点")
+		}
+	}
+
+	_, err = this.RPC().APINodeRPC().DeleteAPINode(this.AdminContext(), &pb.DeleteAPINodeRequest{ApiNodeId: params.NodeId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 
-	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "删除API节点 %d", params.NodeId)
-
 	this.Success()
 }

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

@@ -41,7 +41,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 			return
 		}
 
-		for _, node := range nodesResp.Nodes {
+		for _, node := range nodesResp.ApiNodes {
 			// 状态
 			status := &nodeconfigs.NodeStatus{}
 			if len(node.StatusJSON) > 0 {

internal/web/actions/default/api/node/createPopup.go

@@ -180,7 +180,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	}
 
 	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "创建API节点 %d", createResp.NodeId)
+	defer this.CreateLog(oplogs.LevelInfo, "创建API节点 %d", createResp.ApiNodeId)
 
 	this.Success()
 }

internal/web/actions/default/api/node/index.go

@@ -20,12 +20,12 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct {
 	NodeId int64
 }) {
-	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{NodeId: params.NodeId})
+	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{ApiNodeId: params.NodeId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	node := nodeResp.Node
+	node := nodeResp.ApiNode
 	if node == nil {
 		this.NotFound("apiNode", params.NodeId)
 		return

internal/web/actions/default/api/node/install.go

@@ -21,12 +21,12 @@ func (this *InstallAction) RunGet(params struct {
 	NodeId int64
 }) {
 	// API节点信息
-	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{NodeId: params.NodeId})
+	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{ApiNodeId: params.NodeId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	node := nodeResp.Node
+	node := nodeResp.ApiNode
 	if node == nil {
 		this.NotFound("apiNode", params.NodeId)
 		return

internal/web/actions/default/api/node/logs.go

@@ -31,12 +31,12 @@ func (this *LogsAction) RunGet(params struct {
 	this.Data["keyword"] = params.Keyword
 	this.Data["level"] = params.Level
 
-	apiNodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{NodeId: params.NodeId})
+	apiNodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{ApiNodeId: params.NodeId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	apiNode := apiNodeResp.Node
+	apiNode := apiNodeResp.ApiNode
 	if apiNode == nil {
 		this.NotFound("apiNode", params.NodeId)
 		return

internal/web/actions/default/api/node/update.go

@@ -23,13 +23,13 @@ func (this *UpdateAction) RunGet(params struct {
 	NodeId int64
 }) {
 	nodeResp, err := this.RPC().APINodeRPC().FindEnabledAPINode(this.AdminContext(), &pb.FindEnabledAPINodeRequest{
-		NodeId: params.NodeId,
+		ApiNodeId: params.NodeId,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	node := nodeResp.Node
+	node := nodeResp.ApiNode
 	if node == nil {
 		this.WriteString("要操作的节点不存在")
 		return
@@ -281,7 +281,7 @@ func (this *UpdateAction) RunPost(params struct {
 	}
 
 	_, err = this.RPC().APINodeRPC().UpdateAPINode(this.AdminContext(), &pb.UpdateAPINodeRequest{
-		NodeId:          params.NodeId,
+		ApiNodeId:       params.NodeId,
 		Name:            params.Name,
 		Description:     params.Description,
 		HttpJSON:        httpJSON,

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

@@ -75,7 +75,7 @@ func (this *CreateNodeAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	apiNodes := apiNodesResp.Nodes
+	apiNodes := apiNodesResp.ApiNodes
 	apiEndpoints := []string{}
 	for _, apiNode := range apiNodes {
 		if !apiNode.IsOn {

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

@@ -49,7 +49,7 @@ func (this *InstallNodesAction) RunGet(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		for _, apiNode := range apiNodesResp.Nodes {
+		for _, apiNode := range apiNodesResp.ApiNodes {
 			if !apiNode.IsOn {
 				continue
 			}

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

@@ -70,7 +70,7 @@ func (this *InstallAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	apiNodes := apiNodesResp.Nodes
+	apiNodes := apiNodesResp.ApiNodes
 	apiEndpoints := []string{}
 	for _, apiNode := range apiNodes {
 		if !apiNode.IsOn {

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

@@ -69,6 +69,20 @@ func (this *LogsAction) RunGet(params struct {
 
 	logs := []maps.Map{}
 	for _, log := range logsResp.NodeLogs {
+		// 服务信息
+		var serverMap = maps.Map{"id": 0}
+		if log.ServerId > 0 {
+			serverResp, err := this.RPC().ServerRPC().FindEnabledUserServerBasic(this.AdminContext(), &pb.FindEnabledUserServerBasicRequest{ServerId: log.ServerId})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			var server = serverResp.Server
+			if server != nil {
+				serverMap = maps.Map{"id": server.Id, "name": server.Name}
+			}
+		}
+
 		logs = append(logs, maps.Map{
 			"tag":         log.Tag,
 			"description": log.Description,
@@ -76,6 +90,7 @@ func (this *LogsAction) RunGet(params struct {
 			"level":       log.Level,
 			"isToday":     timeutil.FormatTime("Y-m-d", log.CreatedAt) == timeutil.Format("Y-m-d"),
 			"count":       log.Count,
+			"server":      serverMap,
 		})
 	}
 	this.Data["logs"] = logs

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

@@ -28,6 +28,7 @@ func (this *CreateAction) RunPost(params struct {
 	Username    string
 	Password    string
 	PrivateKey  string
+	Passphrase  string
 	Description string
 
 	Must *actions.Must
@@ -58,6 +59,7 @@ func (this *CreateAction) RunPost(params struct {
 		Username:    params.Username,
 		Password:    params.Password,
 		PrivateKey:  params.PrivateKey,
+		Passphrase:  params.Passphrase,
 		Description: params.Description,
 		NodeId:      0,
 	})

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

@@ -29,6 +29,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	Username    string
 	Password    string
 	PrivateKey  string
+	Passphrase  string
 	Description string
 
 	Must *actions.Must
@@ -59,6 +60,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Username:    params.Username,
 		Password:    params.Password,
 		PrivateKey:  params.PrivateKey,
+		Passphrase:  params.Passphrase,
 		Description: params.Description,
 		NodeId:      0,
 	})

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

@@ -40,6 +40,7 @@ func (this *GrantAction) RunGet(params struct {
 		"username":    grant.Username,
 		"password":    strings.Repeat("*", len(grant.Password)),
 		"privateKey":  grant.PrivateKey,
+		"passphrase":  strings.Repeat("*", len(grant.Passphrase)),
 		"description": grant.Description,
 		"su":          grant.Su,
 	}

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

@@ -43,6 +43,7 @@ func (this *UpdateAction) RunGet(params struct {
 		"username":    grant.Username,
 		"password":    grant.Password,
 		"privateKey":  grant.PrivateKey,
+		"passphrase":  grant.Passphrase,
 		"description": grant.Description,
 		"su":          grant.Su,
 	}
@@ -57,6 +58,7 @@ func (this *UpdateAction) RunPost(params struct {
 	Username    string
 	Password    string
 	PrivateKey  string
+	Passphrase  string
 	Description string
 
 	Must *actions.Must
@@ -93,6 +95,7 @@ func (this *UpdateAction) RunPost(params struct {
 		Username:    params.Username,
 		Password:    params.Password,
 		PrivateKey:  params.PrivateKey,
+		Passphrase:  params.Passphrase,
 		Description: params.Description,
 		NodeId:      0,
 	})

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

@@ -43,6 +43,7 @@ func (this *UpdatePopupAction) RunGet(params struct {
 		"password":    grant.Password,
 		"description": grant.Description,
 		"privateKey":  grant.PrivateKey,
+		"passphrase":  grant.Passphrase,
 	}
 
 	this.Show()
@@ -56,6 +57,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	Username    string
 	Password    string
 	PrivateKey  string
+	Passphrase  string
 	Description string
 
 	Must *actions.Must
@@ -91,6 +93,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		Username:    params.Username,
 		Password:    params.Password,
 		PrivateKey:  params.PrivateKey,
+		Passphrase:  params.Passphrase,
 		Description: params.Description,
 		NodeId:      params.NodeId,
 	})

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

@@ -90,6 +90,20 @@ func (this *IndexAction) RunGet(params struct {
 			continue
 		}
 
+		// 服务信息
+		var serverMap = maps.Map{"id": 0}
+		if log.ServerId > 0 {
+			serverResp, err := this.RPC().ServerRPC().FindEnabledUserServerBasic(this.AdminContext(), &pb.FindEnabledUserServerBasicRequest{ServerId: log.ServerId})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			var server = serverResp.Server
+			if server != nil {
+				serverMap = maps.Map{"id": server.Id, "name": server.Name}
+			}
+		}
+
 		logs = append(logs, maps.Map{
 			"id":          log.Id,
 			"tag":         log.Tag,
@@ -107,6 +121,7 @@ func (this *IndexAction) RunGet(params struct {
 				},
 				"name": node.Name,
 			},
+			"server": serverMap,
 		})
 	}
 	this.Data["logs"] = logs

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

@@ -15,6 +15,7 @@ func init() {
 			Prefix("/clusters/logs").
 			Get("", new(IndexAction)).
 			Post("/readLogs", new(ReadLogsAction)).
+			Post("/readAllLogs", new(ReadAllLogsAction)).
 			EndAll()
 	})
 }

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

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

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

@@ -6,7 +6,7 @@ import (
 	"github.com/iwind/TeaGo/maps"
 )
 
-// 域名列表选项
+// DomainOptionsAction 域名列表选项
 type DomainOptionsAction struct {
 	actionutils.ParentAction
 }
@@ -23,8 +23,8 @@ func (this *DomainOptionsAction) RunPost(params struct {
 	}
 	domainMaps := []maps.Map{}
 	for _, domain := range domainsResp.DnsDomains {
-		// 未开启的先跳过
-		if !domain.IsOn {
+		// 未开启或者已删除的先跳过
+		if !domain.IsOn || domain.IsDeleted {
 			continue
 		}
 

internal/web/actions/default/dns/domains/recover.go

@@ -0,0 +1,27 @@
+package domains
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type RecoverAction struct {
+	actionutils.ParentAction
+}
+
+func (this *RecoverAction) RunPost(params struct {
+	DomainId int64
+}) {
+	// 记录日志
+	defer this.CreateLog(oplogs.LevelInfo, "从DNS服务商中恢复域名 %d", params.DomainId)
+
+	// 执行恢复
+	_, err := this.RPC().DNSDomainRPC().RecoverDNSDomain(this.AdminContext(), &pb.RecoverDNSDomainRequest{DnsDomainId: params.DomainId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -52,7 +52,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	// TODO 检查DomainId
 
 	// 记录日志
-	defer this.CreateLog(oplogs.LevelInfo, "修改管理域名到DNS服务商 %d", params.DomainId)
+	defer this.CreateLog(oplogs.LevelInfo, "修改DNS服务商域名 %d", params.DomainId)
 
 	params.Must.
 		Field("name", params.Name).

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

@@ -43,6 +43,7 @@ func init() {
 			GetPost("/createPopup", new(domains.CreatePopupAction)).
 			GetPost("/updatePopup", new(domains.UpdatePopupAction)).
 			Post("/delete", new(domains.DeleteAction)).
+			Post("/recover", new(domains.RecoverAction)).
 			Post("/sync", new(domains.SyncAction)).
 			Get("/routesPopup", new(domains.RoutesPopupAction)).
 			GetPost("/selectPopup", new(domains.SelectPopupAction)).

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

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

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

@@ -43,6 +43,12 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 
+	//// 是否新安装
+	if setup.IsNewInstalled() {
+		this.RedirectURL("/setup/confirm")
+		return
+	}
+
 	// 已登录跳转到dashboard
 	if params.Auth.IsUser() {
 		this.RedirectURL("/dashboard")

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

@@ -48,6 +48,7 @@ func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg
 
 	wg := &sync.WaitGroup{}
 	wg.Add(len(nodes))
+
 	for _, node := range nodes {
 		// TODO 检查是否在线
 
@@ -68,7 +69,7 @@ func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg
 		apiNodeId := node.ConnectedAPINodeIds[0]
 		rpcClient, ok := rpcMap[apiNodeId]
 		if !ok {
-			apiNodeResp, err := defaultRPCClient.APINodeRPC().FindEnabledAPINode(ctx, &pb.FindEnabledAPINodeRequest{NodeId: apiNodeId})
+			apiNodeResp, err := defaultRPCClient.APINodeRPC().FindEnabledAPINode(ctx, &pb.FindEnabledAPINodeRequest{ApiNodeId: apiNodeId})
 			if err != nil {
 				locker.Lock()
 				results = append(results, &MessageResult{
@@ -82,7 +83,7 @@ func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg
 				continue
 			}
 
-			if apiNodeResp.Node == nil {
+			if apiNodeResp.ApiNode == nil {
 				locker.Lock()
 				results = append(results, &MessageResult{
 					NodeId:   node.Id,
@@ -94,7 +95,7 @@ func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg
 				wg.Done()
 				continue
 			}
-			apiNode := apiNodeResp.Node
+			apiNode := apiNodeResp.ApiNode
 
 			apiRPCClient, err := rpc.NewRPCClient(&configs.APIConfig{
 				RPC: struct {
@@ -104,7 +105,7 @@ func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg
 				},
 				NodeId: apiNode.UniqueId,
 				Secret: apiNode.Secret,
-			})
+			}, false)
 			if err != nil {
 				locker.Lock()
 				results = append(results, &MessageResult{
@@ -162,6 +163,11 @@ func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg
 		})
 	}
 
+	// 关闭RPC
+	for _, rpcClient := range rpcMap {
+		_ = rpcClient.Close()
+	}
+
 	return
 }
 
@@ -243,7 +249,7 @@ func SendMessageToNodeIds(ctx context.Context, nodeIds []int64, code string, msg
 		apiNodeId := node.ConnectedAPINodeIds[0]
 		rpcClient, ok := rpcMap[apiNodeId]
 		if !ok {
-			apiNodeResp, err := defaultRPCClient.APINodeRPC().FindEnabledAPINode(ctx, &pb.FindEnabledAPINodeRequest{NodeId: apiNodeId})
+			apiNodeResp, err := defaultRPCClient.APINodeRPC().FindEnabledAPINode(ctx, &pb.FindEnabledAPINodeRequest{ApiNodeId: apiNodeId})
 			if err != nil {
 				locker.Lock()
 				results = append(results, &MessageResult{
@@ -257,7 +263,7 @@ func SendMessageToNodeIds(ctx context.Context, nodeIds []int64, code string, msg
 				continue
 			}
 
-			if apiNodeResp.Node == nil {
+			if apiNodeResp.ApiNode == nil {
 				locker.Lock()
 				results = append(results, &MessageResult{
 					NodeId:   node.Id,
@@ -269,7 +275,7 @@ func SendMessageToNodeIds(ctx context.Context, nodeIds []int64, code string, msg
 				wg.Done()
 				continue
 			}
-			apiNode := apiNodeResp.Node
+			apiNode := apiNodeResp.ApiNode
 
 			apiRPCClient, err := rpc.NewRPCClient(&configs.APIConfig{
 				RPC: struct {
@@ -279,7 +285,7 @@ func SendMessageToNodeIds(ctx context.Context, nodeIds []int64, code string, msg
 				},
 				NodeId: apiNode.UniqueId,
 				Secret: apiNode.Secret,
-			})
+			}, false)
 			if err != nil {
 				locker.Lock()
 				results = append(results, &MessageResult{
@@ -337,5 +343,10 @@ func SendMessageToNodeIds(ctx context.Context, nodeIds []int64, code string, msg
 		})
 	}
 
+	// 关闭RPC
+	for _, rpcClient := range rpcMap {
+		_ = rpcClient.Close()
+	}
+
 	return
 }

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

@@ -73,7 +73,7 @@ func (this *InstallAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
-	apiNodes := apiNodesResp.Nodes
+	apiNodes := apiNodesResp.ApiNodes
 	apiEndpoints := []string{}
 	for _, apiNode := range apiNodes {
 		if !apiNode.IsOn {

internal/web/actions/default/recover/updateHosts.go

@@ -42,7 +42,7 @@ func (this *UpdateHostsAction) RunPost(params struct {
 		},
 		NodeId: params.NodeId,
 		Secret: params.NodeSecret,
-	})
+	}, false)
 	if err != nil {
 		this.FailField("host", "测试API节点时出错，请检查配置，错误信息："+err.Error())
 	}
@@ -51,6 +51,10 @@ func (this *UpdateHostsAction) RunPost(params struct {
 		this.FailField("host", "无法连接此API节点，错误信息："+err.Error())
 	}
 
+	defer func() {
+		_ = client.Close()
+	}()
+
 	// 获取管理员节点信息
 	apiTokensResp, err := client.APITokenRPC().FindAllEnabledAPITokens(client.APIContext(0), &pb.FindAllEnabledAPITokensRequest{Role: "admin"})
 	if err != nil {
@@ -69,7 +73,7 @@ func (this *UpdateHostsAction) RunPost(params struct {
 		this.Fail("获取API节点列表失败，错误信息：" + err.Error())
 	}
 	var endpoints = []string{}
-	for _, node := range nodesResp.Nodes {
+	for _, node := range nodesResp.ApiNodes {
 		if !node.IsOn {
 			continue
 		}
@@ -144,7 +148,7 @@ func (this *UpdateHostsAction) RunPost(params struct {
 
 		// 保存
 		_, err = client.APINodeRPC().UpdateAPINode(client.Context(0), &pb.UpdateAPINodeRequest{
-			NodeId:          node.Id,
+			ApiNodeId:       node.Id,
 			Name:            node.Name,
 			Description:     node.Description,
 			HttpJSON:        node.HttpJSON,

internal/web/actions/default/recover/validateApi.go

@@ -49,10 +49,15 @@ func (this *ValidateApiAction) RunPost(params struct {
 		},
 		NodeId: params.NodeId,
 		Secret: params.NodeSecret,
-	})
+	}, false)
 	if err != nil {
 		this.FailField("host", "测试API节点时出错，请检查配置，错误信息："+err.Error())
 	}
+
+	defer func() {
+		_ = client.Close()
+	}()
+
 	_, err = client.APINodeRPC().FindCurrentAPINodeVersion(client.APIContext(0), &pb.FindCurrentAPINodeVersionRequest{})
 	if err != nil {
 		this.FailField("host", "无法连接此API节点，错误信息："+err.Error())
@@ -64,7 +69,7 @@ func (this *ValidateApiAction) RunPost(params struct {
 		this.Fail("获取API节点列表失败，错误信息：" + err.Error())
 	}
 	var hosts = []string{}
-	for _, node := range nodesResp.Nodes {
+	for _, node := range nodesResp.ApiNodes {
 		if !node.IsOn {
 			continue
 		}

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

@@ -16,7 +16,7 @@ func (this *DeleteAction) RunPost(params struct {
 	// 创建日志
 	defer this.CreateLog(oplogs.LevelInfo, "删除SSL证书 %d", params.CertId)
 
-	// 是否正在被使用
+	// 是否正在被服务使用
 	countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledServersWithSSLCertIdRequest{SslCertId: params.CertId})
 	if err != nil {
 		this.ErrorPage(err)
@@ -26,6 +26,26 @@ func (this *DeleteAction) RunPost(params struct {
 		this.Fail("此证书正在被某些服务引用，请先修改服务后再删除。")
 	}
 
+	// 是否正在被API节点使用
+	countResp, err = this.RPC().APINodeRPC().CountAllEnabledAPINodesWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledAPINodesWithSSLCertIdRequest{SslCertId: params.CertId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if countResp.Count > 0 {
+		this.Fail("此证书正在被某些API节点引用，请先修改API节点后再删除")
+	}
+
+	// 是否正在被用户节点使用
+	countResp, err = this.RPC().UserNodeRPC().CountAllEnabledUserNodesWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledUserNodesWithSSLCertIdRequest{SslCertId: params.CertId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if countResp.Count > 0 {
+		this.Fail("此证书正在被某些用户节点引用，请先修改用户节点后再删除")
+	}
+
 	_, err = this.RPC().SSLCertRPC().DeleteSSLCert(this.AdminContext(), &pb.DeleteSSLCertRequest{SslCertId: params.CertId})
 	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/ipadmin/lists.go

@@ -59,14 +59,56 @@ func (this *ListsAction) RunGet(params struct {
 			expiredTime = timeutil.FormatTime("Y-m-d H:i:s", item.ExpiredAt)
 		}
 
+		// policy
+		var sourcePolicyMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallPolicy != nil {
+			sourcePolicyMap = maps.Map{
+				"id":       item.SourceHTTPFirewallPolicy.Id,
+				"name":     item.SourceHTTPFirewallPolicy.Name,
+				"serverId": item.SourceHTTPFirewallPolicy.ServerId,
+			}
+		}
+
+		// group
+		var sourceGroupMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallRuleGroup != nil {
+			sourceGroupMap = maps.Map{
+				"id":   item.SourceHTTPFirewallRuleGroup.Id,
+				"name": item.SourceHTTPFirewallRuleGroup.Name,
+			}
+		}
+
+		// set
+		var sourceSetMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallRuleSet != nil {
+			sourceSetMap = maps.Map{
+				"id":   item.SourceHTTPFirewallRuleSet.Id,
+				"name": item.SourceHTTPFirewallRuleSet.Name,
+			}
+		}
+
+		// server
+		var sourceServerMap = maps.Map{"id": 0}
+		if item.SourceServer != nil {
+			sourceServerMap = maps.Map{
+				"id":   item.SourceServer.Id,
+				"name": item.SourceServer.Name,
+			}
+		}
+
 		itemMaps = append(itemMaps, maps.Map{
 			"id":             item.Id,
 			"ipFrom":         item.IpFrom,
 			"ipTo":           item.IpTo,
+			"createdTime":    timeutil.FormatTime("Y-m-d", item.CreatedAt),
 			"expiredTime":    expiredTime,
 			"reason":         item.Reason,
 			"type":           item.Type,
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(item.EventLevel),
+			"sourcePolicy":   sourcePolicyMap,
+			"sourceGroup":    sourceGroupMap,
+			"sourceSet":      sourceSetMap,
+			"sourceServer":   sourceServerMap,
 		})
 	}
 	this.Data["items"] = itemMaps

internal/web/actions/default/servers/components/waf/ipadmin/test.go

@@ -60,6 +60,7 @@ func (this *TestAction) RunPost(params struct {
 			"ipFrom":         resp.IpItem.IpFrom,
 			"ipTo":           resp.IpItem.IpTo,
 			"reason":         resp.IpItem.Reason,
+			"createdTime":    timeutil.FormatTime("Y-m-d", resp.IpItem.CreatedAt),
 			"expiredAt":      resp.IpItem.ExpiredAt,
 			"expiredTime":    timeutil.FormatTime("Y-m-d H:i:s", resp.IpItem.ExpiredAt),
 			"type":           resp.IpItem.Type,

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

@@ -57,14 +57,26 @@ func (this *CreateAction) RunGet(params struct{}) {
 	// 服务类型
 	this.Data["serverTypes"] = serverconfigs.AllServerTypes()
 
+	// 检查是否有用户
+	countUsersResp, err := this.RPC().UserRPC().CountAllEnabledUsers(this.AdminContext(), &pb.CountAllEnabledUsersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["hasUsers"] = countUsersResp.Count > 0
+
 	this.Show()
 }
 
 func (this *CreateAction) RunPost(params struct {
 	Name        string
 	Description string
-	ClusterId   int64
-	GroupIds    []int64
+
+	UserId     int64
+	UserPlanId int64
+	ClusterId  int64
+
+	GroupIds []int64
 
 	ServerType  string
 	Addresses   string
@@ -86,11 +98,24 @@ func (this *CreateAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入服务名称")
 
-	if params.ClusterId <= 0 {
-		this.Fail("请选择部署的集群")
+	var clusterId = params.ClusterId
+
+	// 用户
+	var userId = params.UserId
+	if userId > 0 {
+		clusterIdResp, err := this.RPC().UserRPC().FindUserNodeClusterId(this.AdminContext(), &pb.FindUserNodeClusterIdRequest{UserId: userId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		clusterId = clusterIdResp.NodeClusterId
+		if clusterId <= 0 {
+			this.Fail("请选择部署的集群")
+		}
 	}
 
-	// TODO 验证集群ID
+	// 套餐
+	var userPlanId = params.UserPlanId
 
 	// 端口地址
 	var httpConfig *serverconfigs.HTTPProtocolConfig = nil
@@ -260,7 +285,7 @@ func (this *CreateAction) RunPost(params struct {
 		if len(allServerNames) > 0 {
 			dupResp, err := this.RPC().ServerRPC().CheckServerNameDuplicationInNodeCluster(this.AdminContext(), &pb.CheckServerNameDuplicationInNodeClusterRequest{
 				ServerNames:   allServerNames,
-				NodeClusterId: params.ClusterId,
+				NodeClusterId: clusterId,
 			})
 			if err != nil {
 				this.ErrorPage(err)
@@ -339,7 +364,7 @@ func (this *CreateAction) RunPost(params struct {
 			this.ErrorPage(err)
 			return
 		}
-		webId = webResp.WebId
+		webId = webResp.HttpWebId
 	}
 
 	// 包含条件
@@ -359,13 +384,14 @@ func (this *CreateAction) RunPost(params struct {
 	}
 
 	req := &pb.CreateServerRequest{
-		UserId:           0,
+		UserId:           userId,
+		UserPlanId:       userPlanId,
 		AdminId:          this.AdminId(),
 		Type:             params.ServerType,
 		Name:             params.Name,
 		ServerNamesJON:   []byte(params.ServerNames),
 		Description:      params.Description,
-		NodeClusterId:    params.ClusterId,
+		NodeClusterId:    clusterId,
 		IncludeNodesJSON: includeNodesJSON,
 		ExcludeNodesJSON: excludeNodesJSON,
 		WebId:            webId,
@@ -436,7 +462,7 @@ 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,
@@ -475,7 +501,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,
@@ -496,7 +522,7 @@ func (this *CreateAction) RunPost(params struct {
 					AddStatusHeader: true,
 					PurgeIsOn:       false,
 					PurgeKey:        "",
-					CacheRefs:       nil,
+					CacheRefs:       []*serverconfigs.HTTPCacheRef{},
 				}
 				cacheConfigJSON, err := json.Marshal(cacheConfig)
 				if err != nil {
@@ -504,7 +530,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 {
@@ -526,7 +552,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 {
@@ -549,7 +575,7 @@ 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 {

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/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/waf/ipadmin/allowList.go

@@ -70,15 +70,57 @@ func (this *AllowListAction) RunGet(params struct {
 			expiredTime = timeutil.FormatTime("Y-m-d H:i:s", item.ExpiredAt)
 		}
 
+		// policy
+		var sourcePolicyMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallPolicy != nil {
+			sourcePolicyMap = maps.Map{
+				"id":       item.SourceHTTPFirewallPolicy.Id,
+				"name":     item.SourceHTTPFirewallPolicy.Name,
+				"serverId": item.SourceHTTPFirewallPolicy.ServerId,
+			}
+		}
+
+		// group
+		var sourceGroupMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallRuleGroup != nil {
+			sourceGroupMap = maps.Map{
+				"id":   item.SourceHTTPFirewallRuleGroup.Id,
+				"name": item.SourceHTTPFirewallRuleGroup.Name,
+			}
+		}
+
+		// set
+		var sourceSetMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallRuleSet != nil {
+			sourceSetMap = maps.Map{
+				"id":   item.SourceHTTPFirewallRuleSet.Id,
+				"name": item.SourceHTTPFirewallRuleSet.Name,
+			}
+		}
+
+		// server
+		var sourceServerMap = maps.Map{"id": 0}
+		if item.SourceServer != nil {
+			sourceServerMap = maps.Map{
+				"id":   item.SourceServer.Id,
+				"name": item.SourceServer.Name,
+			}
+		}
+
 		itemMaps = append(itemMaps, maps.Map{
 			"id":             item.Id,
 			"ipFrom":         item.IpFrom,
 			"ipTo":           item.IpTo,
+			"createdTime":    timeutil.FormatTime("Y-m-d", item.CreatedAt),
 			"expiredTime":    expiredTime,
 			"reason":         item.Reason,
 			"type":           item.Type,
 			"isExpired":      item.ExpiredAt > 0 && item.ExpiredAt < time.Now().Unix(),
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(item.EventLevel),
+			"sourcePolicy":   sourcePolicyMap,
+			"sourceGroup":    sourceGroupMap,
+			"sourceSet":      sourceSetMap,
+			"sourceServer":   sourceServerMap,
 		})
 	}
 	this.Data["items"] = itemMaps

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

@@ -70,15 +70,57 @@ func (this *DenyListAction) RunGet(params struct {
 			expiredTime = timeutil.FormatTime("Y-m-d H:i:s", item.ExpiredAt)
 		}
 
+		// policy
+		var sourcePolicyMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallPolicy != nil {
+			sourcePolicyMap = maps.Map{
+				"id":       item.SourceHTTPFirewallPolicy.Id,
+				"name":     item.SourceHTTPFirewallPolicy.Name,
+				"serverId": item.SourceHTTPFirewallPolicy.ServerId,
+			}
+		}
+
+		// group
+		var sourceGroupMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallRuleGroup != nil {
+			sourceGroupMap = maps.Map{
+				"id":   item.SourceHTTPFirewallRuleGroup.Id,
+				"name": item.SourceHTTPFirewallRuleGroup.Name,
+			}
+		}
+
+		// set
+		var sourceSetMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallRuleSet != nil {
+			sourceSetMap = maps.Map{
+				"id":   item.SourceHTTPFirewallRuleSet.Id,
+				"name": item.SourceHTTPFirewallRuleSet.Name,
+			}
+		}
+
+		// server
+		var sourceServerMap = maps.Map{"id": 0}
+		if item.SourceServer != nil {
+			sourceServerMap = maps.Map{
+				"id":   item.SourceServer.Id,
+				"name": item.SourceServer.Name,
+			}
+		}
+
 		itemMaps = append(itemMaps, maps.Map{
 			"id":             item.Id,
 			"ipFrom":         item.IpFrom,
 			"ipTo":           item.IpTo,
+			"createdTime":    timeutil.FormatTime("Y-m-d", item.CreatedAt),
 			"expiredTime":    expiredTime,
 			"reason":         item.Reason,
 			"type":           item.Type,
 			"isExpired":      item.ExpiredAt > 0 && item.ExpiredAt < time.Now().Unix(),
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(item.EventLevel),
+			"sourcePolicy":   sourcePolicyMap,
+			"sourceGroup":    sourceGroupMap,
+			"sourceSet":      sourceSetMap,
+			"sourceServer":   sourceServerMap,
 		})
 	}
 	this.Data["items"] = itemMaps

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

@@ -74,6 +74,7 @@ func (this *TestAction) RunPost(params struct {
 			"ipTo":           resp.IpItem.IpTo,
 			"reason":         resp.IpItem.Reason,
 			"expiredAt":      resp.IpItem.ExpiredAt,
+			"createdTime":    timeutil.FormatTime("Y-m-d", resp.IpItem.CreatedAt),
 			"expiredTime":    timeutil.FormatTime("Y-m-d H:i:s", resp.IpItem.ExpiredAt),
 			"type":           resp.IpItem.Type,
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(resp.IpItem.EventLevel),

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

@@ -2,6 +2,7 @@ package servers
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/users"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
 )
@@ -24,6 +25,12 @@ func init() {
 			GetPost("/addOriginPopup", new(AddOriginPopupAction)).
 			Get("/serverNamesPopup", new(ServerNamesPopupAction)).
 			Post("/status", new(StatusAction)).
+
+			//
+			Post("/users/options", new(users.OptionsAction)).
+			Post("/users/plans", new(users.PlansAction)).
+
+			//
 			EndAll()
 	})
 }

internal/web/actions/default/servers/iplists/createPopup.go

@@ -29,6 +29,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	Name        string
 	Type        string
 	Description string
+	IsGlobal    bool
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -49,6 +50,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		TimeoutJSON: nil,
 		IsPublic:    true,
 		Description: params.Description,
+		IsGlobal:    params.IsGlobal,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/iplists/deleteItems.go

@@ -0,0 +1,37 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package iplists
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/types"
+	"strings"
+)
+
+type DeleteItemsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *DeleteItemsAction) RunPost(params struct {
+	ItemIds []int64
+}) {
+	if len(params.ItemIds) == 0 {
+		this.Success()
+	}
+
+	var itemIdStrings = []string{}
+	for _, itemId := range params.ItemIds {
+		itemIdStrings = append(itemIdStrings, types.String(itemId))
+	}
+
+	defer this.CreateLogInfo("批量删除IP名单中的IP：" + strings.Join(itemIdStrings, ", "))
+
+	_, err := this.RPC().IPItemRPC().DeleteIPItems(this.AdminContext(), &pb.DeleteIPItemsRequest{IpItemIds: params.ItemIds})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}

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

@@ -5,8 +5,10 @@ package iplists
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ipconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
 	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+	"time"
 )
 
 type IndexAction struct {
@@ -18,59 +20,123 @@ func (this *IndexAction) Init() {
 }
 
 func (this *IndexAction) RunGet(params struct {
-	Type    string
-	Keyword string
+	Ip         string
+	GlobalOnly bool
 }) {
-	if len(params.Type) == 0 {
-		params.Type = ipconfigs.IPListTypeBlack
-	}
-	this.Data["type"] = params.Type
-	this.Data["keyword"] = params.Keyword
+	this.Data["type"] = ""
+	this.Data["ip"] = params.Ip
+	this.Data["globalOnly"] = params.GlobalOnly
 
-	countResp, err := this.RPC().IPListRPC().CountAllEnabledIPLists(this.AdminContext(), &pb.CountAllEnabledIPListsRequest{
-		Type:     params.Type,
-		IsPublic: true,
-		Keyword:  params.Keyword,
+	countResp, err := this.RPC().IPItemRPC().CountAllEnabledIPItems(this.AdminContext(), &pb.CountAllEnabledIPItemsRequest{
+		Ip:         params.Ip,
+		GlobalOnly: params.GlobalOnly,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	count := countResp.Count
-	page := this.NewPage(count)
+	var count = countResp.Count
+	var page = this.NewPage(count)
 	this.Data["page"] = page.AsHTML()
 
-	listsResp, err := this.RPC().IPListRPC().ListEnabledIPLists(this.AdminContext(), &pb.ListEnabledIPListsRequest{
-		Type:     params.Type,
-		IsPublic: true,
-		Keyword:  params.Keyword,
-		Offset:   page.Offset,
-		Size:     page.Size,
+	itemsResp, err := this.RPC().IPItemRPC().ListAllEnabledIPItems(this.AdminContext(), &pb.ListAllEnabledIPItemsRequest{
+		Ip:         params.Ip,
+		GlobalOnly: params.GlobalOnly,
+		Offset:     page.Offset,
+		Size:       page.Size,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	var listMaps = []maps.Map{}
-	for _, list := range listsResp.IpLists {
-		// 包含的IP数量
-		countItemsResp, err := this.RPC().IPItemRPC().CountIPItemsWithListId(this.AdminContext(), &pb.CountIPItemsWithListIdRequest{IpListId: list.Id})
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
-		var countItems = countItemsResp.Count
 
-		listMaps = append(listMaps, maps.Map{
-			"id":          list.Id,
-			"isOn":        list.IsOn,
-			"name":        list.Name,
-			"description": list.Description,
-			"countItems":  countItems,
-			"type":        list.Type,
+	var itemMaps = []maps.Map{}
+	for _, result := range itemsResp.Results {
+		var item = result.IpItem
+		expiredTime := ""
+		if item.ExpiredAt > 0 {
+			expiredTime = timeutil.FormatTime("Y-m-d H:i:s", item.ExpiredAt)
+		}
+
+		// policy
+		var sourcePolicyMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallPolicy != nil {
+			sourcePolicyMap = maps.Map{
+				"id":       item.SourceHTTPFirewallPolicy.Id,
+				"name":     item.SourceHTTPFirewallPolicy.Name,
+				"serverId": item.SourceHTTPFirewallPolicy.ServerId,
+			}
+		}
+
+		// group
+		var sourceGroupMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallRuleGroup != nil {
+			sourceGroupMap = maps.Map{
+				"id":   item.SourceHTTPFirewallRuleGroup.Id,
+				"name": item.SourceHTTPFirewallRuleGroup.Name,
+			}
+		}
+
+		// set
+		var sourceSetMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallRuleSet != nil {
+			sourceSetMap = maps.Map{
+				"id":   item.SourceHTTPFirewallRuleSet.Id,
+				"name": item.SourceHTTPFirewallRuleSet.Name,
+			}
+		}
+
+		// server
+		var sourceServerMap = maps.Map{"id": 0}
+		if item.SourceServer != nil {
+			sourceServerMap = maps.Map{
+				"id":   item.SourceServer.Id,
+				"name": item.SourceServer.Name,
+			}
+		}
+
+		// IP名单
+		var listMap = maps.Map{"id": 0}
+		if result.IpList != nil {
+			listMap = maps.Map{
+				"id":   result.IpList.Id,
+				"name": result.IpList.Name,
+				"type": result.IpList.Type,
+			}
+		}
+
+		// policy
+		var policyMap = maps.Map{"id": 0}
+		if result.HttpFirewallPolicy != nil {
+			policyMap = maps.Map{
+				"id":   result.HttpFirewallPolicy.Id,
+				"name": result.HttpFirewallPolicy.Name,
+			}
+
+			if result.Server != nil {
+				policyMap["server"] = maps.Map{"id": result.Server.Id, "name": result.Server.Name}
+			}
+		}
+
+		itemMaps = append(itemMaps, maps.Map{
+			"id":             item.Id,
+			"ipFrom":         item.IpFrom,
+			"ipTo":           item.IpTo,
+			"createdTime":    timeutil.FormatTime("Y-m-d", item.CreatedAt),
+			"isExpired":      item.ExpiredAt < time.Now().Unix(),
+			"expiredTime":    expiredTime,
+			"reason":         item.Reason,
+			"type":           item.Type,
+			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(item.EventLevel),
+			"sourcePolicy":   sourcePolicyMap,
+			"sourceGroup":    sourceGroupMap,
+			"sourceSet":      sourceSetMap,
+			"sourceServer":   sourceServerMap,
+			"list":           listMap,
+			"policy":         policyMap,
 		})
 	}
-	this.Data["lists"] = listMaps
+	this.Data["items"] = itemMaps
 
 	this.Show()
 }

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

@@ -14,12 +14,14 @@ func init() {
 			Data("teaSubMenu", "iplist").
 			Prefix("/servers/iplists").
 			Get("", new(IndexAction)).
+			Get("/lists", new(ListsAction)).
 			GetPost("/createPopup", new(CreatePopupAction)).
 			Get("/list", new(ListAction)).
 			GetPost("/import", new(ImportAction)).
 			GetPost("/export", new(ExportAction)).
 			Get("/exportData", new(ExportDataAction)).
 			Post("/delete", new(DeleteAction)).
+			Post("/deleteItems", new(DeleteItemsAction)).
 			GetPost("/test", new(TestAction)).
 			GetPost("/update", new(UpdateAction)).
 			Get("/items", new(ItemsAction)).
@@ -38,7 +40,6 @@ func init() {
 
 			// 选项数据
 			Post("/levelOptions", new(LevelOptionsAction)).
-
 			EndAll()
 	})
 }

internal/web/actions/default/servers/iplists/items.go

@@ -62,14 +62,56 @@ func (this *ItemsAction) RunGet(params struct {
 			expiredTime = timeutil.FormatTime("Y-m-d H:i:s", item.ExpiredAt)
 		}
 
+		// policy
+		var sourcePolicyMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallPolicy != nil {
+			sourcePolicyMap = maps.Map{
+				"id":       item.SourceHTTPFirewallPolicy.Id,
+				"name":     item.SourceHTTPFirewallPolicy.Name,
+				"serverId": item.SourceHTTPFirewallPolicy.ServerId,
+			}
+		}
+
+		// group
+		var sourceGroupMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallRuleGroup != nil {
+			sourceGroupMap = maps.Map{
+				"id":   item.SourceHTTPFirewallRuleGroup.Id,
+				"name": item.SourceHTTPFirewallRuleGroup.Name,
+			}
+		}
+
+		// set
+		var sourceSetMap = maps.Map{"id": 0}
+		if item.SourceHTTPFirewallRuleSet != nil {
+			sourceSetMap = maps.Map{
+				"id":   item.SourceHTTPFirewallRuleSet.Id,
+				"name": item.SourceHTTPFirewallRuleSet.Name,
+			}
+		}
+
+		// server
+		var sourceServerMap = maps.Map{"id": 0}
+		if item.SourceServer != nil {
+			sourceServerMap = maps.Map{
+				"id":   item.SourceServer.Id,
+				"name": item.SourceServer.Name,
+			}
+		}
+
 		itemMaps = append(itemMaps, maps.Map{
 			"id":             item.Id,
 			"ipFrom":         item.IpFrom,
 			"ipTo":           item.IpTo,
+			"createdTime":    timeutil.FormatTime("Y-m-d", item.CreatedAt),
 			"expiredTime":    expiredTime,
 			"reason":         item.Reason,
 			"type":           item.Type,
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(item.EventLevel),
+			"sourcePolicy":   sourcePolicyMap,
+			"sourceGroup":    sourceGroupMap,
+			"sourceSet":      sourceSetMap,
+			"sourceServer":   sourceServerMap,
 		})
 	}
 	this.Data["items"] = itemMaps

internal/web/actions/default/servers/iplists/lists.go

@@ -0,0 +1,77 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package iplists
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/ipconfigs"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type ListsAction struct {
+	actionutils.ParentAction
+}
+
+func (this *ListsAction) Init() {
+	this.Nav("", "", "lists")
+}
+
+func (this *ListsAction) RunGet(params struct {
+	Type    string
+	Keyword string
+}) {
+	if len(params.Type) == 0 {
+		params.Type = ipconfigs.IPListTypeBlack
+	}
+	this.Data["type"] = params.Type
+	this.Data["keyword"] = params.Keyword
+
+	countResp, err := this.RPC().IPListRPC().CountAllEnabledIPLists(this.AdminContext(), &pb.CountAllEnabledIPListsRequest{
+		Type:     params.Type,
+		IsPublic: true,
+		Keyword:  params.Keyword,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	count := countResp.Count
+	page := this.NewPage(count)
+	this.Data["page"] = page.AsHTML()
+
+	listsResp, err := this.RPC().IPListRPC().ListEnabledIPLists(this.AdminContext(), &pb.ListEnabledIPListsRequest{
+		Type:     params.Type,
+		IsPublic: true,
+		Keyword:  params.Keyword,
+		Offset:   page.Offset,
+		Size:     page.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var listMaps = []maps.Map{}
+	for _, list := range listsResp.IpLists {
+		// 包含的IP数量
+		countItemsResp, err := this.RPC().IPItemRPC().CountIPItemsWithListId(this.AdminContext(), &pb.CountIPItemsWithListIdRequest{IpListId: list.Id})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		var countItems = countItemsResp.Count
+
+		listMaps = append(listMaps, maps.Map{
+			"id":          list.Id,
+			"isOn":        list.IsOn,
+			"name":        list.Name,
+			"description": list.Description,
+			"countItems":  countItems,
+			"type":        list.Type,
+			"isGlobal":    list.IsGlobal,
+		})
+	}
+	this.Data["lists"] = listMaps
+
+	this.Show()
+}

internal/web/actions/default/servers/iplists/test.go

@@ -62,6 +62,7 @@ func (this *TestAction) RunPost(params struct {
 			"ipTo":           resp.IpItem.IpTo,
 			"reason":         resp.IpItem.Reason,
 			"expiredAt":      resp.IpItem.ExpiredAt,
+			"createdTime":    timeutil.FormatTime("Y-m-d", resp.IpItem.CreatedAt),
 			"expiredTime":    timeutil.FormatTime("Y-m-d H:i:s", resp.IpItem.ExpiredAt),
 			"type":           resp.IpItem.Type,
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(resp.IpItem.EventLevel),

internal/web/actions/default/servers/iplists/utils.go

@@ -47,6 +47,7 @@ func InitIPList(action *actionutils.ParentAction, listId int64) error {
 		"description": list.Description,
 		"isOn":        list.IsOn,
 		"countItems":  countItems,
+		"isGlobal":    list.IsGlobal,
 	}
 	return nil
 }

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

@@ -79,6 +79,7 @@ func (this *IndexAction) RunPost(params struct {
 		this.ErrorPage(err)
 		return
 	}
+
 	err = cacheConfig.Init()
 	if err != nil {
 		this.Fail("检查配置失败：" + err.Error())
@@ -96,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/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/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/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/index.go

@@ -64,6 +64,36 @@ func (this *IndexAction) RunGet(params struct {
 		this.Data["user"] = nil
 	}
 
+	// 套餐
+	var userPlanMap = maps.Map{"id": server.UserPlanId, "dayTo": "", "plan": maps.Map{}}
+	if server.UserPlanId > 0 {
+		userPlanResp, err := this.RPC().UserPlanRPC().FindEnabledUserPlan(this.AdminContext(), &pb.FindEnabledUserPlanRequest{UserPlanId: server.UserPlanId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		var userPlan = userPlanResp.UserPlan
+		if userPlan != nil {
+			planResp, err := this.RPC().PlanRPC().FindEnabledPlan(this.AdminContext(), &pb.FindEnabledPlanRequest{PlanId: userPlan.PlanId})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			var plan = planResp.Plan
+			if plan != nil {
+				userPlanMap = maps.Map{
+					"id":    userPlan.Id,
+					"dayTo": userPlan.DayTo,
+					"plan": maps.Map{
+						"id":   plan.Id,
+						"name": plan.Name,
+					},
+				}
+			}
+		}
+	}
+	this.Data["userPlan"] = userPlanMap
+
 	// 集群
 	clusterId := int64(0)
 	this.Data["clusterName"] = ""
@@ -123,6 +153,7 @@ func (this *IndexAction) RunPost(params struct {
 	ClusterId   int64
 	GroupIds    []int64
 	IsOn        bool
+	UserPlanId  int64
 
 	Must *actions.Must
 }) {
@@ -137,6 +168,7 @@ func (this *IndexAction) RunPost(params struct {
 		this.Fail("请选择部署的集群")
 	}
 
+	// 修改基本信息
 	_, err := this.RPC().ServerRPC().UpdateServerBasic(this.AdminContext(), &pb.UpdateServerBasicRequest{
 		ServerId:       params.ServerId,
 		Name:           params.Name,
@@ -150,5 +182,17 @@ func (this *IndexAction) RunPost(params struct {
 		return
 	}
 
+	// 修改套餐
+	if params.UserPlanId > 0 {
+		_, err = this.RPC().ServerRPC().UpdateServerUserPlan(this.AdminContext(), &pb.UpdateServerUserPlanRequest{
+			ServerId:   params.ServerId,
+			UserPlanId: params.UserPlanId,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
 	this.Success()
 }

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

@@ -123,7 +123,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/locationutils/location_helper.go

@@ -98,7 +98,7 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString
 		"name":     "缓存",
 		"url":      "/servers/server/settings/locations/cache?serverId=" + serverIdString + "&locationId=" + locationIdString,
 		"isActive": secondMenuItem == "cache",
-		"isOn":     locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Cache != nil && locationConfig.Web.Cache.IsPrior && locationConfig.Web.Cache.IsOn && len(locationConfig.Web.Cache.CacheRefs) > 0,
+		"isOn":     locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Cache != nil && locationConfig.Web.Cache.IsPrior && locationConfig.Web.Cache.IsOn,
 	})
 	menuItems = append(menuItems, maps.Map{
 		"name":     "访问控制",

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 {