diff --git a/internal/web/actions/default/servers/serverutils/server_helper.go b/internal/web/actions/default/servers/serverutils/server_helper.go index 897655ca..a05e8429 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -68,6 +68,11 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) { return } + // 初始化数据 + if !action.Data.Has("server") { + action.Data["server"] = maps.Map{"id": server.Id, "name": server.Name} + } + // 服务管理 serverConfig := &serverconfigs.ServerConfig{} err = json.Unmarshal(server.Config, serverConfig) diff --git a/web/views/@default/servers/server/settings/@settings_menu.html b/web/views/@default/servers/server/settings/@settings_menu.html new file mode 100644 index 00000000..6b2e4593 --- /dev/null +++ b/web/views/@default/servers/server/settings/@settings_menu.html @@ -0,0 +1,9 @@ + + 服务列表 + | + "{{server.name}}"设置 + | + + \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/access/index.html b/web/views/@default/servers/server/settings/access/index.html index bfd895b9..1d7cf5de 100644 --- a/web/views/@default/servers/server/settings/access/index.html +++ b/web/views/@default/servers/server/settings/access/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
diff --git a/web/views/@default/servers/server/settings/accessLog/index.html b/web/views/@default/servers/server/settings/accessLog/index.html index 02a20c31..2d76ee29 100644 --- a/web/views/@default/servers/server/settings/accessLog/index.html +++ b/web/views/@default/servers/server/settings/accessLog/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
+
{$template "menu"}
diff --git a/web/views/@default/servers/server/settings/cache/preheat.html b/web/views/@default/servers/server/settings/cache/preheat.html index c01baa93..21ff665b 100644 --- a/web/views/@default/servers/server/settings/cache/preheat.html +++ b/web/views/@default/servers/server/settings/cache/preheat.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "menu"}
diff --git a/web/views/@default/servers/server/settings/cache/purge.html b/web/views/@default/servers/server/settings/cache/purge.html index 54912971..a0f504b2 100644 --- a/web/views/@default/servers/server/settings/cache/purge.html +++ b/web/views/@default/servers/server/settings/cache/purge.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "menu"}
diff --git a/web/views/@default/servers/server/settings/charset/index.html b/web/views/@default/servers/server/settings/charset/index.html index b9b6ee6b..b2e88517 100644 --- a/web/views/@default/servers/server/settings/charset/index.html +++ b/web/views/@default/servers/server/settings/charset/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
由于已经在当前服务分组中进行了对应的配置,在这里的配置将不会生效。 diff --git a/web/views/@default/servers/server/settings/common/index.html b/web/views/@default/servers/server/settings/common/index.html index f0129a17..30cfc614 100644 --- a/web/views/@default/servers/server/settings/common/index.html +++ b/web/views/@default/servers/server/settings/common/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
diff --git a/web/views/@default/servers/server/settings/compression/gzip/index.html b/web/views/@default/servers/server/settings/compression/gzip/index.html index 949fed00..df98bf56 100644 --- a/web/views/@default/servers/server/settings/compression/gzip/index.html +++ b/web/views/@default/servers/server/settings/compression/gzip/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
diff --git a/web/views/@default/servers/server/settings/compression/index.html b/web/views/@default/servers/server/settings/compression/index.html index 125bd5bb..c7eb700f 100644 --- a/web/views/@default/servers/server/settings/compression/index.html +++ b/web/views/@default/servers/server/settings/compression/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
由于已经在当前服务分组中进行了对应的配置,在这里的配置将不会生效。 diff --git a/web/views/@default/servers/server/settings/dns/index.html b/web/views/@default/servers/server/settings/dns/index.html index 42913288..516b61bc 100644 --- a/web/views/@default/servers/server/settings/dns/index.html +++ b/web/views/@default/servers/server/settings/dns/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
diff --git a/web/views/@default/servers/server/settings/fastcgi/index.html b/web/views/@default/servers/server/settings/fastcgi/index.html index 391605e5..8e071916 100644 --- a/web/views/@default/servers/server/settings/fastcgi/index.html +++ b/web/views/@default/servers/server/settings/fastcgi/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
diff --git a/web/views/@default/servers/server/settings/headers/index.html b/web/views/@default/servers/server/settings/headers/index.html index aeb6026f..87647485 100644 --- a/web/views/@default/servers/server/settings/headers/index.html +++ b/web/views/@default/servers/server/settings/headers/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
+
diff --git a/web/views/@default/servers/server/settings/https/index.html b/web/views/@default/servers/server/settings/https/index.html index c8202a85..4b38445a 100644 --- a/web/views/@default/servers/server/settings/https/index.html +++ b/web/views/@default/servers/server/settings/https/index.html @@ -1,12 +1,14 @@ {$layout} -{$template "/left_menu"} {$var "header"} {$end} -
+{$template "../settings_menu"} +{$template "/left_menu_with_menu"} + +

提醒:HTTP2、证书等信息修改后,可能需要清空浏览器缓存后才能浏览效果。

