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

This commit is contained in:
GoEdgeLab
2021-06-09 21:45:26 +08:00
parent 40f0cc3a17
commit 2f0c0015a0
16 changed files with 275 additions and 63 deletions

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)