集群可以设置默认的WAF策略、缓存策略

2026-02-13 02:05:38 +08:00 · 2020-12-17 15:50:44 +08:00
parent ee549b945d
commit 41ac159e23
100 changed files with 1172 additions and 488 deletions
--- a/internal/web/actions/default/clusters/cluster/createBatch.go
+++ b/internal/web/actions/default/clusters/cluster/createBatch.go
@@ -77,11 +77,11 @@ func (this *CreateBatchAction) RunPost(params struct {
 	// 保存
 	for _, ip := range realIPList {
 		resp, err := this.RPC().NodeRPC().CreateNode(this.AdminContext(), &pb.CreateNodeRequest{
-			Name:      ip,
-			ClusterId: params.ClusterId,
-			GroupId:   params.GroupId,
-			RegionId:  params.RegionId,
-			Login:     nil,
+			Name:          ip,
+			NodeClusterId: params.ClusterId,
+			GroupId:       params.GroupId,
+			RegionId:      params.RegionId,
+			Login:         nil,
 		})
 		if err != nil {
 			this.ErrorPage(err)
--- a/internal/web/actions/default/clusters/cluster/createNode.go
+++ b/internal/web/actions/default/clusters/cluster/createNode.go
@@ -118,13 +118,13 @@ func (this *CreateNodeAction) RunPost(params struct {

 	// 保存
 	createResp, err := this.RPC().NodeRPC().CreateNode(this.AdminContext(), &pb.CreateNodeRequest{
-		Name:        params.Name,
-		ClusterId:   params.ClusterId,
-		GroupId:     params.GroupId,
-		RegionId:    params.RegionId,
-		Login:       loginInfo,
-		DnsDomainId: params.DnsDomainId,
-		DnsRoutes:   dnsRouteCodes,
+		Name:          params.Name,
+		NodeClusterId: params.ClusterId,
+		GroupId:       params.GroupId,
+		RegionId:      params.RegionId,
+		Login:         loginInfo,
+		DnsDomainId:   params.DnsDomainId,
+		DnsRoutes:     dnsRouteCodes,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/clusters/cluster/delete.go
+++ b/internal/web/actions/default/clusters/cluster/delete.go
@@ -33,7 +33,7 @@ func (this *DeleteAction) RunPost(params struct {
 	}

 	// 删除
-	_, err = this.RPC().NodeClusterRPC().DeleteNodeCluster(this.AdminContext(), &pb.DeleteNodeClusterRequest{ClusterId: params.ClusterId})
+	_, err = this.RPC().NodeClusterRPC().DeleteNodeCluster(this.AdminContext(), &pb.DeleteNodeClusterRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
--- a/internal/web/actions/default/clusters/cluster/groups/createPopup.go
+++ b/internal/web/actions/default/clusters/cluster/groups/createPopup.go
@@ -34,8 +34,8 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入分组名称")
 	createResp, err := this.RPC().NodeGroupRPC().CreateNodeGroup(this.AdminContext(), &pb.CreateNodeGroupRequest{
-		ClusterId: params.ClusterId,
-		Name:      params.Name,
+		NodeClusterId: params.ClusterId,
+		Name:          params.Name,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/clusters/cluster/groups/index.go
+++ b/internal/web/actions/default/clusters/cluster/groups/index.go
@@ -19,7 +19,7 @@ func (this *IndexAction) RunGet(params struct {
 	ClusterId int64
 }) {
 	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{
-		ClusterId: params.ClusterId,
+		NodeClusterId: params.ClusterId,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/clusters/cluster/groups/selectPopup.go
+++ b/internal/web/actions/default/clusters/cluster/groups/selectPopup.go
@@ -18,7 +18,7 @@ func (this *SelectPopupAction) Init() {
 func (this *SelectPopupAction) RunGet(params struct {
 	ClusterId int64
 }) {
-	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{ClusterId: params.ClusterId})
+	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 	}
--- a/internal/web/actions/default/clusters/cluster/index.go
+++ b/internal/web/actions/default/clusters/cluster/index.go
@@ -37,12 +37,12 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["keyword"] = params.Keyword

 	countResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
-		ClusterId:    params.ClusterId,
-		GroupId:      params.GroupId,
-		RegionId:     params.RegionId,
-		InstallState: types.Int32(params.InstalledState),
-		ActiveState:  types.Int32(params.ActiveState),
-		Keyword:      params.Keyword,
+		NodeClusterId: params.ClusterId,
+		GroupId:       params.GroupId,
+		RegionId:      params.RegionId,
+		InstallState:  types.Int32(params.InstalledState),
+		ActiveState:   types.Int32(params.ActiveState),
+		Keyword:       params.Keyword,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -53,14 +53,14 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["page"] = page.AsHTML()

 	nodesResp, err := this.RPC().NodeRPC().ListEnabledNodesMatch(this.AdminContext(), &pb.ListEnabledNodesMatchRequest{
-		Offset:       page.Offset,
-		Size:         page.Size,
-		ClusterId:    params.ClusterId,
-		GroupId:      params.GroupId,
-		RegionId:     params.RegionId,
-		InstallState: types.Int32(params.InstalledState),
-		ActiveState:  types.Int32(params.ActiveState),
-		Keyword:      params.Keyword,
+		Offset:        page.Offset,
+		Size:          page.Size,
+		NodeClusterId: params.ClusterId,
+		GroupId:       params.GroupId,
+		RegionId:      params.RegionId,
+		InstallState:  types.Int32(params.InstalledState),
+		ActiveState:   types.Int32(params.ActiveState),
+		Keyword:       params.Keyword,
 	})
 	nodeMaps := []maps.Map{}
 	for _, node := range nodesResp.Nodes {
@@ -154,7 +154,7 @@ func (this *IndexAction) RunGet(params struct {
 	// 所有分组
 	groupMaps := []maps.Map{}
 	groupsResp, err := this.RPC().NodeGroupRPC().FindAllEnabledNodeGroupsWithClusterId(this.AdminContext(), &pb.FindAllEnabledNodeGroupsWithClusterIdRequest{
-		ClusterId: params.ClusterId,
+		NodeClusterId: params.ClusterId,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/clusters/cluster/installManual.go
+++ b/internal/web/actions/default/clusters/cluster/installManual.go
@@ -21,7 +21,7 @@ func (this *InstallManualAction) RunGet(params struct {
 }) {
 	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(params.ClusterId, "manual")

-	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{ClusterId: params.ClusterId})
+	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
--- a/internal/web/actions/default/clusters/cluster/installNodes.go
+++ b/internal/web/actions/default/clusters/cluster/installNodes.go
@@ -21,7 +21,7 @@ func (this *InstallNodesAction) RunGet(params struct {
 }) {
 	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(params.ClusterId, "register")

-	clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{ClusterId: params.ClusterId})
+	clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -33,7 +33,7 @@ func (this *InstallNodesAction) RunGet(params struct {

 	cluster := clusterResp.Cluster

-	clusterAPINodesResp, err := this.RPC().NodeClusterRPC().FindAPINodesWithNodeCluster(this.AdminContext(), &pb.FindAPINodesWithNodeClusterRequest{ClusterId: params.ClusterId})
+	clusterAPINodesResp, err := this.RPC().NodeClusterRPC().FindAPINodesWithNodeCluster(this.AdminContext(), &pb.FindAPINodesWithNodeClusterRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
--- a/internal/web/actions/default/clusters/cluster/installRemote.go
+++ b/internal/web/actions/default/clusters/cluster/installRemote.go
@@ -23,7 +23,7 @@ func (this *InstallRemoteAction) RunGet(params struct {
 }) {
 	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(params.ClusterId, "install")

-	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{ClusterId: params.ClusterId})
+	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
--- a/internal/web/actions/default/clusters/cluster/node/install.go
+++ b/internal/web/actions/default/clusters/cluster/node/install.go
@@ -53,7 +53,7 @@ func (this *InstallAction) RunGet(params struct {
 	var clusterMap maps.Map = nil
 	if node.Cluster != nil {
 		clusterId := node.Cluster.Id
-		clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{ClusterId: clusterId})
+		clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: clusterId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
--- a/internal/web/actions/default/clusters/cluster/node/node.go
+++ b/internal/web/actions/default/clusters/cluster/node/node.go
@@ -39,7 +39,7 @@ func (this *NodeAction) RunGet(params struct {
 	var clusterMap maps.Map = nil
 	if node.Cluster != nil {
 		clusterId := node.Cluster.Id
-		clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{ClusterId: clusterId})
+		clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: clusterId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
--- a/internal/web/actions/default/clusters/cluster/node/update.go
+++ b/internal/web/actions/default/clusters/cluster/node/update.go
@@ -247,16 +247,16 @@ func (this *UpdateAction) RunPost(params struct {

 	// 保存
 	_, err := this.RPC().NodeRPC().UpdateNode(this.AdminContext(), &pb.UpdateNodeRequest{
-		NodeId:      params.NodeId,
-		GroupId:     params.GroupId,
-		RegionId:    params.RegionId,
-		Name:        params.Name,
-		ClusterId:   params.ClusterId,
-		Login:       loginInfo,
-		MaxCPU:      params.MaxCPU,
-		IsOn:        params.IsOn,
-		DnsDomainId: params.DnsDomainId,
-		DnsRoutes:   dnsRouteCodes,
+		NodeId:        params.NodeId,
+		GroupId:       params.GroupId,
+		RegionId:      params.RegionId,
+		Name:          params.Name,
+		NodeClusterId: params.ClusterId,
+		Login:         loginInfo,
+		MaxCPU:        params.MaxCPU,
+		IsOn:          params.IsOn,
+		DnsDomainId:   params.DnsDomainId,
+		DnsRoutes:     dnsRouteCodes,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/clusters/cluster/settings/cache/index.go
+++ b/internal/web/actions/default/clusters/cluster/settings/cache/index.go
@@ -0,0 +1,75 @@
+package cache
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "")
+	this.SecondMenu("cache")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	cluster, err := models.SharedNodeClusterDAO.FindEnabledNodeCluster(this.AdminContext(), params.ClusterId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if cluster == nil {
+		this.NotFound("nodeCluster", params.ClusterId)
+		return
+	}
+
+	// 缓存设置
+	this.Data["cachePolicy"] = nil
+	if cluster.HttpCachePolicyId > 0 {
+		cachePolicy, err := models.SharedHTTPCachePolicyDAO.FindEnabledHTTPCachePolicy(this.AdminContext(), cluster.HttpCachePolicyId)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if cachePolicy != nil {
+			this.Data["cachePolicy"] = maps.Map{
+				"id":   cachePolicy.Id,
+				"name": cachePolicy.Name,
+				"isOn": cachePolicy.IsOn,
+			}
+		}
+	}
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	ClusterId     int64
+	CachePolicyId int64
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("设置集群 %d 的缓存策略为 %d", params.ClusterId, params.CachePolicyId)
+
+	if params.CachePolicyId <= 0 {
+		this.Fail("请选择缓存策略")
+	}
+
+	_, err := this.RPC().NodeClusterRPC().UpdateNodeClusterHTTPCachePolicyId(this.AdminContext(), &pb.UpdateNodeClusterHTTPCachePolicyIdRequest{
+		NodeClusterId:     params.ClusterId,
+		HttpCachePolicyId: params.CachePolicyId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Success()
+}
--- a/internal/web/actions/default/clusters/cluster/settings/health.go
+++ b/internal/web/actions/default/clusters/cluster/settings/health.go
@@ -21,7 +21,7 @@ func (this *HealthAction) Init() {
 func (this *HealthAction) RunGet(params struct {
 	ClusterId int64
 }) {
-	configResp, err := this.RPC().NodeClusterRPC().FindNodeClusterHealthCheckConfig(this.AdminContext(), &pb.FindNodeClusterHealthCheckConfigRequest{ClusterId: params.ClusterId})
+	configResp, err := this.RPC().NodeClusterRPC().FindNodeClusterHealthCheckConfig(this.AdminContext(), &pb.FindNodeClusterHealthCheckConfigRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -56,7 +56,7 @@ func (this *HealthAction) RunPost(params struct {
 	}

 	_, err = this.RPC().NodeClusterRPC().UpdateNodeClusterHealthCheck(this.AdminContext(), &pb.UpdateNodeClusterHealthCheckRequest{
-		ClusterId:       params.ClusterId,
+		NodeClusterId:   params.ClusterId,
 		HealthCheckJSON: params.HealthCheckJSON,
 	})
 	if err != nil {
--- a/internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go
+++ b/internal/web/actions/default/clusters/cluster/settings/healthRunPopup.go
@@ -28,7 +28,7 @@ func (this *HealthRunPopupAction) RunPost(params struct {
 	// 创建日志
 	defer this.CreateLog(oplogs.LevelInfo, "执行集群健康检查设置 %d", params.ClusterId)

-	resp, err := this.RPC().NodeClusterRPC().ExecuteNodeClusterHealthCheck(this.AdminContext(), &pb.ExecuteNodeClusterHealthCheckRequest{ClusterId: params.ClusterId})
+	resp, err := this.RPC().NodeClusterRPC().ExecuteNodeClusterHealthCheck(this.AdminContext(), &pb.ExecuteNodeClusterHealthCheckRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.Fail(err.Error())
 	}
--- a/internal/web/actions/default/clusters/cluster/settings/index.go
+++ b/internal/web/actions/default/clusters/cluster/settings/index.go
@@ -21,7 +21,7 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct {
 	ClusterId int64
 }) {
-	clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{ClusterId: params.ClusterId})
+	clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -79,10 +79,10 @@ func (this *IndexAction) RunPost(params struct {
 		Require("请输入集群名称")

 	_, err := this.RPC().NodeClusterRPC().UpdateNodeCluster(this.AdminContext(), &pb.UpdateNodeClusterRequest{
-		ClusterId:  params.ClusterId,
-		Name:       params.Name,
-		GrantId:    params.GrantId,
-		InstallDir: params.InstallDir,
+		NodeClusterId: params.ClusterId,
+		Name:          params.Name,
+		GrantId:       params.GrantId,
+		InstallDir:    params.InstallDir,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/clusters/cluster/settings/init.go
+++ b/internal/web/actions/default/clusters/cluster/settings/init.go
@@ -2,8 +2,10 @@ package settings

 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configloaders"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/cache"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/dns"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/toa"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/waf"
 	clusters "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
 	"github.com/iwind/TeaGo"
@@ -16,9 +18,17 @@ func init() {
 			Helper(clusters.NewClusterHelper()).
 			Prefix("/clusters/cluster/settings").
 			GetPost("", new(IndexAction)).
+
+			// 健康检查
 			GetPost("/health", new(HealthAction)).
 			GetPost("/healthRunPopup", new(HealthRunPopupAction)).

+			// 缓存
+			GetPost("/cache", new(cache.IndexAction)).
+
+			// WAF
+			GetPost("/waf", new(waf.IndexAction)).
+
 			// DNS
 			Prefix("/clusters/cluster/settings/dns").
 			GetPost("", new(dns.IndexAction)).
--- a/internal/web/actions/default/clusters/cluster/settings/waf/index.go
+++ b/internal/web/actions/default/clusters/cluster/settings/waf/index.go
@@ -0,0 +1,75 @@
+package waf
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type IndexAction struct {
+	actionutils.ParentAction
+}
+
+func (this *IndexAction) Init() {
+	this.Nav("", "setting", "")
+	this.SecondMenu("waf")
+}
+
+func (this *IndexAction) RunGet(params struct {
+	ClusterId int64
+}) {
+	cluster, err := models.SharedNodeClusterDAO.FindEnabledNodeCluster(this.AdminContext(), params.ClusterId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if cluster == nil {
+		this.NotFound("nodeCluster", params.ClusterId)
+		return
+	}
+
+	// WAF设置
+	this.Data["firewallPolicy"] = nil
+	if cluster.HttpFirewallPolicyId > 0 {
+		firewallPolicy, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicy(this.AdminContext(), cluster.HttpFirewallPolicyId)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if firewallPolicy != nil {
+			this.Data["firewallPolicy"] = maps.Map{
+				"id":   firewallPolicy.Id,
+				"name": firewallPolicy.Name,
+				"isOn": firewallPolicy.IsOn,
+			}
+		}
+	}
+
+	this.Show()
+}
+
+func (this *IndexAction) RunPost(params struct {
+	ClusterId            int64
+	HttpFirewallPolicyId int64
+
+	Must *actions.Must
+	CSRF *actionutils.CSRF
+}) {
+	defer this.CreateLogInfo("设置集群 %d 的WAF策略为 %d", params.ClusterId, params.HttpFirewallPolicyId)
+
+	if params.HttpFirewallPolicyId <= 0 {
+		this.Fail("请选择WAF策略")
+	}
+
+	_, err := this.RPC().NodeClusterRPC().UpdateNodeClusterHTTPFirewallPolicyId(this.AdminContext(), &pb.UpdateNodeClusterHTTPFirewallPolicyIdRequest{
+		NodeClusterId:        params.ClusterId,
+		HttpFirewallPolicyId: params.HttpFirewallPolicyId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Success()
+}
--- a/internal/web/actions/default/clusters/cluster/upgradeRemote.go
+++ b/internal/web/actions/default/clusters/cluster/upgradeRemote.go
@@ -24,7 +24,7 @@ func (this *UpgradeRemoteAction) RunGet(params struct {
 	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(params.ClusterId, "upgrade")

 	nodes := []maps.Map{}
-	resp, err := this.RPC().NodeRPC().FindAllUpgradeNodesWithClusterId(this.AdminContext(), &pb.FindAllUpgradeNodesWithClusterIdRequest{ClusterId: params.ClusterId})
+	resp, err := this.RPC().NodeRPC().FindAllUpgradeNodesWithClusterId(this.AdminContext(), &pb.FindAllUpgradeNodesWithClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
--- a/internal/web/actions/default/clusters/clusterutils/cluster_helper.go
+++ b/internal/web/actions/default/clusters/clusterutils/cluster_helper.go
@@ -38,7 +38,7 @@ func (this *ClusterHelper) BeforeAction(action *actions.ActionObject) {
 	}

 	if clusterId > 0 {
-		clusterResp, err := rpcClient.NodeClusterRPC().FindEnabledNodeCluster(rpcClient.Context(action.Context.GetInt64("adminId")), &pb.FindEnabledNodeClusterRequest{ClusterId: clusterId})
+		clusterResp, err := rpcClient.NodeClusterRPC().FindEnabledNodeCluster(rpcClient.Context(action.Context.GetInt64("adminId")), &pb.FindEnabledNodeClusterRequest{NodeClusterId: clusterId})
 		if err != nil {
 			logs.Error(err)
 			return
@@ -77,6 +77,16 @@ func (this *ClusterHelper) createSettingMenu(clusterId string, selectedItem stri
 		"url":      "/clusters/cluster/settings?clusterId=" + clusterId,
 		"isActive": selectedItem == "basic",
 	})
+	items = append(items, maps.Map{
+		"name":     "缓存设置",
+		"url":      "/clusters/cluster/settings/cache?clusterId=" + clusterId,
+		"isActive": selectedItem == "cache",
+	})
+	items = append(items, maps.Map{
+		"name":     "WAF设置",
+		"url":      "/clusters/cluster/settings/waf?clusterId=" + clusterId,
+		"isActive": selectedItem == "waf",
+	})
 	items = append(items, maps.Map{
 		"name":     "健康检查",
 		"url":      "/clusters/cluster/settings/health?clusterId=" + clusterId,
--- a/internal/web/actions/default/clusters/create.go
+++ b/internal/web/actions/default/clusters/create.go
@@ -30,6 +30,12 @@ func (this *CreateAction) RunGet(params struct{}) {
 func (this *CreateAction) RunPost(params struct {
 	Name string

+	// 缓存策略
+	CachePolicyId int64
+
+	// WAF策略
+	HttpFirewallPolicyId int64
+
 	// SSH相关
 	GrantId    int64
 	InstallDir string
@@ -44,6 +50,13 @@ func (this *CreateAction) RunPost(params struct {
 		Field("name", params.Name).
 		Require("请输入集群名称")

+	if params.CachePolicyId <= 0 {
+		this.Fail("请选择或者创建缓存策略")
+	}
+	if params.HttpFirewallPolicyId <= 0 {
+		this.Fail("请选择或者创建WAF策略")
+	}
+
 	// 检查DNS名称
 	if len(params.DnsName) > 0 {
 		if !domainutils.ValidateDomainFormat(params.DnsName) {
@@ -67,11 +80,13 @@ func (this *CreateAction) RunPost(params struct {
 	// TODO 检查DnsDomainId的有效性

 	createResp, err := this.RPC().NodeClusterRPC().CreateNodeCluster(this.AdminContext(), &pb.CreateNodeClusterRequest{
-		Name:        params.Name,
-		GrantId:     params.GrantId,
-		InstallDir:  params.InstallDir,
-		DnsDomainId: params.DnsDomainId,
-		DnsName:     params.DnsName,
+		Name:                 params.Name,
+		GrantId:              params.GrantId,
+		InstallDir:           params.InstallDir,
+		DnsDomainId:          params.DnsDomainId,
+		DnsName:              params.DnsName,
+		HttpCachePolicyId:    params.CachePolicyId,
+		HttpFirewallPolicyId: params.HttpFirewallPolicyId,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -79,7 +94,7 @@ func (this *CreateAction) RunPost(params struct {
 	}

 	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "创建节点集群：%d", createResp.ClusterId)
+	defer this.CreateLog(oplogs.LevelInfo, "创建节点集群：%d", createResp.NodeClusterId)

 	this.Success()
 }
--- a/internal/web/actions/default/clusters/index.go
+++ b/internal/web/actions/default/clusters/index.go
@@ -38,7 +38,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 		}
 		for _, cluster := range clustersResp.Clusters {
 			// 全部节点数量
-			countNodesResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{ClusterId: cluster.Id})
+			countNodesResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{NodeClusterId: cluster.Id})
 			if err != nil {
 				this.ErrorPage(err)
 				return
@@ -46,8 +46,8 @@ func (this *IndexAction) RunGet(params struct{}) {

 			// 在线节点
 			countActiveNodesResp, err := this.RPC().NodeRPC().CountAllEnabledNodesMatch(this.AdminContext(), &pb.CountAllEnabledNodesMatchRequest{
-				ClusterId:   cluster.Id,
-				ActiveState: types.Int32(configutils.BoolStateYes),
+				NodeClusterId: cluster.Id,
+				ActiveState:   types.Int32(configutils.BoolStateYes),
 			})
 			if err != nil {
 				this.ErrorPage(err)
@@ -55,7 +55,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 			}

 			// 需要升级的节点
-			countUpgradeNodesResp, err := this.RPC().NodeRPC().CountAllUpgradeNodesWithClusterId(this.AdminContext(), &pb.CountAllUpgradeNodesWithClusterIdRequest{ClusterId: cluster.Id})
+			countUpgradeNodesResp, err := this.RPC().NodeRPC().CountAllUpgradeNodesWithClusterId(this.AdminContext(), &pb.CountAllUpgradeNodesWithClusterIdRequest{NodeClusterId: cluster.Id})
 			if err != nil {
 				this.ErrorPage(err)
 				return
--- a/internal/web/actions/default/clusters/sync.go
+++ b/internal/web/actions/default/clusters/sync.go
@@ -25,7 +25,7 @@ func (this *SyncAction) RunPost(params struct{}) {

 	for _, cluster := range clusters {
 		_, err := this.RPC().NodeRPC().SyncNodesVersionWithCluster(this.AdminContext(), &pb.SyncNodesVersionWithClusterRequest{
-			ClusterId: cluster.Id,
+			NodeClusterId: cluster.Id,
 		})
 		if err != nil {
 			this.ErrorPage(err)
--- a/internal/web/actions/default/dns/clusters/cluster.go
+++ b/internal/web/actions/default/dns/clusters/cluster.go
@@ -18,7 +18,7 @@ func (this *ClusterAction) RunGet(params struct {
 	ClusterId int64
 }) {
 	// 集群信息
-	clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{ClusterId: params.ClusterId})
+	clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -77,7 +77,7 @@ func (this *ClusterAction) RunGet(params struct {
 						"name": route.Name,
 						"code": route.Code,
 					},
-					"clusterId": node.ClusterId,
+					"clusterId": node.NodeClusterId,
 				})
 			}
 		} else {
@@ -89,14 +89,14 @@ func (this *ClusterAction) RunGet(params struct {
 					"name": "",
 					"code": "",
 				},
-				"clusterId": node.ClusterId,
+				"clusterId": node.NodeClusterId,
 			})
 		}
 	}
 	this.Data["nodes"] = nodeMaps

 	// 代理服务解析记录
-	serversResp, err := this.RPC().ServerRPC().FindAllEnabledServersDNSWithClusterId(this.AdminContext(), &pb.FindAllEnabledServersDNSWithClusterIdRequest{ClusterId: params.ClusterId})
+	serversResp, err := this.RPC().ServerRPC().FindAllEnabledServersDNSWithClusterId(this.AdminContext(), &pb.FindAllEnabledServersDNSWithClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
--- a/internal/web/actions/default/nodes/nodeutils/utils.go
+++ b/internal/web/actions/default/nodes/nodeutils/utils.go
@@ -32,7 +32,7 @@ func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg
 	}

 	// 获取所有节点
-	nodesResp, err := defaultRPCClient.NodeRPC().FindAllEnabledNodesWithClusterId(ctx, &pb.FindAllEnabledNodesWithClusterIdRequest{ClusterId: clusterId})
+	nodesResp, err := defaultRPCClient.NodeRPC().FindAllEnabledNodesWithClusterId(ctx, &pb.FindAllEnabledNodesWithClusterIdRequest{NodeClusterId: clusterId})
 	if err != nil {
 		return results, err
 	}
--- a/internal/web/actions/default/servers/components/cache/cacheutils/utils.go
+++ b/internal/web/actions/default/servers/components/cache/cacheutils/utils.go
@@ -22,15 +22,15 @@ func FindCachePolicyNameWithoutError(parent *actionutils.ParentAction, cachePoli

 // 查找缓存策略配置
 func FindCachePolicy(parent *actionutils.ParentAction, cachePolicyId int64) (*serverconfigs.HTTPCachePolicy, error) {
-	resp, err := parent.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(parent.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{CachePolicyId: cachePolicyId})
+	resp, err := parent.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(parent.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{HttpCachePolicyId: cachePolicyId})
 	if err != nil {
 		return nil, err
 	}
-	if len(resp.CachePolicyJSON) == 0 {
+	if len(resp.HttpCachePolicyJSON) == 0 {
 		return nil, errors.New("cache policy not found")
 	}
 	config := &serverconfigs.HTTPCachePolicy{}
-	err = json.Unmarshal(resp.CachePolicyJSON, config)
+	err = json.Unmarshal(resp.HttpCachePolicyJSON, config)
 	if err != nil {
 		return nil, err
 	}
--- a/internal/web/actions/default/servers/components/cache/clean.go
+++ b/internal/web/actions/default/servers/components/cache/clean.go
@@ -58,12 +58,12 @@ func (this *CleanAction) RunPost(params struct {
 		Value: strconv.FormatInt(params.ClusterId, 10),
 	})

-	cachePolicyResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{CachePolicyId: params.CachePolicyId})
+	cachePolicyResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{HttpCachePolicyId: params.CachePolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	cachePolicyJSON := cachePolicyResp.CachePolicyJSON
+	cachePolicyJSON := cachePolicyResp.HttpCachePolicyJSON
 	if len(cachePolicyJSON) == 0 {
 		this.Fail("找不到要操作的缓存策略")
 	}
--- a/internal/web/actions/default/servers/components/cache/count.go
+++ b/internal/web/actions/default/servers/components/cache/count.go
@@ -0,0 +1,22 @@
+package cache
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+// 计算可用缓存策略数量
+type CountAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CountAction) RunPost(params struct{}) {
+	countResp, err := this.RPC().HTTPCachePolicyRPC().CountAllEnabledHTTPCachePolicies(this.AdminContext(), &pb.CountAllEnabledHTTPCachePoliciesRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["count"] = countResp.Count
+
+	this.Success()
+}
--- a/internal/web/actions/default/servers/components/cache/createPopup.go
+++ b/internal/web/actions/default/servers/components/cache/createPopup.go
@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
 )

 type CreatePopupAction struct {
@@ -79,8 +80,14 @@ func (this *CreatePopupAction) RunPost(params struct {
 		return
 	}

+	// 返回数据
+	this.Data["cachePolicy"] = maps.Map{
+		"id":   createResp.HttpCachePolicyId,
+		"name": params.Name,
+	}
+
 	// 创建日志
-	defer this.CreateLog(oplogs.LevelInfo, "创建缓存策略：%d", createResp.CachePolicyId)
+	defer this.CreateLog(oplogs.LevelInfo, "创建缓存策略：%d", createResp.HttpCachePolicyId)

 	this.Success()
 }
--- a/internal/web/actions/default/servers/components/cache/delete.go
+++ b/internal/web/actions/default/servers/components/cache/delete.go
@@ -14,16 +14,16 @@ func (this *DeleteAction) RunPost(params struct {
 	CachePolicyId int64
 }) {
 	// 检查是否被引用
-	countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithCachePolicyId(this.AdminContext(), &pb.CountAllEnabledServersWithCachePolicyIdRequest{CachePolicyId: params.CachePolicyId})
+	countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithHTTPCachePolicyId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithHTTPCachePolicyIdRequest{HttpCachePolicyId: params.CachePolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	if countResp.Count > 0 {
-		this.Fail("此缓存策略正在被有些服务引用，请修改后再删除。")
+		this.Fail("此缓存策略正在被有些集群引用，请修改后再删除。")
 	}

-	_, err = this.RPC().HTTPCachePolicyRPC().DeleteHTTPCachePolicy(this.AdminContext(), &pb.DeleteHTTPCachePolicyRequest{CachePolicyId: params.CachePolicyId})
+	_, err = this.RPC().HTTPCachePolicyRPC().DeleteHTTPCachePolicy(this.AdminContext(), &pb.DeleteHTTPCachePolicyRequest{HttpCachePolicyId: params.CachePolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
--- a/internal/web/actions/default/servers/components/cache/index.go
+++ b/internal/web/actions/default/servers/components/cache/index.go
@@ -34,7 +34,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 		this.ErrorPage(err)
 		return
 	}
-	cachePoliciesJSON := listResp.CachePoliciesJSON
+	cachePoliciesJSON := listResp.HttpCachePoliciesJSON
 	cachePolicies := []*serverconfigs.HTTPCachePolicy{}
 	err = json.Unmarshal(cachePoliciesJSON, &cachePolicies)
 	if err != nil {
@@ -45,16 +45,16 @@ func (this *IndexAction) RunGet(params struct{}) {

 	infos := []maps.Map{}
 	for _, cachePolicy := range cachePolicies {
-		countServersResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithCachePolicyId(this.AdminContext(), &pb.CountAllEnabledServersWithCachePolicyIdRequest{CachePolicyId: cachePolicy.Id})
+		countClustersResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithHTTPCachePolicyId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithHTTPCachePolicyIdRequest{HttpCachePolicyId: cachePolicy.Id})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		countServers := countServersResp.Count
+		countClusters := countClustersResp.Count

 		infos = append(infos, maps.Map{
-			"typeName":     serverconfigs.FindCachePolicyStorageName(cachePolicy.Type),
-			"countServers": countServers,
+			"typeName":      serverconfigs.FindCachePolicyStorageName(cachePolicy.Type),
+			"countClusters": countClusters,
 		})
 	}
 	this.Data["infos"] = infos
--- a/internal/web/actions/default/servers/components/cache/init.go
+++ b/internal/web/actions/default/servers/components/cache/init.go
@@ -26,6 +26,9 @@ func init() {
 			Post("/delete", new(DeleteAction)).
 			Post("/testRead", new(TestReadAction)).
 			Post("/testWrite", new(TestWriteAction)).
+			Get("/selectPopup", new(SelectPopupAction)).
+			Post("/count", new(CountAction)).
+
 			EndAll()
 	})
 }
--- a/internal/web/actions/default/servers/components/cache/policy.go
+++ b/internal/web/actions/default/servers/components/cache/policy.go
@@ -3,7 +3,9 @@ package cache
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/components/cache/cacheutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+	"github.com/iwind/TeaGo/maps"
 )

 type PolicyAction struct {
@@ -26,5 +28,20 @@ func (this *PolicyAction) RunGet(params struct {

 	this.Data["typeName"] = serverconfigs.FindCachePolicyStorageName(cachePolicy.Type)

+	// 正在使用此策略的集群
+	clustersResp, err := this.RPC().NodeClusterRPC().FindAllEnabledNodeClustersWithHTTPCachePolicyId(this.AdminContext(), &pb.FindAllEnabledNodeClustersWithHTTPCachePolicyIdRequest{HttpCachePolicyId: params.CachePolicyId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	clusterMaps := []maps.Map{}
+	for _, cluster := range clustersResp.NodeClusters {
+		clusterMaps = append(clusterMaps, maps.Map{
+			"id":   cluster.Id,
+			"name": cluster.Name,
+		})
+	}
+	this.Data["clusters"] = clusterMaps
+
 	this.Show()
 }
--- a/internal/web/actions/default/servers/components/cache/preheat.go
+++ b/internal/web/actions/default/servers/components/cache/preheat.go
@@ -61,12 +61,12 @@ func (this *PreheatAction) RunPost(params struct {
 		Value: strconv.FormatInt(params.ClusterId, 10),
 	})

-	cachePolicyResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{CachePolicyId: params.CachePolicyId})
+	cachePolicyResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{HttpCachePolicyId: params.CachePolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	cachePolicyJSON := cachePolicyResp.CachePolicyJSON
+	cachePolicyJSON := cachePolicyResp.HttpCachePolicyJSON
 	if len(cachePolicyJSON) == 0 {
 		this.Fail("找不到要操作的缓存策略")
 	}
--- a/internal/web/actions/default/servers/components/cache/purge.go
+++ b/internal/web/actions/default/servers/components/cache/purge.go
@@ -60,12 +60,12 @@ func (this *PurgeAction) RunPost(params struct {
 		Value: strconv.FormatInt(params.ClusterId, 10),
 	})

-	cachePolicyResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{CachePolicyId: params.CachePolicyId})
+	cachePolicyResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{HttpCachePolicyId: params.CachePolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	cachePolicyJSON := cachePolicyResp.CachePolicyJSON
+	cachePolicyJSON := cachePolicyResp.HttpCachePolicyJSON
 	if len(cachePolicyJSON) == 0 {
 		this.Fail("找不到要操作的缓存策略")
 	}
--- a/internal/web/actions/default/servers/components/cache/selectPopup.go
+++ b/internal/web/actions/default/servers/components/cache/selectPopup.go
@@ -0,0 +1,60 @@
+package cache
+
+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/iwind/TeaGo/maps"
+)
+
+type SelectPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SelectPopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+func (this *SelectPopupAction) RunGet(params struct{}) {
+	countResp, err := this.RPC().HTTPCachePolicyRPC().CountAllEnabledHTTPCachePolicies(this.AdminContext(), &pb.CountAllEnabledHTTPCachePoliciesRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	count := countResp.Count
+	page := this.NewPage(count)
+
+	this.Data["page"] = page.AsHTML()
+
+	cachePoliciesResp, err := this.RPC().HTTPCachePolicyRPC().ListEnabledHTTPCachePolicies(this.AdminContext(), &pb.ListEnabledHTTPCachePoliciesRequest{
+		Offset: page.Offset,
+		Size:   page.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	cachePolicies := []*serverconfigs.HTTPCachePolicy{}
+	if len(cachePoliciesResp.HttpCachePoliciesJSON) > 0 {
+		err = json.Unmarshal(cachePoliciesResp.HttpCachePoliciesJSON, &cachePolicies)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+	}
+
+	policyMaps := []maps.Map{}
+	for _, cachePolicy := range cachePolicies {
+		policyMaps = append(policyMaps, maps.Map{
+			"id":          cachePolicy.Id,
+			"name":        cachePolicy.Name,
+			"description": cachePolicy.Description,
+			"isOn":        cachePolicy.IsOn,
+		})
+	}
+
+	this.Data["cachePolicies"] = policyMaps
+
+	this.Show()
+}
--- a/internal/web/actions/default/servers/components/cache/stat.go
+++ b/internal/web/actions/default/servers/components/cache/stat.go
@@ -58,12 +58,12 @@ func (this *StatAction) RunPost(params struct {
 		Value: strconv.FormatInt(params.ClusterId, 10),
 	})

-	cachePolicyResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{CachePolicyId: params.CachePolicyId})
+	cachePolicyResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{HttpCachePolicyId: params.CachePolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	cachePolicyJSON := cachePolicyResp.CachePolicyJSON
+	cachePolicyJSON := cachePolicyResp.HttpCachePolicyJSON
 	if len(cachePolicyJSON) == 0 {
 		this.Fail("找不到要操作的缓存策略")
 	}
--- a/internal/web/actions/default/servers/components/cache/testRead.go
+++ b/internal/web/actions/default/servers/components/cache/testRead.go
@@ -25,12 +25,12 @@ func (this *TestReadAction) RunPost(params struct {
 		Value: strconv.FormatInt(params.ClusterId, 10),
 	})

-	cachePolicyResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{CachePolicyId: params.CachePolicyId})
+	cachePolicyResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{HttpCachePolicyId: params.CachePolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	cachePolicyJSON := cachePolicyResp.CachePolicyJSON
+	cachePolicyJSON := cachePolicyResp.HttpCachePolicyJSON
 	if len(cachePolicyJSON) == 0 {
 		this.Fail("找不到要操作的缓存策略")
 	}
--- a/internal/web/actions/default/servers/components/cache/testWrite.go
+++ b/internal/web/actions/default/servers/components/cache/testWrite.go
@@ -26,12 +26,12 @@ func (this *TestWriteAction) RunPost(params struct {
 		Value: strconv.FormatInt(params.ClusterId, 10),
 	})

-	cachePolicyResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{CachePolicyId: params.CachePolicyId})
+	cachePolicyResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{HttpCachePolicyId: params.CachePolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	cachePolicyJSON := cachePolicyResp.CachePolicyJSON
+	cachePolicyJSON := cachePolicyResp.HttpCachePolicyJSON
 	if len(cachePolicyJSON) == 0 {
 		this.Fail("找不到要操作的缓存策略")
 	}
--- a/internal/web/actions/default/servers/components/cache/update.go
+++ b/internal/web/actions/default/servers/components/cache/update.go
@@ -20,12 +20,12 @@ func (this *UpdateAction) Init() {
 func (this *UpdateAction) RunGet(params struct {
 	CachePolicyId int64
 }) {
-	configResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{CachePolicyId: params.CachePolicyId})
+	configResp, err := this.RPC().HTTPCachePolicyRPC().FindEnabledHTTPCachePolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPCachePolicyConfigRequest{HttpCachePolicyId: params.CachePolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	configJSON := configResp.CachePolicyJSON
+	configJSON := configResp.HttpCachePolicyJSON
 	if len(configJSON) == 0 {
 		this.NotFound("cachePolicy", params.CachePolicyId)
 		return
@@ -90,7 +90,7 @@ func (this *UpdateAction) RunPost(params struct {
 		return
 	}
 	_, err = this.RPC().HTTPCachePolicyRPC().UpdateHTTPCachePolicy(this.AdminContext(), &pb.UpdateHTTPCachePolicyRequest{
-		CachePolicyId: params.CachePolicyId,
+		HttpCachePolicyId: params.CachePolicyId,
 		IsOn:          params.IsOn,
 		Name:          params.Name,
 		Description:   params.Description,
--- a/internal/web/actions/default/servers/components/waf/count.go
+++ b/internal/web/actions/default/servers/components/waf/count.go
@@ -0,0 +1,21 @@
+package waf
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type CountAction struct {
+	actionutils.ParentAction
+}
+
+func (this *CountAction) RunPost(params struct{}) {
+	countResp, err := this.RPC().HTTPFirewallPolicyRPC().CountAllEnabledHTTPFirewallPolicies(this.AdminContext(), &pb.CountAllEnabledHTTPFirewallPoliciesRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["count"] = countResp.Count
+
+	this.Success()
+}
--- a/internal/web/actions/default/servers/components/waf/createGroupPopup.go
+++ b/internal/web/actions/default/servers/components/waf/createGroupPopup.go
@@ -86,9 +86,9 @@ func (this *CreateGroupPopupAction) RunPost(params struct {
 	}

 	_, err = this.RPC().HTTPFirewallPolicyRPC().UpdateHTTPFirewallPolicyGroups(this.AdminContext(), &pb.UpdateHTTPFirewallPolicyGroupsRequest{
-		FirewallPolicyId: params.FirewallPolicyId,
-		InboundJSON:      inboundJSON,
-		OutboundJSON:     outboundJSON,
+		HttpFirewallPolicyId: params.FirewallPolicyId,
+		InboundJSON:          inboundJSON,
+		OutboundJSON:         outboundJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/components/waf/createPopup.go
+++ b/internal/web/actions/default/servers/components/waf/createPopup.go
@@ -46,18 +46,25 @@ func (this *CreatePopupAction) RunPost(params struct {
 		Require("请输入策略名称")

 	createResp, err := this.RPC().HTTPFirewallPolicyRPC().CreateHTTPFirewallPolicy(this.AdminContext(), &pb.CreateHTTPFirewallPolicyRequest{
-		IsOn:               params.IsOn,
-		Name:               params.Name,
-		Description:        params.Description,
-		FirewallGroupCodes: params.GroupCodes,
+		IsOn:                   params.IsOn,
+		Name:                   params.Name,
+		Description:            params.Description,
+		HttpFirewallGroupCodes: params.GroupCodes,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}

+	// 返回数据
+	this.Data["firewallPolicy"] = maps.Map{
+		"id":          createResp.HttpFirewallPolicyId,
+		"name":        params.Name,
+		"description": params.Description,
+	}
+
 	// 日志
-	defer this.CreateLog(oplogs.LevelInfo, "创建WAF策略 %d", createResp.FirewallPolicyId)
+	defer this.CreateLog(oplogs.LevelInfo, "创建WAF策略 %d", createResp.HttpFirewallPolicyId)

 	this.Success()
 }
--- a/internal/web/actions/default/servers/components/waf/delete.go
+++ b/internal/web/actions/default/servers/components/waf/delete.go
@@ -16,22 +16,20 @@ func (this *DeleteAction) RunPost(params struct {
 	// 日志
 	defer this.CreateLog(oplogs.LevelInfo, "删除WAF策略 %d", params.FirewallPolicyId)

-	countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithHTTPFirewallPolicyId(this.AdminContext(), &pb.CountAllEnabledServersWithHTTPFirewallPolicyIdRequest{FirewallPolicyId: params.FirewallPolicyId})
+	countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithHTTPFirewallPolicyId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithHTTPFirewallPolicyIdRequest{HttpFirewallPolicyId: params.FirewallPolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	if countResp.Count > 0 {
-		this.Fail("此WAF策略正在被有些服务引用，请修改后再删除。")
+		this.Fail("此WAF策略正在被有些集群引用，请修改后再删除。")
 	}

-	_, err = this.RPC().HTTPFirewallPolicyRPC().DeleteFirewallPolicy(this.AdminContext(), &pb.DeleteFirewallPolicyRequest{FirewallPolicyId: params.FirewallPolicyId})
+	_, err = this.RPC().HTTPFirewallPolicyRPC().DeleteHTTPFirewallPolicy(this.AdminContext(), &pb.DeleteHTTPFirewallPolicyRequest{HttpFirewallPolicyId: params.FirewallPolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}

-
-
 	this.Success()
 }
--- a/internal/web/actions/default/servers/components/waf/deleteGroup.go
+++ b/internal/web/actions/default/servers/components/waf/deleteGroup.go
@@ -43,9 +43,9 @@ func (this *DeleteGroupAction) RunPost(params struct {
 	}

 	_, err = this.RPC().HTTPFirewallPolicyRPC().UpdateHTTPFirewallPolicyGroups(this.AdminContext(), &pb.UpdateHTTPFirewallPolicyGroupsRequest{
-		FirewallPolicyId: params.FirewallPolicyId,
-		InboundJSON:      inboundJSON,
-		OutboundJSON:     outboundJSON,
+		HttpFirewallPolicyId: params.FirewallPolicyId,
+		InboundJSON:          inboundJSON,
+		OutboundJSON:         outboundJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/components/waf/helper.go
+++ b/internal/web/actions/default/servers/components/waf/helper.go
@@ -33,7 +33,7 @@ func (this *Helper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool)
 		action.Data["countOutboundGroups"] = 0
 		parentAction := actionutils.FindParentAction(actionPtr)
 		if parentAction != nil {
-			firewallPolicy, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledPolicy(parentAction.AdminContext(), firewallPolicyId)
+			firewallPolicy, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicy(parentAction.AdminContext(), firewallPolicyId)
 			if err != nil {
 				parentAction.ErrorPage(err)
 				return
--- a/internal/web/actions/default/servers/components/waf/import.go
+++ b/internal/web/actions/default/servers/components/waf/import.go
@@ -48,8 +48,8 @@ func (this *ImportAction) RunPost(params struct {
 	}

 	_, err = this.RPC().HTTPFirewallPolicyRPC().ImportHTTPFirewallPolicy(this.AdminContext(), &pb.ImportHTTPFirewallPolicyRequest{
-		FirewallPolicyId:   params.FirewallPolicyId,
-		FirewallPolicyJSON: data,
+		HttpFirewallPolicyId:   params.FirewallPolicyId,
+		HttpFirewallPolicyJSON: data,
 	})
 	if err != nil {
 		this.Fail("导入失败：" + err.Error())
--- a/internal/web/actions/default/servers/components/waf/index.go
+++ b/internal/web/actions/default/servers/components/waf/index.go
@@ -17,7 +17,7 @@ func (this *IndexAction) Init() {
 }

 func (this *IndexAction) RunGet(params struct{}) {
-	countResp, err := this.RPC().HTTPFirewallPolicyRPC().CountAllEnabledFirewallPolicies(this.AdminContext(), &pb.CountAllEnabledFirewallPoliciesRequest{})
+	countResp, err := this.RPC().HTTPFirewallPolicyRPC().CountAllEnabledHTTPFirewallPolicies(this.AdminContext(), &pb.CountAllEnabledHTTPFirewallPoliciesRequest{})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -25,7 +25,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 	count := countResp.Count
 	page := this.NewPage(count)

-	listResp, err := this.RPC().HTTPFirewallPolicyRPC().ListEnabledFirewallPolicies(this.AdminContext(), &pb.ListEnabledFirewallPoliciesRequest{
+	listResp, err := this.RPC().HTTPFirewallPolicyRPC().ListEnabledHTTPFirewallPolicies(this.AdminContext(), &pb.ListEnabledHTTPFirewallPoliciesRequest{
 		Offset: page.Offset,
 		Size:   page.Size,
 	})
@@ -34,7 +34,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 		return
 	}
 	policyMaps := []maps.Map{}
-	for _, policy := range listResp.FirewallPolicies {
+	for _, policy := range listResp.HttpFirewallPolicies {
 		countInbound := 0
 		countOutbound := 0
 		if len(policy.InboundJSON) > 0 {
@@ -56,12 +56,12 @@ func (this *IndexAction) RunGet(params struct{}) {
 			countOutbound = len(outboundConfig.GroupRefs)
 		}

-		countServersResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithHTTPFirewallPolicyId(this.AdminContext(), &pb.CountAllEnabledServersWithHTTPFirewallPolicyIdRequest{FirewallPolicyId: policy.Id})
+		countClustersResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithHTTPFirewallPolicyId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithHTTPFirewallPolicyIdRequest{HttpFirewallPolicyId: policy.Id})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		countServers := countServersResp.Count
+		countClusters := countClustersResp.Count

 		policyMaps = append(policyMaps, maps.Map{
 			"id":            policy.Id,
@@ -69,7 +69,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 			"name":          policy.Name,
 			"countInbound":  countInbound,
 			"countOutbound": countOutbound,
-			"countServers":  countServers,
+			"countClusters": countClusters,
 		})
 	}

--- a/internal/web/actions/default/servers/components/waf/init.go
+++ b/internal/web/actions/default/servers/components/waf/init.go
@@ -38,6 +38,8 @@ func init() {
 			Post("/updateSetOn", new(UpdateSetOnAction)).
 			Post("/deleteSet", new(DeleteSetAction)).
 			GetPost("/updateSetPopup", new(UpdateSetPopupAction)).
+			Post("/count", new(CountAction)).
+			Get("/selectPopup", new(SelectPopupAction)).

 			// IP管理
 			GetPost("/ipadmin", new(ipadmin.IndexAction)).
--- a/internal/web/actions/default/servers/components/waf/ipadmin/index.go
+++ b/internal/web/actions/default/servers/components/waf/ipadmin/index.go
@@ -96,8 +96,8 @@ func (this *IndexAction) RunPost(params struct {
 	}

 	_, err = this.RPC().HTTPFirewallPolicyRPC().UpdateHTTPFirewallInboundConfig(this.AdminContext(), &pb.UpdateHTTPFirewallInboundConfigRequest{
-		FirewallPolicyId: params.FirewallPolicyId,
-		InboundJSON:      inboundJSON,
+		HttpFirewallPolicyId: params.FirewallPolicyId,
+		InboundJSON:          inboundJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/components/waf/ipadmin/ipadminutils/utils.go
+++ b/internal/web/actions/default/servers/components/waf/ipadmin/ipadminutils/utils.go
@@ -6,7 +6,6 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/nodeutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
-	"github.com/iwind/TeaGo/lists"
 )

 // 通知使用此WAF策略的集群更新
@@ -15,18 +14,12 @@ func NotifyUpdateToClustersWithFirewallPolicyId(ctx context.Context, firewallPol
 	if err != nil {
 		return err
 	}
-	resp, err := client.ServerRPC().FindAllEnabledServersWithHTTPFirewallPolicyId(ctx, &pb.FindAllEnabledServersWithHTTPFirewallPolicyIdRequest{FirewallPolicyId: firewallPolicyId})
+	resp, err := client.NodeClusterRPC().FindAllEnabledNodeClustersWithHTTPFirewallPolicyId(ctx, &pb.FindAllEnabledNodeClustersWithHTTPFirewallPolicyIdRequest{HttpFirewallPolicyId: firewallPolicyId})
 	if err != nil {
 		return err
 	}
-	clusterIds := []int64{}
-	for _, server := range resp.Servers {
-		if !lists.ContainsInt64(clusterIds, server.Cluster.Id) {
-			clusterIds = append(clusterIds, server.Cluster.Id)
-		}
-	}
-	for _, clusterId := range clusterIds {
-		_, err = nodeutils.SendMessageToCluster(ctx, clusterId, messageconfigs.MessageCodeIPListChanged, &messageconfigs.IPListChangedMessage{}, 3)
+	for _, cluster := range resp.NodeClusters {
+		_, err = nodeutils.SendMessageToCluster(ctx, cluster.Id, messageconfigs.MessageCodeIPListChanged, &messageconfigs.IPListChangedMessage{}, 3)
 		if err != nil {
 			return err
 		}
--- a/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go
+++ b/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go
@@ -98,8 +98,8 @@ func (this *ProvincesAction) RunPost(params struct {
 	}

 	_, err = this.RPC().HTTPFirewallPolicyRPC().UpdateHTTPFirewallInboundConfig(this.AdminContext(), &pb.UpdateHTTPFirewallInboundConfigRequest{
-		FirewallPolicyId: params.FirewallPolicyId,
-		InboundJSON:      inboundJSON,
+		HttpFirewallPolicyId: params.FirewallPolicyId,
+		InboundJSON:          inboundJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/components/waf/log.go
+++ b/internal/web/actions/default/servers/components/waf/log.go
@@ -83,15 +83,15 @@ func (this *LogAction) RunGet(params struct {
 	}

 	// 所有分组
-	policyResp, err := this.RPC().HTTPFirewallPolicyRPC().FindEnabledFirewallPolicyConfig(this.AdminContext(), &pb.FindEnabledFirewallPolicyConfigRequest{
-		FirewallPolicyId: params.FirewallPolicyId,
+	policyResp, err := this.RPC().HTTPFirewallPolicyRPC().FindEnabledHTTPFirewallPolicyConfig(this.AdminContext(), &pb.FindEnabledHTTPFirewallPolicyConfigRequest{
+		HttpFirewallPolicyId: params.FirewallPolicyId,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
 	policyConfig := &firewallconfigs.HTTPFirewallPolicy{}
-	err = json.Unmarshal(policyResp.FirewallPolicyJSON, policyConfig)
+	err = json.Unmarshal(policyResp.HttpFirewallPolicyJSON, policyConfig)
 	if err != nil {
 		this.ErrorPage(err)
 		return
--- a/internal/web/actions/default/servers/components/waf/policy.go
+++ b/internal/web/actions/default/servers/components/waf/policy.go
@@ -55,20 +55,20 @@ func (this *PolicyAction) RunGet(params struct {
 		"blockOptions": firewallPolicy.BlockOptions,
 	}

-	// 正在使用此策略的服务
-	listServersResp, err := this.RPC().ServerRPC().FindAllEnabledServersWithHTTPFirewallPolicyId(this.AdminContext(), &pb.FindAllEnabledServersWithHTTPFirewallPolicyIdRequest{FirewallPolicyId: params.FirewallPolicyId})
+	// 正在使用此策略的集群
+	clustersResp, err := this.RPC().NodeClusterRPC().FindAllEnabledNodeClustersWithHTTPFirewallPolicyId(this.AdminContext(), &pb.FindAllEnabledNodeClustersWithHTTPFirewallPolicyIdRequest{HttpFirewallPolicyId: params.FirewallPolicyId})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	serverMaps := []maps.Map{}
-	for _, server := range listServersResp.Servers {
-		serverMaps = append(serverMaps, maps.Map{
-			"id":   server.Id,
-			"name": server.Name,
+	clusterMaps := []maps.Map{}
+	for _, cluster := range clustersResp.NodeClusters {
+		clusterMaps = append(clusterMaps, maps.Map{
+			"id":   cluster.Id,
+			"name": cluster.Name,
 		})
 	}
-	this.Data["servers"] = serverMaps
+	this.Data["clusters"] = clusterMaps

 	this.Show()
 }
--- a/internal/web/actions/default/servers/components/waf/selectPopup.go
+++ b/internal/web/actions/default/servers/components/waf/selectPopup.go
@@ -0,0 +1,73 @@
+package waf
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type SelectPopupAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SelectPopupAction) Init() {
+	this.FirstMenu("index")
+}
+
+func (this *SelectPopupAction) RunGet(params struct{}) {
+	countResp, err := this.RPC().HTTPFirewallPolicyRPC().CountAllEnabledHTTPFirewallPolicies(this.AdminContext(), &pb.CountAllEnabledHTTPFirewallPoliciesRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	count := countResp.Count
+	page := this.NewPage(count)
+
+	listResp, err := this.RPC().HTTPFirewallPolicyRPC().ListEnabledHTTPFirewallPolicies(this.AdminContext(), &pb.ListEnabledHTTPFirewallPoliciesRequest{
+		Offset: page.Offset,
+		Size:   page.Size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	policyMaps := []maps.Map{}
+	for _, policy := range listResp.HttpFirewallPolicies {
+		countInbound := 0
+		countOutbound := 0
+		if len(policy.InboundJSON) > 0 {
+			inboundConfig := &firewallconfigs.HTTPFirewallInboundConfig{}
+			err = json.Unmarshal(policy.InboundJSON, inboundConfig)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			countInbound = len(inboundConfig.GroupRefs)
+		}
+		if len(policy.OutboundJSON) > 0 {
+			outboundConfig := &firewallconfigs.HTTPFirewallInboundConfig{}
+			err = json.Unmarshal(policy.OutboundJSON, outboundConfig)
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			countOutbound = len(outboundConfig.GroupRefs)
+		}
+
+		policyMaps = append(policyMaps, maps.Map{
+			"id":            policy.Id,
+			"isOn":          policy.IsOn,
+			"name":          policy.Name,
+			"countInbound":  countInbound,
+			"countOutbound": countOutbound,
+		})
+	}
+
+	this.Data["policies"] = policyMaps
+
+	this.Data["page"] = page.AsHTML()
+
+	this.Show()
+}
--- a/internal/web/actions/default/servers/components/waf/sortGroups.go
+++ b/internal/web/actions/default/servers/components/waf/sortGroups.go
@@ -73,9 +73,9 @@ func (this *SortGroupsAction) RunPost(params struct {
 	}

 	_, err = this.RPC().HTTPFirewallPolicyRPC().UpdateHTTPFirewallPolicyGroups(this.AdminContext(), &pb.UpdateHTTPFirewallPolicyGroupsRequest{
-		FirewallPolicyId: params.FirewallPolicyId,
-		InboundJSON:      inboundJSON,
-		OutboundJSON:     outboundJSON,
+		HttpFirewallPolicyId: params.FirewallPolicyId,
+		InboundJSON:          inboundJSON,
+		OutboundJSON:         outboundJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/components/waf/update.go
+++ b/internal/web/actions/default/servers/components/waf/update.go
@@ -88,12 +88,12 @@ func (this *UpdateAction) RunPost(params struct {
 		Require("请输入策略名称")

 	_, err := this.RPC().HTTPFirewallPolicyRPC().UpdateHTTPFirewallPolicy(this.AdminContext(), &pb.UpdateHTTPFirewallPolicyRequest{
-		FirewallPolicyId:   params.FirewallPolicyId,
-		IsOn:               params.IsOn,
-		Name:               params.Name,
-		Description:        params.Description,
-		FirewallGroupCodes: params.GroupCodes,
-		BlockOptionsJSON:   params.BlockOptionsJSON,
+		HttpFirewallPolicyId: params.FirewallPolicyId,
+		IsOn:                 params.IsOn,
+		Name:                 params.Name,
+		Description:          params.Description,
+		FirewallGroupCodes:   params.GroupCodes,
+		BlockOptionsJSON:     params.BlockOptionsJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/create.go
+++ b/internal/web/actions/default/servers/create.go
@@ -256,7 +256,7 @@ func (this *CreateAction) RunPost(params struct {
 		Name:             params.Name,
 		ServerNamesJON:   []byte(params.ServerNames),
 		Description:      params.Description,
-		ClusterId:        params.ClusterId,
+		NodeClusterId:    params.ClusterId,
 		IncludeNodesJSON: includeNodesJSON,
 		ExcludeNodesJSON: excludeNodesJSON,
 		WebId:            webId,
--- a/internal/web/actions/default/servers/server/log/viewPopup.go
+++ b/internal/web/actions/default/servers/server/log/viewPopup.go
@@ -40,16 +40,16 @@ func (this *ViewPopupAction) RunGet(params struct {
 	// WAF相关
 	var wafMap maps.Map = nil
 	if accessLog.FirewallPolicyId > 0 {
-		policyResp, err := this.RPC().HTTPFirewallPolicyRPC().FindEnabledFirewallPolicy(this.AdminContext(), &pb.FindEnabledFirewallPolicyRequest{FirewallPolicyId: accessLog.FirewallPolicyId})
+		policyResp, err := this.RPC().HTTPFirewallPolicyRPC().FindEnabledHTTPFirewallPolicy(this.AdminContext(), &pb.FindEnabledHTTPFirewallPolicyRequest{HttpFirewallPolicyId: accessLog.FirewallPolicyId})
 		if err != nil {
 			this.ErrorPage(err)
 			return
 		}
-		if policyResp.FirewallPolicy != nil {
+		if policyResp.HttpFirewallPolicy != nil {
 			wafMap = maps.Map{
 				"policy": maps.Map{
-					"id":   policyResp.FirewallPolicy.Id,
-					"name": policyResp.FirewallPolicy.Name,
+					"id":   policyResp.HttpFirewallPolicy.Id,
+					"name": policyResp.HttpFirewallPolicy.Name,
 				},
 			}
 			if accessLog.FirewallRuleGroupId > 0 {
--- a/internal/web/actions/default/servers/server/settings/cache/createPopup.go
+++ b/internal/web/actions/default/servers/server/settings/cache/createPopup.go
@@ -3,11 +3,8 @@ package cache
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
-	"github.com/iwind/TeaGo/maps"
 )

 type CreatePopupAction struct {
@@ -19,45 +16,16 @@ func (this *CreatePopupAction) Init() {
 }

 func (this *CreatePopupAction) RunGet(params struct{}) {
-	// 缓存策略列表
-	cachePoliciesResp, err := this.RPC().HTTPCachePolicyRPC().FindAllEnabledHTTPCachePolicies(this.AdminContext(), &pb.FindAllEnabledHTTPCachePoliciesRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	cachePolicyMaps := []maps.Map{}
-	for _, cachePolicy := range cachePoliciesResp.CachePolicies {
-		cachePolicyMaps = append(cachePolicyMaps, maps.Map{
-			"id":   cachePolicy.Id,
-			"name": cachePolicy.Name,
-		})
-	}
-	this.Data["cachePolicies"] = cachePolicyMaps
-
 	this.Show()
 }

 func (this *CreatePopupAction) RunPost(params struct {
-	CachePolicyId int64
-	CacheRefJSON  []byte
+	CacheRefJSON []byte

 	Must *actions.Must
 }) {
-	if params.CachePolicyId <= 0 {
-		this.Fail("请选择要使用的缓存策略")
-	}
-
-	cachePolicy, err := models.SharedHTTPCachePolicyDAO.FindEnabledCachePolicyConfig(this.AdminContext(), params.CachePolicyId)
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	if cachePolicy == nil {
-		this.Fail("找不到你要使用的缓存策略")
-	}
-
 	cacheRef := &serverconfigs.HTTPCacheRef{}
-	err = json.Unmarshal(params.CacheRefJSON, cacheRef)
+	err := json.Unmarshal(params.CacheRefJSON, cacheRef)
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -66,9 +34,6 @@ func (this *CreatePopupAction) RunPost(params struct {
 		this.Fail("请输入缓存Key")
 	}

-	cacheRef.CachePolicyId = cachePolicy.Id
-	cacheRef.CachePolicy = cachePolicy
-
 	err = cacheRef.Init()
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/server/settings/cache/index.go
+++ b/internal/web/actions/default/servers/server/settings/cache/index.go
@@ -5,9 +5,11 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
 )

 type IndexAction struct {
@@ -31,6 +33,22 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["webId"] = webConfig.Id
 	this.Data["cacheConfig"] = webConfig.Cache

+	// 当前集群的缓存策略
+	cachePolicy, err := models.SharedHTTPCachePolicyDAO.FindEnabledHTTPCachePolicyWithServerId(this.AdminContext(), params.ServerId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if cachePolicy != nil {
+		this.Data["cachePolicy"] = maps.Map{
+			"id":   cachePolicy.Id,
+			"name": cachePolicy.Name,
+			"isOn": cachePolicy.IsOn,
+		}
+	} else {
+		this.Data["cachePolicy"] = nil
+	}
+
 	this.Show()
 }

--- a/internal/web/actions/default/servers/server/settings/index.go
+++ b/internal/web/actions/default/servers/server/settings/index.go
@@ -114,12 +114,12 @@ func (this *IndexAction) RunPost(params struct {
 	}

 	_, err := this.RPC().ServerRPC().UpdateServerBasic(this.AdminContext(), &pb.UpdateServerBasicRequest{
-		ServerId:    params.ServerId,
-		Name:        params.Name,
-		Description: params.Description,
-		ClusterId:   params.ClusterId,
-		IsOn:        params.IsOn,
-		GroupIds:    params.GroupIds,
+		ServerId:      params.ServerId,
+		Name:          params.Name,
+		Description:   params.Description,
+		NodeClusterId: params.ClusterId,
+		IsOn:          params.IsOn,
+		GroupIds:      params.GroupIds,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/server/settings/locations/cache/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/cache/index.go
@@ -4,9 +4,11 @@ import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
 )

 type IndexAction struct {
@@ -17,6 +19,7 @@ func (this *IndexAction) Init() {
 }

 func (this *IndexAction) RunGet(params struct {
+	ServerId   int64
 	LocationId int64
 }) {
 	webConfig, err := webutils.FindWebConfigWithLocationId(this.Parent(), params.LocationId)
@@ -28,6 +31,22 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["webId"] = webConfig.Id
 	this.Data["cacheConfig"] = webConfig.Cache

+	// 当前集群的缓存策略
+	cachePolicy, err := models.SharedHTTPCachePolicyDAO.FindEnabledHTTPCachePolicyWithServerId(this.AdminContext(), params.ServerId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if cachePolicy != nil {
+		this.Data["cachePolicy"] = maps.Map{
+			"id":   cachePolicy.Id,
+			"name": cachePolicy.Name,
+			"isOn": cachePolicy.IsOn,
+		}
+	} else {
+		this.Data["cachePolicy"] = nil
+	}
+
 	this.Show()
 }

--- a/internal/web/actions/default/servers/server/settings/locations/waf/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/waf/index.go
@@ -3,6 +3,7 @@ package waf
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
@@ -16,6 +17,7 @@ func (this *IndexAction) Init() {
 }

 func (this *IndexAction) RunGet(params struct {
+	ServerId   int64
 	LocationId int64
 }) {
 	webConfig, err := webutils.FindWebConfigWithLocationId(this.Parent(), params.LocationId)
@@ -27,22 +29,21 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["webId"] = webConfig.Id
 	this.Data["firewallConfig"] = webConfig.FirewallRef

-	// 当前已有策略
-	policiesResp, err := this.RPC().HTTPFirewallPolicyRPC().FindAllEnabledHTTPFirewallPolicies(this.AdminContext(), &pb.FindAllEnabledHTTPFirewallPoliciesRequest{})
+	// 获取当前服务所在集群的WAF设置
+	firewallPolicy, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyWithServerId(this.AdminContext(), params.ServerId)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	policyMaps := []maps.Map{}
-	for _, p := range policiesResp.FirewallPolicies {
-		policyMaps = append(policyMaps, maps.Map{
-			"id":          p.Id,
-			"name":        p.Name,
-			"isOn":        p.IsOn,
-			"description": p.Description,
-		})
+	if firewallPolicy != nil {
+		this.Data["firewallPolicy"] = maps.Map{
+			"id":   firewallPolicy.Id,
+			"name": firewallPolicy.Name,
+			"isOn": firewallPolicy.IsOn,
+		}
+	} else {
+		this.Data["firewallPolicy"] = nil
 	}
-	this.Data["firewallPolicies"] = policyMaps

 	this.Show()
 }
--- a/internal/web/actions/default/servers/server/settings/waf/index.go
+++ b/internal/web/actions/default/servers/server/settings/waf/index.go
@@ -3,6 +3,7 @@ package waf
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
@@ -29,22 +30,21 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["webId"] = webConfig.Id
 	this.Data["firewallConfig"] = webConfig.FirewallRef

-	// 当前已有策略
-	policiesResp, err := this.RPC().HTTPFirewallPolicyRPC().FindAllEnabledHTTPFirewallPolicies(this.AdminContext(), &pb.FindAllEnabledHTTPFirewallPoliciesRequest{})
+	// 获取当前服务所在集群的WAF设置
+	firewallPolicy, err := models.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyWithServerId(this.AdminContext(), params.ServerId)
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	policyMaps := []maps.Map{}
-	for _, p := range policiesResp.FirewallPolicies {
-		policyMaps = append(policyMaps, maps.Map{
-			"id":          p.Id,
-			"name":        p.Name,
-			"isOn":        p.IsOn,
-			"description": p.Description,
-		})
+	if firewallPolicy != nil {
+		this.Data["firewallPolicy"] = maps.Map{
+			"id":   firewallPolicy.Id,
+			"name": firewallPolicy.Name,
+			"isOn": firewallPolicy.IsOn,
+		}
+	} else {
+		this.Data["firewallPolicy"] = nil
 	}
-	this.Data["firewallPolicies"] = policyMaps

 	this.Show()
 }
--- a/internal/web/actions/default/users/createPopup.go
+++ b/internal/web/actions/default/users/createPopup.go
@@ -77,15 +77,15 @@ func (this *CreatePopupAction) RunPost(params struct {
 	}

 	createResp, err := this.RPC().UserRPC().CreateUser(this.AdminContext(), &pb.CreateUserRequest{
-		Username:  params.Username,
-		Password:  params.Pass1,
-		Fullname:  params.Fullname,
-		Mobile:    params.Mobile,
-		Tel:       params.Tel,
-		Email:     params.Email,
-		Remark:    params.Remark,
-		Source:    "admin:" + numberutils.FormatInt64(this.AdminId()),
-		ClusterId: params.ClusterId,
+		Username:      params.Username,
+		Password:      params.Pass1,
+		Fullname:      params.Fullname,
+		Mobile:        params.Mobile,
+		Tel:           params.Tel,
+		Email:         params.Email,
+		Remark:        params.Remark,
+		Source:        "admin:" + numberutils.FormatInt64(this.AdminId()),
+		NodeClusterId: params.ClusterId,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/users/update.go
+++ b/internal/web/actions/default/users/update.go
@@ -115,16 +115,16 @@ func (this *UpdateAction) RunPost(params struct {
 	}

 	_, err = this.RPC().UserRPC().UpdateUser(this.AdminContext(), &pb.UpdateUserRequest{
-		UserId:    params.UserId,
-		Username:  params.Username,
-		Password:  params.Pass1,
-		Fullname:  params.Fullname,
-		Mobile:    params.Mobile,
-		Tel:       params.Tel,
-		Email:     params.Email,
-		Remark:    params.Remark,
-		IsOn:      params.IsOn,
-		ClusterId: params.ClusterId,
+		UserId:        params.UserId,
+		Username:      params.Username,
+		Password:      params.Pass1,
+		Fullname:      params.Fullname,
+		Mobile:        params.Mobile,
+		Tel:           params.Tel,
+		Email:         params.Email,
+		Remark:        params.Remark,
+		IsOn:          params.IsOn,
+		NodeClusterId: params.ClusterId,
 	})
 	if err != nil {
 		this.ErrorPage(err)