From 860816719ed063bda78beb73efeca6d33f163630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Thu, 20 Jul 2023 16:54:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=B8=AA=E8=8A=82=E7=82=B9=E6=89=80?= =?UTF-8?q?=E5=9C=A8=E5=A4=9A=E4=B8=AA=E9=9B=86=E7=BE=A4=E5=85=B1=E7=94=A8?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=BC=93=E5=AD=98=E7=AD=96=E7=95=A5=E6=97=B6?= =?UTF-8?q?=E5=8F=AA=E5=8A=A0=E8=BD=BD=E5=85=B6=E4=B8=AD=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/node_dao.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/internal/db/models/node_dao.go b/internal/db/models/node_dao.go index af7a25bb..e8ae328e 100644 --- a/internal/db/models/node_dao.go +++ b/internal/db/models/node_dao.go @@ -1089,6 +1089,9 @@ func (this *NodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64, dataMap *shared config.HTTPCCPolicies = map[int64]*nodeconfigs.HTTPCCPolicy{} config.HTTP3Policies = map[int64]*nodeconfigs.HTTP3Policy{} config.HTTPPagesPolicies = map[int64]*nodeconfigs.HTTPPagesPolicy{} + + var cachePolicyIds = []int64{} + var allowIPMaps = map[string]bool{} for _, clusterId := range clusterIds { nodeCluster, err := SharedNodeClusterDAO.FindClusterBasicInfo(tx, clusterId, cacheMap) @@ -1128,12 +1131,15 @@ func (this *NodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64, dataMap *shared // 缓存策略 var httpCachePolicyId = int64(nodeCluster.CachePolicyId) if httpCachePolicyId > 0 { - cachePolicy, err := SharedHTTPCachePolicyDAO.ComposeCachePolicy(tx, httpCachePolicyId, cacheMap) - if err != nil { - return nil, err - } - if cachePolicy != nil { - config.HTTPCachePolicies = append(config.HTTPCachePolicies, cachePolicy) + if !lists.ContainsInt64(cachePolicyIds, httpCachePolicyId) { + cachePolicyIds = append(cachePolicyIds, httpCachePolicyId) + cachePolicy, err := SharedHTTPCachePolicyDAO.ComposeCachePolicy(tx, httpCachePolicyId, cacheMap) + if err != nil { + return nil, err + } + if cachePolicy != nil { + config.HTTPCachePolicies = append(config.HTTPCachePolicies, cachePolicy) + } } }