From 58b10a09823c3f7918454b03deedfa83f80d390b Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Fri, 21 Apr 2023 17:51:25 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E7=BD=91=E7=AB=99=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E2=80=9D=E6=94=B9=E4=B8=BA=E2=80=9C=E7=BD=91=E7=AB=99=E2=80=9D?= =?UTF-8?q?=E3=80=81=E2=80=9C=E7=BD=91=E7=AB=99=E5=88=97=E8=A1=A8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/configloaders/admin_module.go | 2 +- .../servers/components/cache/cacheutils/utils.go | 2 +- .../web/actions/default/servers/components/index.go | 2 +- .../default/servers/serverutils/server_helper.go | 2 +- internal/web/helpers/menu.go | 4 ++-- web/public/js/components/server/http-access-log-box.js | 4 ++-- .../js/components/server/http-firewall-actions-box.js | 4 ++-- .../components/server/http-firewall-captcha-options.js | 2 +- .../js/components/server/http-firewall-config-box.js | 2 +- .../@default/clusters/cluster/settings/dns/index.html | 10 +++++----- .../cluster/settings/global-server-config/index.html | 2 +- web/views/@default/clusters/create.html | 6 +++--- web/views/@default/dashboard/index.html | 2 +- web/views/@default/dns/clusters/cluster.html | 4 ++-- web/views/@default/dns/updateClusterPopup.html | 8 ++++---- web/views/@default/servers/@menu.html | 4 ++-- web/views/@default/servers/create.html | 4 ++-- web/views/@default/servers/index.html | 2 +- web/views/@default/servers/server/delete/index.html | 2 +- web/views/@default/servers/server/log/history.html | 2 +- web/views/@default/servers/server/log/index.html | 2 +- web/views/@default/servers/server/log/today.html | 2 +- .../servers/server/settings/@settings_menu.html | 2 +- .../servers/server/settings/serverNames/index.html | 2 +- web/views/@default/servers/server/stat/@stat_menu.html | 2 +- web/views/@default/users/@user_menu.html | 2 +- web/views/@default/users/createPopup.html | 2 +- web/views/@default/users/update.html | 2 +- 28 files changed, 43 insertions(+), 43 deletions(-) diff --git a/internal/configloaders/admin_module.go b/internal/configloaders/admin_module.go index d4489e6d..e3570f80 100644 --- a/internal/configloaders/admin_module.go +++ b/internal/configloaders/admin_module.go @@ -167,7 +167,7 @@ func AllModuleMaps() []maps.Map { "url": "/dashboard", }, { - "name": "网站服务", + "name": "网站列表", "code": AdminModuleCodeServer, "url": "/servers", }, diff --git a/internal/web/actions/default/servers/components/cache/cacheutils/utils.go b/internal/web/actions/default/servers/components/cache/cacheutils/utils.go index bef513b6..4848982c 100644 --- a/internal/web/actions/default/servers/components/cache/cacheutils/utils.go +++ b/internal/web/actions/default/servers/components/cache/cacheutils/utils.go @@ -45,7 +45,7 @@ func KeyFailReason(reasonCode string) string { case "requireDomain": return "找不到Key对应的域名" case "requireServer": - return "找不到Key对应的网站服务" + return "找不到Key对应的网站" case "requireUser": return "该域名不属于当前用户" case "requireClusterId": diff --git a/internal/web/actions/default/servers/components/index.go b/internal/web/actions/default/servers/components/index.go index b1a4bfc8..5903e8e4 100644 --- a/internal/web/actions/default/servers/components/index.go +++ b/internal/web/actions/default/servers/components/index.go @@ -64,7 +64,7 @@ func (this *IndexAction) RunPost(params struct { DefaultDomain string }) { // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "保存网站服务全局配置") + defer this.CreateLog(oplogs.LevelInfo, "保存网站全局配置") if len(params.GlobalConfigJSON) == 0 { this.Fail("错误的配置信息，请刷新当前页面后重试") diff --git a/internal/web/actions/default/servers/serverutils/server_helper.go b/internal/web/actions/default/servers/serverutils/server_helper.go index d7d3cec0..8fd44ca1 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -107,7 +107,7 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) { // TABBAR selectedTabbar, _ := action.Data["mainTab"] tabbar := actionutils.NewTabbar() - tabbar.Add("服务列表", "", "/servers", "", false) + tabbar.Add("网站列表", "", "/servers", "", false) if teaconst.IsPlus { tabbar.Add("看板", "", "/servers/server/boards?serverId="+serverIdString, "dashboard", selectedTabbar == "board") } diff --git a/internal/web/helpers/menu.go b/internal/web/helpers/menu.go index 0ca6b9a0..6028c421 100644 --- a/internal/web/helpers/menu.go +++ b/internal/web/helpers/menu.go @@ -19,8 +19,8 @@ func FindAllMenuMaps(nodeLogsType string, countUnreadNodeLogs int64, countUnread { "code": "servers", "module": configloaders.AdminModuleCodeServer, - "name": "网站服务", - "subtitle": "服务列表", + "name": "网站列表", + "subtitle": "", "icon": "clone outsize", "subItems": []maps.Map{ { diff --git a/web/public/js/components/server/http-access-log-box.js b/web/public/js/components/server/http-access-log-box.js index bdb6445e..c01ff293 100644 --- a/web/public/js/components/server/http-access-log-box.js +++ b/web/public/js/components/server/http-access-log-box.js @@ -73,7 +73,7 @@ Vue.component("http-access-log-box", { this.$refs.box.parentNode.style.cssText = "" }, mismatch: function () { - teaweb.warn("当前访问没有匹配到任何网站服务") + teaweb.warn("当前访问没有匹配到任何网站") } }, template: `
@@ -81,7 +81,7 @@ Vue.component("http-access-log-box", { [{{accessLog.node.name}}节点] - [服务] + [服务] [服务] [{{accessLog.region}}] diff --git a/web/public/js/components/server/http-firewall-actions-box.js b/web/public/js/components/server/http-firewall-actions-box.js index acaf2ac0..765faf23 100644 --- a/web/public/js/components/server/http-firewall-actions-box.js +++ b/web/public/js/components/server/http-firewall-actions-box.js @@ -663,8 +663,8 @@ Vue.component("http-firewall-actions-box", { -

只封禁用户对当前网站服务的访问，其他服务不受影响。

-

封禁用户对所有网站服务的访问。

+

只封禁用户对当前网站的访问，其他服务不受影响。

+

封禁用户对所有网站的访问。

diff --git a/web/public/js/components/server/http-firewall-captcha-options.js b/web/public/js/components/server/http-firewall-captcha-options.js index b9c6d07c..3ddc34ae 100644 --- a/web/public/js/components/server/http-firewall-captcha-options.js +++ b/web/public/js/components/server/http-firewall-captcha-options.js @@ -147,7 +147,7 @@ Vue.component("http-firewall-captcha-options", { 失败全局封禁 -

是否在失败时全局封禁，默认为只封禁对单个网站服务的访问。

+

是否在失败时全局封禁，默认为只封禁对单个网站的访问。

diff --git a/web/public/js/components/server/http-firewall-config-box.js b/web/public/js/components/server/http-firewall-config-box.js index fd9b27f8..70a2b7bb 100644 --- a/web/public/js/components/server/http-firewall-config-box.js +++ b/web/public/js/components/server/http-firewall-config-box.js @@ -49,7 +49,7 @@ Vue.component("http-firewall-config-box", { 启用WAF -

选中后，表示启用当前网站服务的WAF功能。

+

选中后，表示启用当前网站的WAF功能。

diff --git a/web/views/@default/clusters/cluster/settings/dns/index.html b/web/views/@default/clusters/cluster/settings/dns/index.html index 491bcb9d..e924b296 100644 --- a/web/views/@default/clusters/cluster/settings/dns/index.html +++ b/web/views/@default/clusters/cluster/settings/dns/index.html @@ -14,7 +14,7 @@
-

用于生成集群节点和网站服务的DNS解析记录，修改后将自动删除旧域名中的相关记录。

+

用于生成集群节点和网站的DNS解析记录，修改后将自动删除旧域名中的相关记录。

没有可用的域名，请在 [域名解析] 中添加。 @@ -43,7 +43,7 @@ 自动设置CNAME记录 -

除集群已创建的网站服务之外，自动解析到集群的CNAME记录，比如www。

+

除集群已创建的网站之外，自动解析到集群的CNAME记录，比如www。

@@ -51,10 +51,10 @@ - 允许通过CNAME访问网站服务 + 允许通过CNAME访问网站 -

选中后，表示允许使用CNAME直接访问网站服务；如果取消选中，则表示CNAME只作为DNS解析记录使用。

+

选中后，表示允许使用CNAME直接访问网站；如果取消选中，则表示CNAME只作为DNS解析记录使用。

@@ -84,7 +84,7 @@ - 是否同步网站服务DNS状态 + 是否同步网站DNS状态
diff --git a/web/views/@default/clusters/cluster/settings/global-server-config/index.html b/web/views/@default/clusters/cluster/settings/global-server-config/index.html index 9b67b736..b657983a 100644 --- a/web/views/@default/clusters/cluster/settings/global-server-config/index.html +++ b/web/views/@default/clusters/cluster/settings/global-server-config/index.html @@ -92,7 +92,7 @@ 记录服务错误 -

在节点运行日志中记录网站服务相关错误，比如无法连接源站等。

+

在节点运行日志中记录网站相关错误，比如无法连接源站等。

diff --git a/web/views/@default/clusters/create.html b/web/views/@default/clusters/create.html index 391b2ad2..8e523699 100644 --- a/web/views/@default/clusters/create.html +++ b/web/views/@default/clusters/create.html @@ -13,14 +13,14 @@ 默认缓存设置 -

为可选项。集群中的网站服务可以自行设置是否启用此设置。

+

为可选项。集群中的网站可以自行设置是否启用此设置。

默认WAF设置 -

为可选项。集群中的网站服务可以自行设置是否启用此设置。

+

为可选项。集群中的网站可以自行设置是否启用此设置。

@@ -71,7 +71,7 @@ 选择主域名 -

用于生成集群节点和网站服务的DNS解析记录。

+

用于生成集群节点和网站的DNS解析记录。

diff --git a/web/views/@default/dashboard/index.html b/web/views/@default/dashboard/index.html index 0a24ad1b..325e1ce5 100644 --- a/web/views/@default/dashboard/index.html +++ b/web/views/@default/dashboard/index.html @@ -11,7 +11,7 @@
- 还没有在集群中添加节点，现在去添加？添加节点后才可部署网站服务。 + 还没有在集群中添加节点，现在去添加？添加节点后才可部署网站。
diff --git a/web/views/@default/dns/clusters/cluster.html b/web/views/@default/dns/clusters/cluster.html index e64a58ba..8a7e1001 100644 --- a/web/views/@default/dns/clusters/cluster.html +++ b/web/views/@default/dns/clusters/cluster.html @@ -176,8 +176,8 @@ - -

网站服务解析记录   ({{servers.length}}个)

+ +

网站解析记录   ({{servers.length}}个)

暂时没有需要设置的DNS记录。

diff --git a/web/views/@default/dns/updateClusterPopup.html b/web/views/@default/dns/updateClusterPopup.html index 3a1d7331..f1fef53b 100644 --- a/web/views/@default/dns/updateClusterPopup.html +++ b/web/views/@default/dns/updateClusterPopup.html @@ -48,7 +48,7 @@ @@ -56,10 +56,10 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/web/views/@default/users/update.html b/web/views/@default/users/update.html index 6a07fa18..edf002ce 100644 --- a/web/views/@default/users/update.html +++ b/web/views/@default/users/update.html @@ -42,7 +42,7 @@
自动设置CNAME记录 -

除集群已创建的网站服务之外，自动解析到集群的CNAME记录，比如www。

+

除集群已创建的网站之外，自动解析到集群的CNAME记录，比如www。
允许通过CNAME访问网站服务允许通过CNAME访问网站 -

选中后，表示允许使用CNAME直接访问网站服务；如果取消选中，则表示CNAME只作为DNS解析记录使用。

+

选中后，表示允许使用CNAME直接访问网站；如果取消选中，则表示CNAME只作为DNS解析记录使用。
是否同步网站服务DNS状态是否同步网站DNS状态
diff --git a/web/views/@default/servers/@menu.html b/web/views/@default/servers/@menu.html index b6aaaa49..7c68fc1e 100644 --- a/web/views/@default/servers/@menu.html +++ b/web/views/@default/servers/@menu.html @@ -1,6 +1,6 @@ - 服务列表 + 网站列表 审核中({{countAuditing}}) | - [创建网站服务] + [创建网站] \ No newline at end of file diff --git a/web/views/@default/servers/create.html b/web/views/@default/servers/create.html index e4c8d52c..29deb7e7 100644 --- a/web/views/@default/servers/create.html +++ b/web/views/@default/servers/create.html @@ -4,7 +4,7 @@
-

新网站服务主要信息：

+

新网站主要信息：

@@ -112,7 +112,7 @@ Websocket缓存WAF - 从上级代理中读取IP + 从上级代理中读取IP 统计 diff --git a/web/views/@default/servers/index.html b/web/views/@default/servers/index.html index cb323fc1..cf70ba26 100644 --- a/web/views/@default/servers/index.html +++ b/web/views/@default/servers/index.html @@ -7,7 +7,7 @@
-
有{{countNeedFixLogs}}个网站服务相关的错误需要修复。
+
有{{countNeedFixLogs}}个网站相关的错误需要修复。
diff --git a/web/views/@default/servers/server/delete/index.html b/web/views/@default/servers/server/delete/index.html index 0a2f2b60..d268cdd0 100644 --- a/web/views/@default/servers/server/delete/index.html +++ b/web/views/@default/servers/server/delete/index.html @@ -1,7 +1,7 @@ {$layout} - 服务列表 + 网站列表 | "{{server.name}}"删除 | diff --git a/web/views/@default/servers/server/log/history.html b/web/views/@default/servers/server/log/history.html index 14425eb7..b1131e14 100644 --- a/web/views/@default/servers/server/log/history.html +++ b/web/views/@default/servers/server/log/history.html @@ -3,7 +3,7 @@ {$layout} - 服务列表 + 网站列表 | "{{server.name}}"日志 | diff --git a/web/views/@default/servers/server/log/index.html b/web/views/@default/servers/server/log/index.html index 94f28fa6..44ea2d53 100644 --- a/web/views/@default/servers/server/log/index.html +++ b/web/views/@default/servers/server/log/index.html @@ -1,7 +1,7 @@ {$layout} - 服务列表 + 网站列表 | "{{server.name}}"日志 | diff --git a/web/views/@default/servers/server/log/today.html b/web/views/@default/servers/server/log/today.html index 5010994d..23db558c 100644 --- a/web/views/@default/servers/server/log/today.html +++ b/web/views/@default/servers/server/log/today.html @@ -1,7 +1,7 @@ {$layout} - 服务列表 + 网站列表 | "{{server.name}}"日志 | diff --git a/web/views/@default/servers/server/settings/@settings_menu.html b/web/views/@default/servers/server/settings/@settings_menu.html index 33aee94c..78cc9049 100644 --- a/web/views/@default/servers/server/settings/@settings_menu.html +++ b/web/views/@default/servers/server/settings/@settings_menu.html @@ -1,5 +1,5 @@ - 服务列表 + 网站列表 | "{{server.name}}"设置 » diff --git a/web/views/@default/servers/server/settings/serverNames/index.html b/web/views/@default/servers/server/settings/serverNames/index.html index aa8a93d0..00a0c839 100644 --- a/web/views/@default/servers/server/settings/serverNames/index.html +++ b/web/views/@default/servers/server/settings/serverNames/index.html @@ -56,7 +56,7 @@
所属用户 已绑定的域名 -

用户可以通过这些域名访问当前网站服务。

+

用户可以通过这些域名访问当前网站。
diff --git a/web/views/@default/servers/server/stat/@stat_menu.html b/web/views/@default/servers/server/stat/@stat_menu.html index a591c7f6..7054394b 100644 --- a/web/views/@default/servers/server/stat/@stat_menu.html +++ b/web/views/@default/servers/server/stat/@stat_menu.html @@ -1,5 +1,5 @@ - 服务列表 + 网站列表 | "{{server.name}}"统计 | diff --git a/web/views/@default/users/@user_menu.html b/web/views/@default/users/@user_menu.html index bf21c2e4..4951d4ee 100644 --- a/web/views/@default/users/@user_menu.html +++ b/web/views/@default/users/@user_menu.html @@ -2,7 +2,7 @@ 用户列表 | {{user.fullname}}  ({{user.username}}) - 网站服务 + 网站列表 修改 功能 实名认证(待审核)({{user.identityTag}}) diff --git a/web/views/@default/users/createPopup.html b/web/views/@default/users/createPopup.html index 38a37094..77c5d3cf 100644 --- a/web/views/@default/users/createPopup.html +++ b/web/views/@default/users/createPopup.html @@ -35,7 +35,7 @@
关联集群 * -

用户发布的网站服务会自动部署到此集群。

+

用户发布的网站会自动部署到此集群。
关联集群 * -

用户发布的网站服务会自动部署到此集群，修改此选项会同步修改当前用户下的所有服务，但不影响和套餐绑定的服务。

+

用户发布的网站会自动部署到此集群，修改此选项会同步修改当前用户下的所有服务，但不影响和套餐绑定的服务。