diff --git a/web/views/@default/servers/server/settings/index.html b/web/views/@default/servers/server/settings/index.html index 6bb42493..6cf3891f 100644 --- a/web/views/@default/servers/server/settings/index.html +++ b/web/views/@default/servers/server/settings/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} -
- +
diff --git a/web/views/@default/servers/server/settings/locations/create.html b/web/views/@default/servers/server/settings/locations/create.html index 8a9ff543..229e9484 100644 --- a/web/views/@default/servers/server/settings/locations/create.html +++ b/web/views/@default/servers/server/settings/locations/create.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "menu"}
diff --git a/web/views/@default/servers/server/settings/locations/index.html b/web/views/@default/servers/server/settings/locations/index.html index 7bdeb083..e4d0c293 100644 --- a/web/views/@default/servers/server/settings/locations/index.html +++ b/web/views/@default/servers/server/settings/locations/index.html @@ -1,11 +1,13 @@ {$layout} -{$template "/left_menu"} {$var "header"} {$end} -
+{$template "../settings_menu"} +{$template "/left_menu_with_menu"} + +
{$template "menu"}

暂时还没有路由规则。

diff --git a/web/views/@default/servers/server/settings/pages/index.html b/web/views/@default/servers/server/settings/pages/index.html index 2373ef7c..1b7b668d 100644 --- a/web/views/@default/servers/server/settings/pages/index.html +++ b/web/views/@default/servers/server/settings/pages/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
由于已经在当前服务分组中进行了对应的配置,在这里的配置将不会生效。 diff --git a/web/views/@default/servers/server/settings/redirects/index.html b/web/views/@default/servers/server/settings/redirects/index.html index a33fe884..eda50a13 100644 --- a/web/views/@default/servers/server/settings/redirects/index.html +++ b/web/views/@default/servers/server/settings/redirects/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
diff --git a/web/views/@default/servers/server/settings/remoteAddr/index.html b/web/views/@default/servers/server/settings/remoteAddr/index.html index 78718c6e..d24fd694 100644 --- a/web/views/@default/servers/server/settings/remoteAddr/index.html +++ b/web/views/@default/servers/server/settings/remoteAddr/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
由于已经在当前服务分组中进行了对应的配置,在这里的配置将不会生效。 diff --git a/web/views/@default/servers/server/settings/reverseProxy/index.html b/web/views/@default/servers/server/settings/reverseProxy/index.html index a47f29c9..bc32dfc1 100644 --- a/web/views/@default/servers/server/settings/reverseProxy/index.html +++ b/web/views/@default/servers/server/settings/reverseProxy/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "menu"}
diff --git a/web/views/@default/servers/server/settings/reverseProxy/scheduling.html b/web/views/@default/servers/server/settings/reverseProxy/scheduling.html index 312aef81..ece82431 100644 --- a/web/views/@default/servers/server/settings/reverseProxy/scheduling.html +++ b/web/views/@default/servers/server/settings/reverseProxy/scheduling.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "menu"} diff --git a/web/views/@default/servers/server/settings/reverseProxy/setting.html b/web/views/@default/servers/server/settings/reverseProxy/setting.html index dfef5a45..0b64eec6 100644 --- a/web/views/@default/servers/server/settings/reverseProxy/setting.html +++ b/web/views/@default/servers/server/settings/reverseProxy/setting.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "menu"}
diff --git a/web/views/@default/servers/server/settings/rewrite/index.html b/web/views/@default/servers/server/settings/rewrite/index.html index aa6c3f81..539ebc22 100644 --- a/web/views/@default/servers/server/settings/rewrite/index.html +++ b/web/views/@default/servers/server/settings/rewrite/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
[创建] diff --git a/web/views/@default/servers/server/settings/serverNames/index.html b/web/views/@default/servers/server/settings/serverNames/index.html index 0e266b36..87d9b8a0 100644 --- a/web/views/@default/servers/server/settings/serverNames/index.html +++ b/web/views/@default/servers/server/settings/serverNames/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
当前域名正在审核中,请审核域名的所有人、备案情况等。 diff --git a/web/views/@default/servers/server/settings/stat/index.html b/web/views/@default/servers/server/settings/stat/index.html index 3f1e1240..3bf32729 100644 --- a/web/views/@default/servers/server/settings/stat/index.html +++ b/web/views/@default/servers/server/settings/stat/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
由于已经在当前服务分组中进行了对应的配置,在这里的配置将不会生效。 diff --git a/web/views/@default/servers/server/settings/tcp/index.html b/web/views/@default/servers/server/settings/tcp/index.html index 7c9e08bc..1a31505d 100644 --- a/web/views/@default/servers/server/settings/tcp/index.html +++ b/web/views/@default/servers/server/settings/tcp/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
diff --git a/web/views/@default/servers/server/settings/tls/index.html b/web/views/@default/servers/server/settings/tls/index.html index 6decce73..3bc63921 100644 --- a/web/views/@default/servers/server/settings/tls/index.html +++ b/web/views/@default/servers/server/settings/tls/index.html @@ -1,12 +1,14 @@ {$layout} -{$template "/left_menu"} {$var "header"} {$end} -
+{$template "../settings_menu"} +{$template "/left_menu_with_menu"} + +
diff --git a/web/views/@default/servers/server/settings/traffic/index.html b/web/views/@default/servers/server/settings/traffic/index.html index 6c3be056..15dd3505 100644 --- a/web/views/@default/servers/server/settings/traffic/index.html +++ b/web/views/@default/servers/server/settings/traffic/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
diff --git a/web/views/@default/servers/server/settings/udp/index.html b/web/views/@default/servers/server/settings/udp/index.html index b3a7d35d..903b3de9 100644 --- a/web/views/@default/servers/server/settings/udp/index.html +++ b/web/views/@default/servers/server/settings/udp/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
diff --git a/web/views/@default/servers/server/settings/unix/index.html b/web/views/@default/servers/server/settings/unix/index.html index eae519e9..4eb899c9 100644 --- a/web/views/@default/servers/server/settings/unix/index.html +++ b/web/views/@default/servers/server/settings/unix/index.html @@ -1,7 +1,7 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+

