实现重写规则管理

internal/web/actions/default/servers/server/settings/locations/create.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 )
 
+// 创建路径规则
 type CreateAction struct {
 	actionutils.ParentAction
 }
@@ -22,6 +23,7 @@ func (this *CreateAction) Init() {
 
 func (this *CreateAction) RunGet(params struct {
 	ServerId int64
+	ParentId int64 // 父节点
 }) {
 	webConfig, err := webutils.FindWebConfigWithServerId(this.Parent(), params.ServerId)
 	if err != nil {

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

@@ -15,6 +15,7 @@ func init() {
 			Get("", new(IndexAction)).
 			GetPost("/create", new(CreateAction)).
 			Post("/delete", new(DeleteAction)).
+			Post("/sort", new(SortAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go

@@ -79,15 +79,16 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString
 		"isActive": secondMenuItem == "reverseProxy",
 		"isOn":     locationConfig != nil && locationConfig.ReverseProxyRef != nil && locationConfig.ReverseProxyRef.IsPrior,
 	})
+	menuItems = append(menuItems, maps.Map{
+		"name":     "-",
+		"url":      "",
+		"isActive": false,
+	})
 	menuItems = append(menuItems, maps.Map{
 		"name":     "重写规则",
 		"url":      "/servers/server/settings/locations/rewrite?serverId=" + serverIdString + "&locationId=" + locationIdString,
 		"isActive": secondMenuItem == "rewrite",
-	})
-	menuItems = append(menuItems, maps.Map{
-		"name":     "访问控制",
-		"url":      "/servers/server/settings/locations/access?serverId=" + serverIdString + "&locationId=" + locationIdString,
-		"isActive": secondMenuItem == "access",
+		"isOn":     locationConfig != nil && locationConfig.Web != nil && len(locationConfig.Web.RewriteRefs) > 0,
 	})
 	menuItems = append(menuItems, maps.Map{
 		"name":     "WAF",
@@ -102,9 +103,9 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString
 		"isOn":     locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.CacheRef != nil && locationConfig.Web.CacheRef.IsPrior,
 	})
 	menuItems = append(menuItems, maps.Map{
-		"name":     "-",
-		"url":      "",
-		"isActive": false,
+		"name":     "访问控制",
+		"url":      "/servers/server/settings/locations/access?serverId=" + serverIdString + "&locationId=" + locationIdString,
+		"isActive": secondMenuItem == "access",
 	})
 	menuItems = append(menuItems, maps.Map{
 		"name":     "字符编码",

internal/web/actions/default/servers/server/settings/locations/rewrite/index.go

@@ -2,6 +2,7 @@ package rewrite
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/webutils"
 )
 
 type IndexAction struct {
@@ -14,7 +15,18 @@ func (this *IndexAction) Init() {
 func (this *IndexAction) RunGet(params struct {
 	LocationId int64
 }) {
-	// TODO
+	webConfig, err := webutils.FindWebConfigWithLocationId(this.Parent(), params.LocationId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["webId"] = webConfig.Id
+
+	if len(webConfig.RewriteRules) == 0 {
+		this.Data["rewriteRules"] = []interface{}{}
+	} else {
+		this.Data["rewriteRules"] = webConfig.RewriteRules
+	}
 
 	this.Show()
 }

internal/web/actions/default/servers/server/settings/locations/sort.go

@@ -0,0 +1,58 @@
+package locations
+
+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"
+)
+
+type SortAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SortAction) RunPost(params struct {
+	WebId       int64
+	LocationIds []int64
+}) {
+	if len(params.LocationIds) == 0 {
+		this.Success()
+	}
+
+	webConfig, err := webutils.FindWebConfigWithId(this.Parent(), params.WebId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if webConfig == nil {
+		this.Success()
+	}
+	refMap := map[int64]*serverconfigs.HTTPLocationRef{}
+	for _, ref := range webConfig.LocationRefs {
+		refMap[ref.LocationId] = ref
+	}
+
+	newRefs := []*serverconfigs.HTTPLocationRef{}
+	for _, locationId := range params.LocationIds {
+		ref, ok := refMap[locationId]
+		if ok {
+			newRefs = append(newRefs, ref)
+		}
+	}
+	newRefsJSON, err := json.Marshal(newRefs)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	_, err = this.RPC().HTTPWebRPC().UpdateHTTPWebLocations(this.AdminContext(), &pb.UpdateHTTPWebLocationsRequest{
+		WebId:         params.WebId,
+		LocationsJSON: newRefsJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Success()
+}