TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2026-02-07 21:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

路由规则找不到的时候提示用户

Browse Source
This commit is contained in:
刘祥超
2023-07-17 15:30:19 +08:00
parent 2d4378423b
commit a99bcdc437
6 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go
View File

@@ -20,13 +20,13 @@ func NewLocationHelper() *LocationHelper {
}
func (this *LocationHelper) BeforeAction(actionPtr actions.ActionWrapper) {
action := actionPtr.Object()
var action = actionPtr.Object()
if action.Request.Method != http.MethodGet {
return
}
serverIdString := action.ParamString("serverId")
locationIdString := action.ParamString("locationId")
var serverIdString = action.ParamString("serverId")
var locationIdString = action.ParamString("locationId")
action.Data["leftMenuItemIsDisabled"] = true
action.Data["mainMenu"] = "server"
@@ -39,7 +39,7 @@ func (this *LocationHelper) BeforeAction(actionPtr actions.ActionWrapper) {
if parentActionValue.IsValid() {
parentAction, isOk := parentActionValue.Interface().(actionutils.ParentAction)
if isOk {
locationId := action.ParamInt64("locationId")
var locationId = action.ParamInt64("locationId")
locationConfig, isOk := FindLocationConfig(&parentAction, locationId)
if !isOk {
return

8
internal/web/actions/default/servers/server/settings/locations/locationutils/utils.go
View File

@@ -2,9 +2,12 @@ package locationutils
import (
"encoding/json"
"errors"
"github.com/TeaOSLab/EdgeAdmin/internal/utils"
"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/types"
)
// FindLocationConfig 查找路由规则配置
@@ -15,6 +18,11 @@ func FindLocationConfig(parentAction *actionutils.ParentAction, locationId int64
return
}
if utils.JSONIsNull(locationConfigResp.LocationJSON) {
parentAction.ErrorPage(errors.New("location '" + types.String(locationId) + "' not found"))
return
}
locationConfig = &serverconfigs.HTTPLocationConfig{}
err = json.Unmarshal(locationConfigResp.LocationJSON, locationConfig)
if err != nil {