TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2026-04-27 08:05:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

路径规则、重写规则、URL跳转规则均支持匹配条件；URL跳转规则增加排序、是否启用功能

Browse Source
This commit is contained in:
刘祥超
2021-06-09 21:45:26 +08:00
parent 33f45dfc92
commit 748105eae1
16 changed files with 275 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/web/actions/default/servers/server/settings/rewrite/createPopup.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
"github.com/iwind/TeaGo/actions"
"github.com/iwind/TeaGo/types"
"regexp"
@@ -37,6 +38,8 @@ func (this *CreatePopupAction) RunPost(params struct {
IsBreak bool
IsOn bool
CondsJSON []byte
Must *actions.Must
}) {
params.Must.
@@ -54,6 +57,20 @@ func (this *CreatePopupAction) RunPost(params struct {
Field("replace", params.Replace).
Require("请输入目标URL")
// 校验匹配条件
if len(params.CondsJSON) > 0 {
conds := &shared.HTTPRequestCondsConfig{}
err := json.Unmarshal(params.CondsJSON, conds)
if err != nil {
this.Fail("匹配条件校验失败：" + err.Error())
}
err = conds.Init()
if err != nil {
this.Fail("匹配条件校验失败：" + err.Error())
}
}
// web配置
webConfig, err := dao.SharedHTTPWebDAO.FindWebConfigWithId(this.AdminContext(), params.WebId)
if err != nil {
@@ -71,6 +88,7 @@ func (this *CreatePopupAction) RunPost(params struct {
WithQuery: params.WithQuery,
IsBreak: params.IsBreak,
IsOn: params.IsOn,
CondsJSON: params.CondsJSON,
})
if err != nil {
this.ErrorPage(err)

18
internal/web/actions/default/servers/server/settings/rewrite/updatePopup.go
View File

@@ -1,9 +1,11 @@
package rewrite
import (
"encoding/json"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
"github.com/iwind/TeaGo/actions"
"github.com/iwind/TeaGo/types"
"regexp"
@@ -56,6 +58,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
WithQuery bool
IsBreak bool
IsOn bool
CondsJSON []byte
Must *actions.Must
}) {
@@ -76,6 +79,20 @@ func (this *UpdatePopupAction) RunPost(params struct {
Field("replace", params.Replace).
Require("请输入目标URL")
// 校验匹配条件
if len(params.CondsJSON) > 0 {
conds := &shared.HTTPRequestCondsConfig{}
err := json.Unmarshal(params.CondsJSON, conds)
if err != nil {
this.Fail("匹配条件校验失败：" + err.Error())
}
err = conds.Init()
if err != nil {
this.Fail("匹配条件校验失败：" + err.Error())
}
}
// 修改
_, err := this.RPC().HTTPRewriteRuleRPC().UpdateHTTPRewriteRule(this.AdminContext(), &pb.UpdateHTTPRewriteRuleRequest{
RewriteRuleId: params.RewriteRuleId,
@@ -87,6 +104,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
WithQuery: params.WithQuery,
IsBreak: params.IsBreak,
IsOn: params.IsOn,
CondsJSON: params.CondsJSON,
})
if err != nil {
this.ErrorPage(err)