From 6ea89239563297b83ee4f6e5f086e51cd9b60555 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sun, 4 Jun 2023 10:30:57 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E6=9C=8D=E5=8A=A1=E5=88=86=E7=BB=84?= =?UTF-8?q?=E2=80=9D=E6=94=B9=E4=B8=BA=E2=80=9C=E7=BD=91=E7=AB=99=E5=88=86?= =?UTF-8?q?=E7=BB=84=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/web/actions/default/servers/groups/createPopup.go | 2 +- internal/web/actions/default/servers/groups/group/delete.go | 2 +- internal/web/actions/default/servers/groups/group/update.go | 2 +- internal/web/actions/default/servers/groups/sort.go | 2 +- internal/web/helpers/menu.go | 2 +- web/public/js/components/server/http-header-policy-box.js | 4 ++-- .../@default/servers/server/settings/accessLog/index.html | 2 +- web/views/@default/servers/server/settings/cache/index.html | 2 +- web/views/@default/servers/server/settings/charset/index.html | 2 +- .../@default/servers/server/settings/compression/index.html | 2 +- web/views/@default/servers/server/settings/pages/index.html | 2 +- .../@default/servers/server/settings/remoteAddr/index.html | 2 +- .../@default/servers/server/settings/requestLimit/index.html | 2 +- .../@default/servers/server/settings/reverseProxy/index.html | 2 +- web/views/@default/servers/server/settings/stat/index.html | 2 +- web/views/@default/servers/server/settings/waf/index.html | 2 +- web/views/@default/servers/server/settings/web/index.html | 2 +- web/views/@default/servers/server/settings/webp/index.html | 2 +- .../@default/servers/server/settings/websocket/index.html | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/internal/web/actions/default/servers/groups/createPopup.go b/internal/web/actions/default/servers/groups/createPopup.go index 2c3a2af3..6c420032 100644 --- a/internal/web/actions/default/servers/groups/createPopup.go +++ b/internal/web/actions/default/servers/groups/createPopup.go @@ -42,7 +42,7 @@ func (this *CreatePopupAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建服务分组 %d", createResp.ServerGroupId) + defer this.CreateLog(oplogs.LevelInfo, "创建网站分组 %d", createResp.ServerGroupId) this.Success() } diff --git a/internal/web/actions/default/servers/groups/group/delete.go b/internal/web/actions/default/servers/groups/group/delete.go index 9b997df1..fe7730c7 100644 --- a/internal/web/actions/default/servers/groups/group/delete.go +++ b/internal/web/actions/default/servers/groups/group/delete.go @@ -14,7 +14,7 @@ func (this *DeleteAction) RunPost(params struct { GroupId int64 }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "删除代理服务分组 %d", params.GroupId) + defer this.CreateLog(oplogs.LevelInfo, "删除代理网站分组 %d", params.GroupId) // 检查是否正在使用 countResp, err := this.RPC().ServerRPC().CountAllEnabledServersWithServerGroupId(this.AdminContext(), &pb.CountAllEnabledServersWithServerGroupIdRequest{ServerGroupId: params.GroupId}) diff --git a/internal/web/actions/default/servers/groups/group/update.go b/internal/web/actions/default/servers/groups/group/update.go index 6a03f206..21cda0fb 100644 --- a/internal/web/actions/default/servers/groups/group/update.go +++ b/internal/web/actions/default/servers/groups/group/update.go @@ -41,7 +41,7 @@ func (this *UpdateAction) RunPost(params struct { Must *actions.Must }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改代理服务分组 %d", params.GroupId) + defer this.CreateLog(oplogs.LevelInfo, "修改网站分组 %d", params.GroupId) params.Must. Field("name", params.Name). diff --git a/internal/web/actions/default/servers/groups/sort.go b/internal/web/actions/default/servers/groups/sort.go index c29957df..065108a3 100644 --- a/internal/web/actions/default/servers/groups/sort.go +++ b/internal/web/actions/default/servers/groups/sort.go @@ -14,7 +14,7 @@ func (this *SortAction) RunPost(params struct { GroupIds []int64 }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "修改服务分组排序") + defer this.CreateLog(oplogs.LevelInfo, "修改网站分组排序") _, err := this.RPC().ServerGroupRPC().UpdateServerGroupOrders(this.AdminContext(), &pb.UpdateServerGroupOrdersRequest{ServerGroupIds: params.GroupIds}) if err != nil { diff --git a/internal/web/helpers/menu.go b/internal/web/helpers/menu.go index 6028c421..b9bc2b5d 100644 --- a/internal/web/helpers/menu.go +++ b/internal/web/helpers/menu.go @@ -34,7 +34,7 @@ func FindAllMenuMaps(nodeLogsType string, countUnreadNodeLogs int64, countUnread "code": "cert", }, { - "name": "服务分组", + "name": "网站分组", "url": "/servers/groups", "code": "group", }, diff --git a/web/public/js/components/server/http-header-policy-box.js b/web/public/js/components/server/http-header-policy-box.js index b0461367..9f38ee26 100644 --- a/web/public/js/components/server/http-header-policy-box.js +++ b/web/public/js/components/server/http-header-policy-box.js @@ -184,7 +184,7 @@ Vue.component("http-header-policy-box", {
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。

设置请求Header   [添加新Header]

@@ -257,7 +257,7 @@ Vue.component("http-header-policy-box", {
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。

设置响应Header   [添加新Header]

diff --git a/web/views/@default/servers/server/settings/accessLog/index.html b/web/views/@default/servers/server/settings/accessLog/index.html index d3f1df08..8b221f2e 100644 --- a/web/views/@default/servers/server/settings/accessLog/index.html +++ b/web/views/@default/servers/server/settings/accessLog/index.html @@ -5,7 +5,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。
diff --git a/web/views/@default/servers/server/settings/cache/index.html b/web/views/@default/servers/server/settings/cache/index.html index 20b0a3f0..c1c2f4de 100644 --- a/web/views/@default/servers/server/settings/cache/index.html +++ b/web/views/@default/servers/server/settings/cache/index.html @@ -7,7 +7,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。
diff --git a/web/views/@default/servers/server/settings/charset/index.html b/web/views/@default/servers/server/settings/charset/index.html index b2e88517..a09dad69 100644 --- a/web/views/@default/servers/server/settings/charset/index.html +++ b/web/views/@default/servers/server/settings/charset/index.html @@ -5,7 +5,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。
diff --git a/web/views/@default/servers/server/settings/compression/index.html b/web/views/@default/servers/server/settings/compression/index.html index c7eb700f..267a75c3 100644 --- a/web/views/@default/servers/server/settings/compression/index.html +++ b/web/views/@default/servers/server/settings/compression/index.html @@ -5,7 +5,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。
diff --git a/web/views/@default/servers/server/settings/pages/index.html b/web/views/@default/servers/server/settings/pages/index.html index 1b7b668d..5e392477 100644 --- a/web/views/@default/servers/server/settings/pages/index.html +++ b/web/views/@default/servers/server/settings/pages/index.html @@ -5,7 +5,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。
diff --git a/web/views/@default/servers/server/settings/remoteAddr/index.html b/web/views/@default/servers/server/settings/remoteAddr/index.html index d24fd694..225b5e01 100644 --- a/web/views/@default/servers/server/settings/remoteAddr/index.html +++ b/web/views/@default/servers/server/settings/remoteAddr/index.html @@ -5,7 +5,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。
diff --git a/web/views/@default/servers/server/settings/requestLimit/index.html b/web/views/@default/servers/server/settings/requestLimit/index.html index 24dc9318..5a3ca418 100644 --- a/web/views/@default/servers/server/settings/requestLimit/index.html +++ b/web/views/@default/servers/server/settings/requestLimit/index.html @@ -5,7 +5,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。
diff --git a/web/views/@default/servers/server/settings/reverseProxy/index.html b/web/views/@default/servers/server/settings/reverseProxy/index.html index 0b1bd90d..769aafc9 100644 --- a/web/views/@default/servers/server/settings/reverseProxy/index.html +++ b/web/views/@default/servers/server/settings/reverseProxy/index.html @@ -7,7 +7,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。
diff --git a/web/views/@default/servers/server/settings/stat/index.html b/web/views/@default/servers/server/settings/stat/index.html index 3bf32729..17177121 100644 --- a/web/views/@default/servers/server/settings/stat/index.html +++ b/web/views/@default/servers/server/settings/stat/index.html @@ -5,7 +5,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。
diff --git a/web/views/@default/servers/server/settings/waf/index.html b/web/views/@default/servers/server/settings/waf/index.html index 5d1d32a2..fe025ce7 100644 --- a/web/views/@default/servers/server/settings/waf/index.html +++ b/web/views/@default/servers/server/settings/waf/index.html @@ -5,7 +5,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。
diff --git a/web/views/@default/servers/server/settings/web/index.html b/web/views/@default/servers/server/settings/web/index.html index 0d99097f..b3703ccd 100644 --- a/web/views/@default/servers/server/settings/web/index.html +++ b/web/views/@default/servers/server/settings/web/index.html @@ -5,7 +5,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。
diff --git a/web/views/@default/servers/server/settings/webp/index.html b/web/views/@default/servers/server/settings/webp/index.html index 4cc93dc6..36a638fc 100644 --- a/web/views/@default/servers/server/settings/webp/index.html +++ b/web/views/@default/servers/server/settings/webp/index.html @@ -5,7 +5,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。
diff --git a/web/views/@default/servers/server/settings/websocket/index.html b/web/views/@default/servers/server/settings/websocket/index.html index 894d4f53..331dd1a4 100644 --- a/web/views/@default/servers/server/settings/websocket/index.html +++ b/web/views/@default/servers/server/settings/websocket/index.html @@ -5,7 +5,7 @@
- 由于已经在当前服务分组中进行了对应的配置，在这里的配置将不会生效。 + 由于已经在当前网站分组中进行了对应的配置，在这里的配置将不会生效。