diff --git a/internal/web/actions/default/servers/groups/group/servergrouputils/menu.go b/internal/web/actions/default/servers/groups/group/servergrouputils/menu.go new file mode 100644 index 00000000..58789709 --- /dev/null +++ b/internal/web/actions/default/servers/groups/group/servergrouputils/menu.go @@ -0,0 +1,19 @@ +// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. + +//go:build !plus +// +build !plus + +package servergrouputils + +import ( + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/maps" +) + +func filterMenuItems(leftMenuItems []maps.Map, groupId int64, urlPrefix string, menuItem string, configInfoResp *pb.FindEnabledServerGroupConfigInfoResponse) []maps.Map { + return leftMenuItems +} + +func filterMenuItems2(leftMenuItems []maps.Map, groupId int64, urlPrefix string, menuItem string, configInfoResp *pb.FindEnabledServerGroupConfigInfoResponse) []maps.Map { + return leftMenuItems +} diff --git a/internal/web/actions/default/servers/groups/group/servergrouputils/utils.go b/internal/web/actions/default/servers/groups/group/servergrouputils/utils.go index e8b63c10..8d29e417 100644 --- a/internal/web/actions/default/servers/groups/group/servergrouputils/utils.go +++ b/internal/web/actions/default/servers/groups/group/servergrouputils/utils.go @@ -4,7 +4,6 @@ package servergrouputils import ( "errors" - teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/maps" @@ -57,82 +56,7 @@ func InitGroup(parent *actionutils.ParentAction, groupId int64, menuItem string) }, } - if teaconst.IsPlus { - leftMenuItems = append([]maps.Map{ - { - "name": "Web设置", - "url": urlPrefix + "/web?groupId=" + types.String(groupId), - "isActive": menuItem == "web", - "isOn": configInfoResp.HasRootConfig, - }, - }, leftMenuItems...) - leftMenuItems = append(leftMenuItems, []maps.Map{ - { - "name": "-", - "url": "", - }, - { - "name": "WAF", - "url": urlPrefix + "/waf?groupId=" + types.String(groupId), - "isActive": menuItem == "waf", - "isOn": configInfoResp.HasWAFConfig, - }, - { - "name": "缓存", - "url": urlPrefix + "//cache?groupId=" + types.String(groupId), - "isActive": menuItem == "cache", - "isOn": configInfoResp.HasCacheConfig, - }, - { - "name": "字符编码", - "url": urlPrefix + "/charset?groupId=" + types.String(groupId), - "isActive": menuItem == "charset", - "isOn": configInfoResp.HasCharsetConfig, - }, - { - "name": "访问日志", - "url": urlPrefix + "/accessLog?groupId=" + types.String(groupId), - "isActive": menuItem == "accessLog", - "isOn": configInfoResp.HasAccessLogConfig, - }, - { - "name": "统计", - "url": urlPrefix + "/stat?groupId=" + types.String(groupId), - "isActive": menuItem == "stat", - "isOn": configInfoResp.HasStatConfig, - }, - { - "name": "内容压缩", - "url": urlPrefix + "/compression?groupId=" + types.String(groupId), - "isActive": menuItem == "compression", - "isOn": configInfoResp.HasCompressionConfig, - }, - { - "name": "自定义页面", - "url": urlPrefix + "/pages?groupId=" + types.String(groupId), - "isActive": menuItem == "pages", - "isOn": configInfoResp.HasPagesConfig, - }, - { - "name": "HTTP Header", - "url": urlPrefix + "/headers?groupId=" + types.String(groupId), - "isActive": menuItem == "headers", - "isOn": configInfoResp.HasRequestHeadersConfig || configInfoResp.HasResponseHeadersConfig, - }, - { - "name": "Websocket", - "url": urlPrefix + "/websocket?groupId=" + types.String(groupId), - "isActive": menuItem == "websocket", - "isOn": configInfoResp.HasWebsocketConfig, - }, - { - "name": "WebP", - "url": urlPrefix + "/webp?groupId=" + types.String(groupId), - "isActive": menuItem == "webp", - "isOn": configInfoResp.HasWebPConfig, - }, - }...) - } + leftMenuItems = filterMenuItems(leftMenuItems, groupId, urlPrefix, menuItem, configInfoResp) leftMenuItems = append(leftMenuItems, maps.Map{ "name": "-", @@ -145,14 +69,8 @@ func InitGroup(parent *actionutils.ParentAction, groupId int64, menuItem string) "isOn": configInfoResp.HasRemoteAddrConfig, }) - if teaconst.IsPlus { - leftMenuItems = append(leftMenuItems, maps.Map{ - "name": "请求限制", - "url": urlPrefix + "/requestLimit?groupId=" + types.String(groupId), - "isActive": menuItem == "requestLimit", - "isOn": configInfoResp.HasRequestLimitConfig, - }) - } + leftMenuItems = filterMenuItems2(leftMenuItems, groupId, urlPrefix, menuItem, configInfoResp) + parent.Data["leftMenuItems"] = leftMenuItems } 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 144c2f00..2f612c70 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 @@ -66,13 +66,7 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.RedirectToHttps != nil && locationConfig.Web.RedirectToHttps.IsPrior, }) menuItems = append(menuItems, maps.Map{ - "name": "Web设置", - "url": "/servers/server/settings/locations/web?serverId=" + serverIdString + "&locationId=" + locationIdString, - "isActive": secondMenuItem == "web", - "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Root != nil && locationConfig.Web.Root.IsPrior, - }) - menuItems = append(menuItems, maps.Map{ - "name": "反向代理", + "name": "源站", "url": "/servers/server/settings/locations/reverseProxy?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "reverseProxy", "isOn": locationConfig != nil && locationConfig.ReverseProxyRef != nil && locationConfig.ReverseProxyRef.IsPrior, @@ -154,6 +148,12 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString "isActive": secondMenuItem == "webp", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.WebP != nil && locationConfig.Web.WebP.IsPrior, }) + menuItems = append(menuItems, maps.Map{ + "name": "静态分发", + "url": "/servers/server/settings/locations/web?serverId=" + serverIdString + "&locationId=" + locationIdString, + "isActive": secondMenuItem == "web", + "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Root != nil && locationConfig.Web.Root.IsPrior, + }) menuItems = append(menuItems, maps.Map{ "name": "Fastcgi", "url": "/servers/server/settings/locations/fastcgi?serverId=" + serverIdString + "&locationId=" + locationIdString, diff --git a/internal/web/actions/default/servers/serverutils/server_helper.go b/internal/web/actions/default/servers/serverutils/server_helper.go index 980009fa..c64b4b02 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -246,13 +246,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "isOff": serverConfig.HTTPS != nil && !serverConfig.HTTPS.IsOn, }) menuItems = append(menuItems, maps.Map{ - "name": "Web设置", - "url": "/servers/server/settings/web?serverId=" + serverIdString, - "isActive": secondMenuItem == "web", - "isOn": serverConfig.Web != nil && serverConfig.Web.Root != nil && serverConfig.Web.Root.IsOn, - }) - menuItems = append(menuItems, maps.Map{ - "name": "反向代理", + "name": "源站", "url": "/servers/server/settings/reverseProxy?serverId=" + serverIdString, "isActive": secondMenuItem == "reverseProxy", "isOn": serverConfig.ReverseProxyRef != nil && serverConfig.ReverseProxyRef.IsOn, @@ -364,6 +358,12 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "isOn": serverConfig.Web != nil && serverConfig.Web.WebP != nil && serverConfig.Web.WebP.IsOn, }) + menuItems = append(menuItems, maps.Map{ + "name": "静态分发", + "url": "/servers/server/settings/web?serverId=" + serverIdString, + "isActive": secondMenuItem == "web", + "isOn": serverConfig.Web != nil && serverConfig.Web.Root != nil && serverConfig.Web.Root.IsOn, + }) menuItems = append(menuItems, maps.Map{ "name": "Fastcgi", "url": "/servers/server/settings/fastcgi?serverId=" + serverIdString, @@ -419,7 +419,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "isOn": serverConfig.TLS != nil && serverConfig.TLS.IsOn && len(serverConfig.TLS.Listen) > 0, }) menuItems = append(menuItems, maps.Map{ - "name": "反向代理", + "name": "源站", "url": "/servers/server/settings/reverseProxy?serverId=" + serverIdString, "isActive": secondMenuItem == "reverseProxy", "isOn": serverConfig.ReverseProxyRef != nil && serverConfig.ReverseProxyRef.IsOn, @@ -439,7 +439,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "isOn": serverConfig.UDP != nil && serverConfig.UDP.IsOn && len(serverConfig.UDP.Listen) > 0, }) menuItems = append(menuItems, maps.Map{ - "name": "反向代理", + "name": "源站", "url": "/servers/server/settings/reverseProxy?serverId=" + serverIdString, "isActive": secondMenuItem == "reverseProxy", "isOn": serverConfig.ReverseProxyRef != nil && serverConfig.ReverseProxyRef.IsOn, diff --git a/internal/web/import.go b/internal/web/import.go index 25c477b6..eb362c03 100644 --- a/internal/web/import.go +++ b/internal/web/import.go @@ -44,6 +44,7 @@ import ( _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/settings/index" + _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/settings/remoteAddr" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy" _ "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/logs" diff --git a/web/views/@default/servers/components/cache/createPopup.html b/web/views/@default/servers/components/cache/createPopup.html index f81c0e9a..5720a3b5 100644 --- a/web/views/@default/servers/components/cache/createPopup.html +++ b/web/views/@default/servers/components/cache/createPopup.html @@ -36,7 +36,7 @@
作为一级缓存的内存最大容量,如果为0表示不使用内存作为一级缓存。
+作为一级缓存的内存最大容量,可以作为磁盘缓冲区和存储热点缓存内容,如果为0表示不使用内存作为一级缓存。
作为一级缓存的内存最大容量,如果为0表示不使用内存作为一级缓存。
+作为一级缓存的内存最大容量,可以作为磁盘缓冲区和存储热点缓存内容,如果为0表示不使用内存作为一级缓存。
+作为一级缓存的内存最大容量,如果为0表示不使用内存作为一级缓存。
+作为一级缓存的内存最大容量,可以作为磁盘缓冲区和存储热点缓存内容,如果为0表示不使用内存作为一级缓存。
作为一级缓存的内存最大容量,如果为0表示不使用内存作为一级缓存。
+作为一级缓存的内存最大容量,可以作为磁盘缓冲区和存储热点缓存内容,如果为0表示不使用内存作为一级缓存。