From b4bea60d3b0d387b7eb8e5ed6f0fd02f1ecb89d4 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sun, 5 May 2024 11:23:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E2=80=9C=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E2=80=9D=E6=96=87=E5=AD=97=E6=94=B9=E4=B8=BA=E2=80=9C=E7=BD=91?=
 =?UTF-8?q?=E7=AB=99=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/public/js/components/maps/traffic-map-box.js              | 2 +-
 web/public/js/components/server/http-access-log-box.js        | 2 +-
 web/public/js/components/server/http-firewall-actions-box.js  | 2 +-
 .../js/components/server/http-request-limit-config-box.js     | 4 ++--
 web/public/js/components/server/ssl-certs-box.js              | 2 +-
 web/public/js/components/server/ssl-config-box.js             | 4 ++--
 web/views/@default/servers/groups/group/@menu.html            | 2 +-
 web/views/@default/servers/iplists/createPopup.html           | 2 +-
 web/views/@default/servers/metrics/stats.html                 | 2 +-
 web/views/@default/users/update.html                          | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/public/js/components/maps/traffic-map-box.js b/web/public/js/components/maps/traffic-map-box.js
index 460ab618..a95826cc 100644
--- a/web/public/js/components/maps/traffic-map-box.js
+++ b/web/public/js/components/maps/traffic-map-box.js
@@ -242,7 +242,7 @@ Vue.component("traffic-map-box-table", {
 	   <table class="ui table selectable">
 		  <thead>
 			<tr>
-				<th colspan="2">国家/地区排行&nbsp; <tip-icon content="只有开启了统计的服务才会有记录。"></tip-icon></th>
+				<th colspan="2">国家/地区排行&nbsp; <tip-icon content="只有开启了统计的网站才会有记录。"></tip-icon></th>
 			</tr>
 		  </thead>
 		   <tbody v-if="stats.length == 0">
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 dc900696..a8dd4620 100644
--- a/web/public/js/components/server/http-access-log-box.js
+++ b/web/public/js/components/server/http-access-log-box.js
@@ -80,7 +80,7 @@ Vue.component("http-access-log-box", {
 	<div>
 		<a v-if="accessLog.node != null && accessLog.node.nodeCluster != null" :href="'/clusters/cluster/node?nodeId=' + accessLog.node.id + '&clusterId=' + accessLog.node.nodeCluster.id" title="点击查看节点详情" target="_top"><span class="grey">[{{accessLog.node.name}}<span v-if="!accessLog.node.name.endsWith('节点')">节点</span>]</span></a>
 		
-		<!-- 服务 -->
+		<!-- 网站 -->
 		<a :href="'/servers/server/log?serverId=' + accessLog.serverId" title="点击到网站" v-if="vShowServerLink && accessLog.serverId > 0"><span class="grey">[网站]</span></a>
 		<span v-if="vShowServerLink && (accessLog.serverId == null || accessLog.serverId == 0)" @click.prevent="mismatch()"><span class="disabled">[网站]</span></span>
 		
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 ac81ef1e..c4cc1e3a 100644
--- a/web/public/js/components/server/http-firewall-actions-box.js
+++ b/web/public/js/components/server/http-firewall-actions-box.js
@@ -777,7 +777,7 @@ Vue.component("http-firewall-actions-box", {
 						<option value="service">当前网站</option>
 						<option value="global">所有网站</option>
 					</select>
-					<p class="comment" v-if="blockScope == 'service'">只封禁用户对当前网站的访问，其他服务不受影响。</p>
+					<p class="comment" v-if="blockScope == 'service'">只封禁用户对当前网站的访问，其他网站不受影响。</p>
 					<p class="comment" v-if="blockScope =='global'">封禁用户对所有网站的访问。</p>
 				</td>
 			</tr>
diff --git a/web/public/js/components/server/http-request-limit-config-box.js b/web/public/js/components/server/http-request-limit-config-box.js
index a9906696..a2d4aac7 100644
--- a/web/public/js/components/server/http-request-limit-config-box.js
+++ b/web/public/js/components/server/http-request-limit-config-box.js
@@ -73,14 +73,14 @@ Vue.component("http-request-limit-config-box", {
 				<td>最大并发连接数</td>
 				<td>
 					<input type="text" maxlength="6" v-model="maxConns"/>
-					<p class="comment">当前服务最大并发连接数，超出此限制则响应用户<code-label>429</code-label>代码。为0表示不限制。</p>
+					<p class="comment">当前网站最大并发连接数，超出此限制则响应用户<code-label>429</code-label>代码。为0表示不限制。</p>
 				</td>
 			</tr>
 			<tr>
 				<td>单IP最大并发连接数</td>
 				<td>
 					<input type="text" maxlength="6" v-model="maxConnsPerIP"/>
-					<p class="comment">单IP最大连接数，统计单个IP总连接数时不区分服务，超出此限制则响应用户<code-label>429</code-label>代码。为0表示不限制。<span v-if="maxConnsPerIP > 0 && maxConnsPerIP <= 3" class="red">当前设置的并发连接数过低，可能会影响正常用户访问，建议不小于3。</span></p>
+					<p class="comment">单IP最大连接数，统计单个IP总连接数时不区分网站，超出此限制则响应用户<code-label>429</code-label>代码。为0表示不限制。<span v-if="maxConnsPerIP > 0 && maxConnsPerIP <= 3" class="red">当前设置的并发连接数过低，可能会影响正常用户访问，建议不小于3。</span></p>
 				</td>
 			</tr>
 			<tr>
diff --git a/web/public/js/components/server/ssl-certs-box.js b/web/public/js/components/server/ssl-certs-box.js
index 8c1993d8..04846c01 100644
--- a/web/public/js/components/server/ssl-certs-box.js
+++ b/web/public/js/components/server/ssl-certs-box.js
@@ -37,7 +37,7 @@ Vue.component("ssl-certs-box", {
 		// 删除证书
 		removeCert: function (index) {
 			let that = this
-			teaweb.confirm("确定删除此证书吗？证书数据仍然保留，只是当前服务不再使用此证书。", function () {
+			teaweb.confirm("确定删除此证书吗？证书数据仍然保留，只是当前网站不再使用此证书。", function () {
 				that.certs.$remove(index)
 			})
 		},
diff --git a/web/public/js/components/server/ssl-config-box.js b/web/public/js/components/server/ssl-config-box.js
index ea77e075..e1cf8254 100644
--- a/web/public/js/components/server/ssl-config-box.js
+++ b/web/public/js/components/server/ssl-config-box.js
@@ -98,7 +98,7 @@ Vue.component("ssl-config-box", {
 		// 删除证书
 		removeCert: function (index) {
 			let that = this
-			teaweb.confirm("确定删除此证书吗？证书数据仍然保留，只是当前服务不再使用此证书。", function () {
+			teaweb.confirm("确定删除此证书吗？证书数据仍然保留，只是当前网站不再使用此证书。", function () {
 				that.policy.certRefs.$remove(index)
 				that.policy.certs.$remove(index)
 			})
@@ -385,7 +385,7 @@ Vue.component("ssl-config-box", {
 		// 删除客户端CA证书
 		removeClientCACert: function (index) {
 			let that = this
-			teaweb.confirm("确定删除此证书吗？证书数据仍然保留，只是当前服务不再使用此证书。", function () {
+			teaweb.confirm("确定删除此证书吗？证书数据仍然保留，只是当前网站不再使用此证书。", function () {
 				that.policy.clientCARefs.$remove(index)
 				that.policy.clientCACerts.$remove(index)
 			})
diff --git a/web/views/@default/servers/groups/group/@menu.html b/web/views/@default/servers/groups/group/@menu.html
index 00ca2073..2e94758f 100644
--- a/web/views/@default/servers/groups/group/@menu.html
+++ b/web/views/@default/servers/groups/group/@menu.html
@@ -2,6 +2,6 @@
     <menu-item href="/servers/groups">分组列表</menu-item>
     <span class="item disabled">|</span>
     <menu-item :href="'/servers/groups/group?groupId=' + group.id" code="group.index">"{{group.name}}"详情</menu-item>
-    <menu-item :href="'/servers/groups/group/settings?groupId=' + group.id" :active="!firstMenuItem.startsWith('group.')">全局设置 &nbsp;<tip-icon content="这里添加的设置将会自动应用到当前分组下的所有服务。"></tip-icon></menu-item>
+    <menu-item :href="'/servers/groups/group/settings?groupId=' + group.id" :active="!firstMenuItem.startsWith('group.')">全局设置 &nbsp;<tip-icon content="这里添加的设置将会自动应用到当前分组下的所有网站。"></tip-icon></menu-item>
     <menu-item :href="'/servers/groups/group/update?groupId=' + group.id" code="group.update">修改</menu-item>
 </first-menu>
\ No newline at end of file
diff --git a/web/views/@default/servers/iplists/createPopup.html b/web/views/@default/servers/iplists/createPopup.html
index b8cf6121..cb0c116f 100644
--- a/web/views/@default/servers/iplists/createPopup.html
+++ b/web/views/@default/servers/iplists/createPopup.html
@@ -24,7 +24,7 @@
             <td>全局有效</td>
             <td>
                 <checkbox name="isGlobal" checked="checked"></checkbox>
-                <p class="comment">选中后，所有服务都自动使用此名单，不需要再次绑定；否则只有在WAF策略中绑定此名单后才会生效。</p>
+                <p class="comment">选中后，所有网站都自动使用此名单，不需要再次绑定；否则只有在WAF策略中绑定此名单后才会生效。</p>
             </td>
         </tr>
         <tr>
diff --git a/web/views/@default/servers/metrics/stats.html b/web/views/@default/servers/metrics/stats.html
index b1f57e54..0c6afad0 100644
--- a/web/views/@default/servers/metrics/stats.html
+++ b/web/views/@default/servers/metrics/stats.html
@@ -12,7 +12,7 @@
             <th>时间</th>
             <th>集群</th>
             <th>节点</th>
-            <th>服务</th>
+            <th>网站</th>
         </tr>
     </thead>
     <tr v-for="stat in stats">
diff --git a/web/views/@default/users/update.html b/web/views/@default/users/update.html
index 0161a64f..61f4b8a8 100644
--- a/web/views/@default/users/update.html
+++ b/web/views/@default/users/update.html
@@ -42,7 +42,7 @@
             <td>关联集群 *</td>
             <td>
                 <cluster-selector :v-cluster-id="clusterId"></cluster-selector>
-                <p class="comment">用户发布的网站会自动部署到此集群，修改此选项会同步修改当前用户下的所有服务，但不影响和套餐绑定的服务。</p>
+                <p class="comment">用户发布的网站会自动部署到此集群，修改此选项会同步修改当前用户下的所有网站，但不影响和套餐绑定的服务。</p>
             </td>
         </tr>
         <tr>