diff --git a/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go b/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go index 60b8233a..144c2f00 100644 --- a/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go +++ b/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go @@ -1,7 +1,6 @@ package locationutils import ( - teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" @@ -162,17 +161,7 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.FastcgiRef != nil && locationConfig.Web.FastcgiRef.IsPrior, }) - if teaconst.IsPlus { - if locationConfig.Web != nil && locationConfig.Web.RequestScripts != nil { - _ = locationConfig.Web.RequestScripts.Init() - } - menuItems = append(menuItems, maps.Map{ - "name": "边缘脚本", - "url": "/servers/server/settings/locations/requestScripts?serverId=" + serverIdString + "&locationId=" + locationIdString, - "isActive": secondMenuItem == "requestScripts", - "isOn": locationConfig.Web != nil && locationConfig.Web.RequestScripts != nil && !locationConfig.Web.RequestScripts.IsEmpty(), - }) - } + menuItems = filterMenuItems(locationConfig, menuItems, serverIdString, locationIdString, secondMenuItem) menuItems = append(menuItems, maps.Map{ "name": "-", diff --git a/internal/web/actions/default/servers/server/settings/locations/locationutils/menu.go b/internal/web/actions/default/servers/server/settings/locations/locationutils/menu.go new file mode 100644 index 00000000..7a7cfda4 --- /dev/null +++ b/internal/web/actions/default/servers/server/settings/locations/locationutils/menu.go @@ -0,0 +1,14 @@ +// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. +//go:build !plus +// +build !plus + +package locationutils + +import ( + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" + "github.com/iwind/TeaGo/maps" +) + +func filterMenuItems(locationConfig *serverconfigs.HTTPLocationConfig, menuItems []maps.Map, serverIdString string, locationIdString string, secondMenuItem string) []maps.Map { + return menuItems +} diff --git a/internal/web/actions/default/servers/serverutils/menu.go b/internal/web/actions/default/servers/serverutils/menu.go new file mode 100644 index 00000000..9403a43c --- /dev/null +++ b/internal/web/actions/default/servers/serverutils/menu.go @@ -0,0 +1,14 @@ +// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. +//go:build !plus +// +build !plus + +package serverutils + +import ( + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" + "github.com/iwind/TeaGo/maps" +) + +func filterMenuItems(serverConfig *serverconfigs.ServerConfig, menuItems []maps.Map, serverIdString string, secondMenuItem string) []maps.Map { + return menuItems +} diff --git a/internal/web/actions/default/servers/serverutils/server_helper.go b/internal/web/actions/default/servers/serverutils/server_helper.go index 1a57ef53..980009fa 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -391,24 +391,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "isOn": serverConfig.Web != nil && serverConfig.Web.RequestLimit != nil && serverConfig.Web.RequestLimit.IsOn, }) - if teaconst.IsPlus { - menuItems = append(menuItems, maps.Map{ - "name": "流量限制", - "url": "/servers/server/settings/traffic?serverId=" + serverIdString, - "isActive": secondMenuItem == "traffic", - "isOn": serverConfig.TrafficLimit != nil && serverConfig.TrafficLimit.IsOn, - }) - - if serverConfig.Web != nil && serverConfig.Web.RequestScripts != nil { - _ = serverConfig.Web.RequestScripts.Init() - } - menuItems = append(menuItems, maps.Map{ - "name": "边缘脚本", - "url": "/servers/server/settings/requestScripts?serverId=" + serverIdString, - "isActive": secondMenuItem == "requestScripts", - "isOn": serverConfig.Web != nil && serverConfig.Web.RequestScripts != nil && !serverConfig.Web.RequestScripts.IsEmpty(), - }) - } + menuItems = filterMenuItems(serverConfig, menuItems, serverIdString, secondMenuItem) menuItems = append(menuItems, maps.Map{ "name": "-",