实现服务的缓存策略设置

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

@@ -0,0 +1,81 @@
+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 {
+	actionutils.ParentAction
+}
+
+func (this *CreatePopupAction) Init() {
+	this.Nav("", "", "")
+}
+
+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
+
+	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)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if len(cacheRef.Key) == 0 {
+		this.Fail("请输入缓存Key")
+	}
+
+	cacheRef.CachePolicyId = cachePolicy.Id
+	cacheRef.CachePolicy = cachePolicy
+
+	err = cacheRef.Init()
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["cacheRef"] = cacheRef
+
+	this.Success()
+}

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

@@ -1,11 +1,12 @@
 package cache
 
 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/EdgeCommon/pkg/rpc/pb"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/iwind/TeaGo/actions"
-	"github.com/iwind/TeaGo/maps"
 )
 
 type IndexAction struct {
@@ -27,23 +28,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 
 	this.Data["webId"] = webConfig.Id
-	this.Data["cacheConfig"] = webConfig.CacheRefs
-
-	// 所有缓存策略
-	cachePoliciesResp, err := this.RPC().HTTPCachePolicyRPC().FindAllEnabledHTTPCachePolicies(this.AdminContext(), &pb.FindAllEnabledHTTPCachePoliciesRequest{})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	policyMaps := []maps.Map{}
-	for _, policy := range cachePoliciesResp.CachePolicies {
-		policyMaps = append(policyMaps, maps.Map{
-			"id":   policy.Id,
-			"name": policy.Name,
-			"isOn": policy.IsOn,
-		})
-	}
-	this.Data["policies"] = policyMaps
+	this.Data["cacheConfig"] = webConfig.Cache
 
 	this.Show()
 }
@@ -55,10 +40,27 @@ func (this *IndexAction) RunPost(params struct {
 	Must *actions.Must
 }) {
 	// TODO 校验配置
+	cacheConfig := &serverconfigs.HTTPCacheConfig{}
+	err := json.Unmarshal(params.CacheJSON, cacheConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
 
-	_, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCache(this.AdminContext(), &pb.UpdateHTTPWebCacheRequest{
+	// 去除不必要的部分
+	for _, cacheRef := range cacheConfig.CacheRefs {
+		cacheRef.CachePolicy = nil
+	}
+
+	cacheJSON, err := json.Marshal(cacheConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCache(this.AdminContext(), &pb.UpdateHTTPWebCacheRequest{
 		WebId:     params.WebId,
-		CacheJSON: params.CacheJSON,
+		CacheJSON: cacheJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)

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

@@ -13,6 +13,7 @@ func init() {
 			Helper(serverutils.NewServerHelper()).
 			Prefix("/servers/server/settings/cache").
 			GetPost("", new(IndexAction)).
+			GetPost("/createPopup", new(CreatePopupAction)).
 			EndAll()
 	})
 }