From f47a3b058664d72dfb90c90bacf2cf3259ad94dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Wed, 25 May 2022 11:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2/=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8=E6=88=B7=E9=9B=86=E7=BE=A4=E4=B8=8D=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D=E5=A5=97=E9=A4=90=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/nodes/nodeutils/utils.go |  4 +++-
 internal/web/actions/default/users/index.go           | 11 +++++++++++
 web/views/@default/users/index.html                   |  2 +-
 web/views/@default/users/update.html                  |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/internal/web/actions/default/nodes/nodeutils/utils.go b/internal/web/actions/default/nodes/nodeutils/utils.go
index dbea17b3..531b6026 100644
--- a/internal/web/actions/default/nodes/nodeutils/utils.go
+++ b/internal/web/actions/default/nodes/nodeutils/utils.go
@@ -34,7 +34,9 @@ func SendMessageToCluster(ctx context.Context, clusterId int64, code string, msg
 	}
 
 	// 获取所有节点
-	nodesResp, err := defaultRPCClient.NodeRPC().FindAllEnabledNodesWithNodeClusterId(ctx, &pb.FindAllEnabledNodesWithNodeClusterIdRequest{NodeClusterId: clusterId})
+	nodesResp, err := defaultRPCClient.NodeRPC().FindAllEnabledNodesWithNodeClusterId(ctx, &pb.FindAllEnabledNodesWithNodeClusterIdRequest{
+		NodeClusterId: clusterId,
+	})
 	if err != nil {
 		return results, err
 	}
diff --git a/internal/web/actions/default/users/index.go b/internal/web/actions/default/users/index.go
index f2981d90..2153cd11 100644
--- a/internal/web/actions/default/users/index.go
+++ b/internal/web/actions/default/users/index.go
@@ -22,6 +22,17 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["keyword"] = params.Keyword
 	this.Data["isVerifying"] = params.Verifying
 
+	// 未审核的总数量
+	countVerifyingUsersResp, err := this.RPC().UserRPC().CountAllEnabledUsers(this.AdminContext(), &pb.CountAllEnabledUsersRequest{
+		IsVerifying: true,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["countVerifyingUsers"] = countVerifyingUsersResp.Count
+
+	// 当前匹配的数量
 	countResp, err := this.RPC().UserRPC().CountAllEnabledUsers(this.AdminContext(), &pb.CountAllEnabledUsersRequest{
 		Keyword:     params.Keyword,
 		IsVerifying: params.Verifying,
diff --git a/web/views/@default/users/index.html b/web/views/@default/users/index.html
index 7dc2a14a..5f5cbb3f 100644
--- a/web/views/@default/users/index.html
+++ b/web/views/@default/users/index.html
@@ -2,7 +2,7 @@
 
 <first-menu>
     <menu-item href="/users" :active="!isVerifying">全部用户</menu-item>
-    <menu-item href="/users?verifying=1" :active="isVerifying" v-if="teaIsPlus">待审核</menu-item>
+    <menu-item href="/users?verifying=1" :active="isVerifying" v-if="teaIsPlus">待审核<span v-if="countVerifyingUsers > 0">({{countVerifyingUsers}})</span></menu-item>
     <span class="item disabled">|</span>
 	<menu-item @click.prevent="createUser">[创建用户]</menu-item>
 </first-menu>
diff --git a/web/views/@default/users/update.html b/web/views/@default/users/update.html
index 5b13a0b3..11d88a99 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>