From 7bda20e4d5d9d07bfb2d0ce4b463c7503ceca0d5 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Wed, 5 Jul 2023 16:51:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=91=E7=AB=99=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=8F=9C=E5=8D=95=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../locationutils/location_helper.go | 24 +++++++------- .../servers/serverutils/server_helper.go | 33 +++++++++++-------- 2 files changed, 31 insertions(+), 26 deletions(-) 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 b3f7763d..bef8dfa7 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 @@ -118,24 +118,12 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString "isActive": secondMenuItem == "userAgent", "isOn": locationConfig.Web != nil && locationConfig.Web.UserAgent != nil && locationConfig.Web.UserAgent.IsPrior, }) - menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.Server_MenuSettingCharset), - "url": "/servers/server/settings/locations/charset?serverId=" + serverIdString + "&locationId=" + locationIdString, - "isActive": secondMenuItem == "charset", - "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Charset != nil && locationConfig.Web.Charset.IsPrior, - }) menuItems = append(menuItems, maps.Map{ "name": this.Lang(actionPtr, codes.Server_MenuSettingAccessLog), "url": "/servers/server/settings/locations/accessLog?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "accessLog", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.AccessLogRef != nil && locationConfig.Web.AccessLogRef.IsPrior, }) - menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.Server_MenuSettingStat), - "url": "/servers/server/settings/locations/stat?serverId=" + serverIdString + "&locationId=" + locationIdString, - "isActive": secondMenuItem == "stat", - "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.StatRef != nil && locationConfig.Web.StatRef.IsPrior, - }) menuItems = append(menuItems, maps.Map{ "name": this.Lang(actionPtr, codes.Server_MenuSettingCompress), "url": "/servers/server/settings/locations/compression?serverId=" + serverIdString + "&locationId=" + locationIdString, @@ -166,6 +154,18 @@ 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": this.Lang(actionPtr, codes.Server_MenuSettingStat), + "url": "/servers/server/settings/locations/stat?serverId=" + serverIdString + "&locationId=" + locationIdString, + "isActive": secondMenuItem == "stat", + "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.StatRef != nil && locationConfig.Web.StatRef.IsPrior, + }) + menuItems = append(menuItems, maps.Map{ + "name": this.Lang(actionPtr, codes.Server_MenuSettingCharset), + "url": "/servers/server/settings/locations/charset?serverId=" + serverIdString + "&locationId=" + locationIdString, + "isActive": secondMenuItem == "charset", + "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Charset != nil && locationConfig.Web.Charset.IsPrior, + }) menuItems = append(menuItems, maps.Map{ "name": this.Lang(actionPtr, codes.Server_MenuSettingRoot), "url": "/servers/server/settings/locations/web?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 0200b883..17f2330e 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -303,6 +303,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "isOn": serverConfig.Web != nil && serverConfig.Web.Cache != nil && serverConfig.Web.Cache.IsOn, "configCode": serverconfigs.ConfigCodeCache, }) + menuItems = append(menuItems, maps.Map{ "name": this.Lang(actionPtr, codes.Server_MenuSettingAuth), "url": "/servers/server/settings/access?serverId=" + serverIdString, @@ -310,6 +311,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "isOn": serverConfig.Web != nil && serverConfig.Web.Auth != nil && serverConfig.Web.Auth.IsOn, "configCode": serverconfigs.ConfigCodeAuth, }) + menuItems = append(menuItems, maps.Map{ "name": this.Lang(actionPtr, codes.Server_MenuSettingReferers), "url": "/servers/server/settings/referers?serverId=" + serverIdString, @@ -324,13 +326,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "isOn": serverConfig.Web != nil && serverConfig.Web.UserAgent != nil && serverConfig.Web.UserAgent.IsOn, "configCode": serverconfigs.ConfigCodeUserAgent, }) - menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.Server_MenuSettingCharset), - "url": "/servers/server/settings/charset?serverId=" + serverIdString, - "isActive": secondMenuItem == "charset", - "isOn": serverConfig.Web != nil && serverConfig.Web.Charset != nil && serverConfig.Web.Charset.IsOn, - "configCode": serverconfigs.ConfigCodeCharset, - }) + menuItems = append(menuItems, maps.Map{ "name": this.Lang(actionPtr, codes.Server_MenuSettingAccessLog), "url": "/servers/server/settings/accessLog?serverId=" + serverIdString, @@ -338,13 +334,8 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "isOn": serverConfig.Web != nil && serverConfig.Web.AccessLogRef != nil && serverConfig.Web.AccessLogRef.IsOn, "configCode": serverconfigs.ConfigCodeAccessLog, }) - menuItems = append(menuItems, maps.Map{ - "name": this.Lang(actionPtr, codes.Server_MenuSettingStat), - "url": "/servers/server/settings/stat?serverId=" + serverIdString, - "isActive": secondMenuItem == "stat", - "isOn": serverConfig.Web != nil && serverConfig.Web.StatRef != nil && serverConfig.Web.StatRef.IsOn, - "configCode": serverconfigs.ConfigCodeStat, - }) + + menuItems = append(menuItems, maps.Map{ "name": this.Lang(actionPtr, codes.Server_MenuSettingCompress), "url": "/servers/server/settings/compression?serverId=" + serverIdString, @@ -380,6 +371,20 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "configCode": serverconfigs.ConfigCodeWebp, }) + menuItems = append(menuItems, maps.Map{ + "name": this.Lang(actionPtr, codes.Server_MenuSettingStat), + "url": "/servers/server/settings/stat?serverId=" + serverIdString, + "isActive": secondMenuItem == "stat", + "isOn": serverConfig.Web != nil && serverConfig.Web.StatRef != nil && serverConfig.Web.StatRef.IsOn, + "configCode": serverconfigs.ConfigCodeStat, + }) + menuItems = append(menuItems, maps.Map{ + "name": this.Lang(actionPtr, codes.Server_MenuSettingCharset), + "url": "/servers/server/settings/charset?serverId=" + serverIdString, + "isActive": secondMenuItem == "charset", + "isOn": serverConfig.Web != nil && serverConfig.Web.Charset != nil && serverConfig.Web.Charset.IsOn, + "configCode": serverconfigs.ConfigCodeCharset, + }) menuItems = append(menuItems, maps.Map{ "name": this.Lang(actionPtr, codes.Server_MenuSettingRoot), "url": "/servers/server/settings/web?serverId=" + serverIdString,