From 1d946fb08dbf7983d2129f7cabdff62ecff52ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Sun, 4 Oct 2020 20:38:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=9C=8D=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=AD=96=E7=95=A5=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/http_web_dao.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/db/models/http_web_dao.go b/internal/db/models/http_web_dao.go index 91dbac63..dc896adb 100644 --- a/internal/db/models/http_web_dao.go +++ b/internal/db/models/http_web_dao.go @@ -215,23 +215,23 @@ func (this *HTTPWebDAO) ComposeWebConfig(webId int64) (*serverconfigs.HTTPWebCon // 缓存配置 if IsNotNull(web.Cache) { - cacheRefs := []*serverconfigs.HTTPCacheRef{} - err = json.Unmarshal([]byte(web.Cache), &cacheRefs) + cacheConfig := &serverconfigs.HTTPCacheConfig{} + err = json.Unmarshal([]byte(web.Cache), &cacheConfig) if err != nil { return nil, err } - for _, cacheRef := range cacheRefs { + for _, cacheRef := range cacheConfig.CacheRefs { if cacheRef.CachePolicyId > 0 { cachePolicy, err := SharedHTTPCachePolicyDAO.ComposeCachePolicy(cacheRef.CachePolicyId) if err != nil { return nil, err } if cachePolicy != nil { - config.CacheRefs = append(config.CacheRefs, cacheRef) - config.CachePolicies = append(config.CachePolicies, cachePolicy) + cacheRef.CachePolicy = cachePolicy } } } + config.Cache = cacheConfig } // 防火墙配置