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

请求条件支持参数匹配

Browse Source
This commit is contained in:
GoEdgeLab
2021-06-09 17:14:31 +08:00
parent 382b526894
commit 40f0cc3a17
10 changed files with 349 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/web/actions/default/servers/server/settings/conds/addCondPopup.go
View File

@@ -30,7 +30,7 @@ func (this *AddCondPopupAction) RunPost(params struct {
condConfig := &shared.HTTPRequestCond{}
err := json.Unmarshal(params.CondJSON, condConfig)
if err != nil {
this.Fail("解析条件设置时发生了错误：" + err.Error())
this.Fail("解析条件设置时发生了错误：" + err.Error() + ", JSON: " + string(params.CondJSON))
}
err = condConfig.Init()
if err != nil {

23
internal/web/actions/default/ui/components.go
View File

@@ -4,6 +4,7 @@ import (
"bytes"
"encoding/json"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/server/settings/conds/condutils"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
"github.com/iwind/TeaGo/Tea"
"github.com/iwind/TeaGo/actions"
"github.com/iwind/TeaGo/files"
@@ -52,13 +53,33 @@ func (this *ComponentsAction) RunGet(params struct{}) {
// 条件组件
typesJSON, err := json.Marshal(condutils.ReadAllAvailableCondTypes())
if err != nil {
logs.Println("ComponentsAction: " + err.Error())
logs.Println("ComponentsAction marshal request cond types failed: " + err.Error())
} else {
buffer.WriteString("window.REQUEST_COND_COMPONENTS = ")
buffer.Write(typesJSON)
buffer.Write([]byte{'\n', '\n'})
}
// 条件操作符
requestOperatorsJSON, err := json.Marshal(shared.AllRequestOperators())
if err != nil {
logs.Println("ComponentsAction marshal request operators failed: " + err.Error())
} else {
buffer.WriteString("window.REQUEST_COND_OPERATORS = ")
buffer.Write(requestOperatorsJSON)
buffer.Write([]byte{'\n', '\n'})
}
// 请求变量
requestVariablesJSON, err := json.Marshal(shared.DefaultRequestVariables())
if err != nil {
logs.Println("ComponentsAction marshal request variables failed: " + err.Error())
} else {
buffer.WriteString("window.REQUEST_VARIABLES = ")
buffer.Write(requestVariablesJSON)
buffer.Write([]byte{'\n', '\n'})
}
componentsData = buffer.Bytes()
this.Write(componentsData)
}