此功能暂未开放,敬请期待。

\ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/group.html b/web/views/@default/servers/server/settings/waf/group.html index 8abcf2f1..f4d8bec6 100644 --- a/web/views/@default/servers/server/settings/waf/group.html +++ b/web/views/@default/servers/server/settings/waf/group.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "menu"}

分组[修改]

diff --git a/web/views/@default/servers/server/settings/waf/groups.html b/web/views/@default/servers/server/settings/waf/groups.html index b1edc653..f9a2fd33 100644 --- a/web/views/@default/servers/server/settings/waf/groups.html +++ b/web/views/@default/servers/server/settings/waf/groups.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "menu"} diff --git a/web/views/@default/servers/server/settings/waf/index.html b/web/views/@default/servers/server/settings/waf/index.html index 125fabac..5d1d32a2 100644 --- a/web/views/@default/servers/server/settings/waf/index.html +++ b/web/views/@default/servers/server/settings/waf/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
由于已经在当前服务分组中进行了对应的配置,在这里的配置将不会生效。 diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/allowList.html b/web/views/@default/servers/server/settings/waf/ipadmin/allowList.html index 74c696f2..858b5c41 100644 --- a/web/views/@default/servers/server/settings/waf/ipadmin/allowList.html +++ b/web/views/@default/servers/server/settings/waf/ipadmin/allowList.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "../menu"} 尚未为当前用户开通此功能。 diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/countries.html b/web/views/@default/servers/server/settings/waf/ipadmin/countries.html index 42c08fcc..253f6846 100644 --- a/web/views/@default/servers/server/settings/waf/ipadmin/countries.html +++ b/web/views/@default/servers/server/settings/waf/ipadmin/countries.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "../menu"} 尚未为当前用户开通此功能。 diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/denyList.html b/web/views/@default/servers/server/settings/waf/ipadmin/denyList.html index 0255ce29..04c9664e 100644 --- a/web/views/@default/servers/server/settings/waf/ipadmin/denyList.html +++ b/web/views/@default/servers/server/settings/waf/ipadmin/denyList.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "../menu"} 尚未为当前用户开通此功能。 diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.html b/web/views/@default/servers/server/settings/waf/ipadmin/provinces.html index d1ea2261..1568bffd 100644 --- a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.html +++ b/web/views/@default/servers/server/settings/waf/ipadmin/provinces.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "../menu"} 尚未为当前用户开通此功能。 diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/test.html b/web/views/@default/servers/server/settings/waf/ipadmin/test.html index a37bfaee..99572b00 100644 --- a/web/views/@default/servers/server/settings/waf/ipadmin/test.html +++ b/web/views/@default/servers/server/settings/waf/ipadmin/test.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../../settings_menu"} +{$template "/left_menu_with_menu"} -
+
{$template "../menu"} 尚未为当前用户开通此功能。 diff --git a/web/views/@default/servers/server/settings/web/index.html b/web/views/@default/servers/server/settings/web/index.html index 81961cbe..0d99097f 100644 --- a/web/views/@default/servers/server/settings/web/index.html +++ b/web/views/@default/servers/server/settings/web/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
由于已经在当前服务分组中进行了对应的配置,在这里的配置将不会生效。 diff --git a/web/views/@default/servers/server/settings/webp/index.html b/web/views/@default/servers/server/settings/webp/index.html index f1e788d3..16888047 100644 --- a/web/views/@default/servers/server/settings/webp/index.html +++ b/web/views/@default/servers/server/settings/webp/index.html @@ -1,7 +1,8 @@ {$layout} -{$template "/left_menu"} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -
+
由于已经在当前服务分组中进行了对应的配置,在这里的配置将不会生效。 diff --git a/web/views/@default/servers/server/settings/websocket/index.html b/web/views/@default/servers/server/settings/websocket/index.html index 79ca94bb..894d4f53 100644 --- a/web/views/@default/servers/server/settings/websocket/index.html +++ b/web/views/@default/servers/server/settings/websocket/index.html @@ -1,8 +1,8 @@ {$layout} +{$template "../settings_menu"} +{$template "/left_menu_with_menu"} -{$template "/left_menu"} - -
+
由于已经在当前服务分组中进行了对应的配置,在这里的配置将不会生效。