From cb8207203aeca9d52fbc3a5537b697d7762c3181 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Thu, 4 Aug 2022 16:26:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=81=E4=B9=A6=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6=E6=AD=A3=E5=9C=A8?=
 =?UTF-8?q?=E8=A2=ABNS=E9=9B=86=E7=BE=A4=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actions/default/servers/certs/delete.go   | 27 ++++++++++++++-----
 .../@default/servers/certs/certPopup.html     |  4 +--
 .../@default/servers/certs/selectPopup.html   | 13 +++++----
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/internal/web/actions/default/servers/certs/delete.go b/internal/web/actions/default/servers/certs/delete.go
index cd6d50eb..64133b2d 100644
--- a/internal/web/actions/default/servers/certs/delete.go
+++ b/internal/web/actions/default/servers/certs/delete.go
@@ -1,6 +1,7 @@
 package certs
 
 import (
+	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -37,13 +38,27 @@ func (this *DeleteAction) RunPost(params struct {
 	}
 
 	// 是否正在被用户节点使用
-	countResp, err = this.RPC().UserNodeRPC().CountAllEnabledUserNodesWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledUserNodesWithSSLCertIdRequest{SslCertId: params.CertId})
-	if err != nil {
-		this.ErrorPage(err)
-		return
+	if teaconst.IsPlus {
+		countResp, err = this.RPC().UserNodeRPC().CountAllEnabledUserNodesWithSSLCertId(this.AdminContext(), &pb.CountAllEnabledUserNodesWithSSLCertIdRequest{SslCertId: params.CertId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if countResp.Count > 0 {
+			this.Fail("此证书正在被某些用户节点引用，请先修改相关用户节点后再删除")
+		}
 	}
-	if countResp.Count > 0 {
-		this.Fail("此证书正在被某些用户节点引用，请先修改用户节点后再删除")
+
+	// 是否正在被NS集群使用
+	if teaconst.IsPlus {
+		countResp, err = this.RPC().NSClusterRPC().CountAllNSClustersWithSSLCertId(this.AdminContext(), &pb.CountAllNSClustersWithSSLCertIdRequest{SslCertId: params.CertId})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if countResp.Count > 0 {
+			this.Fail("此证书正在被某些DNS集群节点引用，请先修改相关DNS集群设置后再删除")
+		}
 	}
 
 	_, err = this.RPC().SSLCertRPC().DeleteSSLCert(this.AdminContext(), &pb.DeleteSSLCertRequest{SslCertId: params.CertId})
diff --git a/web/views/@default/servers/certs/certPopup.html b/web/views/@default/servers/certs/certPopup.html
index 66dd220a..74d2a720 100644
--- a/web/views/@default/servers/certs/certPopup.html
+++ b/web/views/@default/servers/certs/certPopup.html
@@ -30,7 +30,7 @@
 	<tr>
 		<td>域名</td>
 		<td>
-			<span class="ui label small" v-for="dnsName in info.dnsNames">{{dnsName}}</span>
+			<span class="ui label small basic" v-for="dnsName in info.dnsNames">{{dnsName}}</span>
 		</td>
 	</tr>
 	<tr>
@@ -42,7 +42,7 @@
 		<td>
 			<span class="disabled" v-if="servers.length == 0">暂时没有引用此证书的服务。</span>
 			<div v-if="servers.length > 0">
-				<a v-for="server in servers" :href="'/servers/server?serverId=' + server.id" target="_blank" class="ui label small">{{server.name}}</a>
+				<a v-for="server in servers" :href="'/servers/server/settings/https?serverId=' + server.id" target="_blank" class="ui label small basic">{{server.name}}</a>
 			</div>
 		</td>
 	</tr>
diff --git a/web/views/@default/servers/certs/selectPopup.html b/web/views/@default/servers/certs/selectPopup.html
index 1f67bb87..15e58bd2 100644
--- a/web/views/@default/servers/certs/selectPopup.html
+++ b/web/views/@default/servers/certs/selectPopup.html
@@ -20,7 +20,6 @@
 	<thead>
 	<tr>
 		<th>证书说明</th>
-		<th v-if="viewSize == 'normal'">顶级发行组织</th>
 		<th>域名</th>
 		<th>过期日期</th>
 		<th v-if="viewSize == 'normal'">引用服务</th>
@@ -29,14 +28,18 @@
 	</tr>
 	</thead>
 	<tr v-for="(cert, index) in certs">
-        <td><keyword :v-word="keyword">{{cert.name}}</keyword>
+        <td>
+            <a href="" @click.prevent="selectCert(cert)" v-if="!certInfos[index].isSelected"><keyword :v-word="keyword">{{cert.name}}</keyword></a>
+            <span  v-if="certInfos[index].isSelected">{{cert.name}}</span>
+
+            <div v-if="cert.commonNames != null && cert.commonNames.length > 0" style="margin-top:0.5em">
+                <span class="grey small">{{cert.commonNames[cert.commonNames.length-1]}}</span>
+            </div>
+
 			<div v-if="cert.isCA" style="margin-top:0.5em">
 				<span class="ui label olive tiny">CA</span>
 			</div>
 		</td>
-		<td v-if="viewSize == 'normal'">
-			<span v-if="cert.commonNames != null && cert.commonNames.length > 0">{{cert.commonNames[cert.commonNames.length-1]}}</span>
-		</td>
 		<td>
 			<div v-for="dnsName in cert.dnsNames" style="margin-bottom:0.4em">
                 <span class="ui label tiny"><keyword :v-word="keyword">{{dnsName}}</keyword></span>