TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-12-25 03:26:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

实现路径规则部分功能

Browse Source
This commit is contained in:
刘祥超
2020-09-21 19:51:50 +08:00
parent 47bf305df6
commit a4b806fa7e
50 changed files with 630 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/web/actions/default/servers/server/settings/headers/createDeletePopup.go
View File

@@ -36,7 +36,7 @@ func (this *CreateDeletePopupAction) RunPost(params struct {
return
}
policyConfig := &shared.HTTPHeaderPolicy{}
err = json.Unmarshal(policyConfigResp.Config, policyConfig)
err = json.Unmarshal(policyConfigResp.HeaderPolicyJSON, policyConfig)
if err != nil {
this.ErrorPage(err)
return

2
internal/web/actions/default/servers/server/settings/headers/createSetPopup.go
View File

@@ -42,7 +42,7 @@ func (this *CreateSetPopupAction) RunPost(params struct {
return
}
policyConfig := &shared.HTTPHeaderPolicy{}
err = json.Unmarshal(configResp.Config, policyConfig)
err = json.Unmarshal(configResp.HeaderPolicyJSON, policyConfig)
if err != nil {
this.ErrorPage(err)
return

2
internal/web/actions/default/servers/server/settings/headers/delete.go
View File

@@ -25,7 +25,7 @@ func (this *DeleteAction) RunPost(params struct {
return
}
policyConfig := &shared.HTTPHeaderPolicy{}
err = json.Unmarshal(policyConfigResp.Config, policyConfig)
err = json.Unmarshal(policyConfigResp.HeaderPolicyJSON, policyConfig)
if err != nil {
this.ErrorPage(err)
return

2
internal/web/actions/default/servers/server/settings/headers/deleteDeletingHeader.go
View File

@@ -20,7 +20,7 @@ func (this *DeleteDeletingHeaderAction) RunPost(params struct {
this.ErrorPage(err)
return
}
policyConfigJSON := policyConfigResp.Config
policyConfigJSON := policyConfigResp.HeaderPolicyJSON
policyConfig := &shared.HTTPHeaderPolicy{}
err = json.Unmarshal(policyConfigJSON, policyConfig)
if err != nil {

18
internal/web/actions/default/servers/server/settings/headers/index.go
View File

@@ -1,11 +1,10 @@
package headers
import (
"encoding/json"
"errors"
"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 IndexAction struct {
@@ -20,13 +19,7 @@ func (this *IndexAction) Init() {
func (this *IndexAction) RunGet(params struct {
ServerId int64
}) {
webConfigResp, err := this.RPC().ServerRPC().FindAndInitServerWebConfig(this.AdminContext(), &pb.FindAndInitServerWebRequest{ServerId: params.ServerId})
if err != nil {
this.ErrorPage(err)
return
}
webConfig := &serverconfigs.HTTPWebConfig{}
err = json.Unmarshal(webConfigResp.Config, webConfig)
webConfig, err := webutils.FindWebConfigWithServerId(this.Parent(), params.ServerId)
if err != nil {
this.ErrorPage(err)
return
@@ -73,12 +66,7 @@ func (this *IndexAction) RunGet(params struct {
// 重新获取配置
if isChanged {
webConfigResp, err := this.RPC().ServerRPC().FindAndInitServerWebConfig(this.AdminContext(), &pb.FindAndInitServerWebRequest{ServerId: params.ServerId})
if err != nil {
this.ErrorPage(err)
return
}
err = json.Unmarshal(webConfigResp.Config, webConfig)
webConfig, err = webutils.FindWebConfigWithServerId(this.Parent(), params.ServerId)
if err != nil {
this.ErrorPage(err)
return

2
internal/web/actions/default/servers/server/settings/headers/updateSetPopup.go
View File

@@ -29,7 +29,7 @@ func (this *UpdateSetPopupAction) RunGet(params struct {
return
}
headerConfig := &shared.HTTPHeaderConfig{}
err = json.Unmarshal(headerResp.Config, headerConfig)
err = json.Unmarshal(headerResp.HeaderJSON, headerConfig)
if err != nil {
this.ErrorPage(err)
return