反向代理支持RequestPath、RequestURI等

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

@@ -5,7 +5,6 @@ import (
 	"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/actions"
 	"github.com/iwind/TeaGo/maps"
 )
 
@@ -40,6 +39,7 @@ func (this *IndexAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
+	this.Data["reverseProxyRef"] = reverseProxyRef
 
 	reverseProxy := &serverconfigs.ReverseProxyConfig{}
 	err = json.Unmarshal(reverseProxyResp.ReverseProxyJSON, reverseProxy)
@@ -47,10 +47,9 @@ func (this *IndexAction) RunGet(params struct {
 		this.ErrorPage(err)
 		return
 	}
+	this.Data["reverseProxyConfig"] = reverseProxy
 
 	this.Data["serverType"] = serverType
-	this.Data["reverseProxyRef"] = reverseProxyRef
-	this.Data["reverseProxyConfig"] = reverseProxy
 
 	primaryOriginMaps := []maps.Map{}
 	backupOriginMaps := []maps.Map{}
@@ -75,23 +74,3 @@ func (this *IndexAction) RunGet(params struct {
 
 	this.Show()
 }
-
-func (this *IndexAction) RunPost(params struct {
-	LocationId          int64
-	ReverseProxyRefJSON []byte
-
-	Must *actions.Must
-}) {
-	// TODO 校验配置
-
-	_, err := this.RPC().HTTPLocationRPC().UpdateHTTPLocationReverseProxy(this.AdminContext(), &pb.UpdateHTTPLocationReverseProxyRequest{
-		LocationId:       params.LocationId,
-		ReverseProxyJSON: params.ReverseProxyRefJSON,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-
-	this.Success()
-}

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

@@ -16,8 +16,9 @@ func init() {
 			Data("mainTab", "setting").
 			Data("tinyMenuItem", "reverseProxy").
 			Prefix("/servers/server/settings/locations/reverseProxy").
-			GetPost("", new(IndexAction)).
+			Get("", new(IndexAction)).
 			GetPost("/scheduling", new(SchedulingAction)).
+			GetPost("/setting", new(SettingAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go

@@ -0,0 +1,82 @@
+package reverseProxy
+
+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/actions"
+)
+
+type SettingAction struct {
+	actionutils.ParentAction
+}
+
+func (this *SettingAction) Init() {
+	this.FirstMenu("setting")
+}
+
+func (this *SettingAction) RunGet(params struct {
+	LocationId int64
+}) {
+	reverseProxyResp, err := this.RPC().HTTPLocationRPC().FindAndInitHTTPLocationReverseProxyConfig(this.AdminContext(), &pb.FindAndInitHTTPLocationReverseProxyConfigRequest{LocationId: params.LocationId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	reverseProxyRef := &serverconfigs.ReverseProxyRef{}
+	err = json.Unmarshal(reverseProxyResp.ReverseProxyRefJSON, reverseProxyRef)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	reverseProxy := &serverconfigs.ReverseProxyConfig{}
+	err = json.Unmarshal(reverseProxyResp.ReverseProxyJSON, reverseProxy)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	this.Data["reverseProxyRef"] = reverseProxyRef
+	this.Data["reverseProxyConfig"] = reverseProxy
+
+	this.Show()
+}
+
+func (this *SettingAction) RunPost(params struct {
+	LocationId          int64
+	ReverseProxyRefJSON []byte
+	ReverseProxyJSON    []byte
+
+	Must *actions.Must
+}) {
+	// TODO 校验配置
+
+	reverseProxyConfig := &serverconfigs.ReverseProxyConfig{}
+	err := json.Unmarshal(params.ReverseProxyJSON, reverseProxyConfig)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 设置是否启用
+	_, err = this.RPC().HTTPLocationRPC().UpdateHTTPLocationReverseProxy(this.AdminContext(), &pb.UpdateHTTPLocationReverseProxyRequest{
+		LocationId:       params.LocationId,
+		ReverseProxyJSON: params.ReverseProxyRefJSON,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 设置反向代理相关信息
+	_, err = this.RPC().ReverseProxyRPC().UpdateReverseProxy(this.AdminContext(), &pb.UpdateReverseProxyRequest{
+		ReverseProxyId: reverseProxyConfig.Id,
+		RequestHost:    reverseProxyConfig.RequestHost,
+		RequestURI:     reverseProxyConfig.RequestURI,
+		StripPrefix:    reverseProxyConfig.StripPrefix,
+	})
+
+	this.Success()
+}