From a256a7328e7570f24fe2825e32739b4c19c6cba7 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: Sun, 8 Aug 2021 10:29:57 +0800
Subject: [PATCH] =?UTF-8?q?DNS=E8=8A=82=E7=82=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=8A=B6=E6=80=81=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/messages/index.go            | 1 +
 internal/web/actions/default/ns/clusters/cluster/index.go | 2 +-
 web/public/js/components/messages/message-row.js          | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/internal/web/actions/default/messages/index.go b/internal/web/actions/default/messages/index.go
index 629d0749..afce874d 100644
--- a/internal/web/actions/default/messages/index.go
+++ b/internal/web/actions/default/messages/index.go
@@ -55,6 +55,7 @@ func (this *IndexAction) RunGet(params struct{}) {
 
 		messages = append(messages, maps.Map{
 			"id":       message.Id,
+			"role":     message.Role,
 			"isRead":   message.IsRead,
 			"body":     message.Body,
 			"level":    message.Level,
diff --git a/internal/web/actions/default/ns/clusters/cluster/index.go b/internal/web/actions/default/ns/clusters/cluster/index.go
index 105c41a0..16ab3a06 100644
--- a/internal/web/actions/default/ns/clusters/cluster/index.go
+++ b/internal/web/actions/default/ns/clusters/cluster/index.go
@@ -112,7 +112,7 @@ func (this *IndexAction) RunGet(params struct {
 				"error":      node.InstallStatus.Error,
 			},
 			"status": maps.Map{
-				"isActive":     status.IsActive,
+				"isActive":     node.IsActive,
 				"updatedAt":    status.UpdatedAt,
 				"hostname":     status.Hostname,
 				"cpuUsage":     status.CPUUsage,
diff --git a/web/public/js/components/messages/message-row.js b/web/public/js/components/messages/message-row.js
index 1d3ccc38..b0919b07 100644
--- a/web/public/js/components/messages/message-row.js
+++ b/web/public/js/components/messages/message-row.js
@@ -41,11 +41,13 @@ Vue.component("message-row", {
 			<strong>{{message.datetime}}</strong>
 			<span v-if="message.cluster != null && message.cluster.id != null">
 				<span> | </span>
-				<a :href="'/clusters/cluster?clusterId=' + message.cluster.id" target="_top">集群：{{message.cluster.name}}</a>
+				<a :href="'/clusters/cluster?clusterId=' + message.cluster.id" target="_top" v-if="message.role == 'node'">集群：{{message.cluster.name}}</a>
+				<a :href="'/ns/clusters/cluster?clusterId=' + message.cluster.id" target="_top" v-if="message.role == 'dns'">DNS集群：{{message.cluster.name}}</a>
 			</span>
 			<span v-if="message.node != null && message.node.id != null">
 				<span> | </span>
-				<a :href="'/clusters/cluster/node?clusterId=' + message.cluster.id + '&nodeId=' + message.node.id" target="_top">节点：{{message.node.name}}</a>
+				<a :href="'/clusters/cluster/node?clusterId=' + message.cluster.id + '&nodeId=' + message.node.id" target="_top" v-if="message.role == 'node'">节点：{{message.node.name}}</a>
+				<a :href="'/ns/clusters/cluster/node?clusterId=' + message.cluster.id + '&nodeId=' + message.node.id" target="_top" v-if="message.role == 'dns'">DNS节点：{{message.node.name}}</a>
 			</span>
 			<a href=""  style="position: absolute; right: 1em" @click.prevent="readMessage(message.id)" title="标为已读"><i class="icon check"></i></a>
 		</td>
@@ -73,6 +75,8 @@ Vue.component("message-row", {
 			<div v-if="message.type == 'SSLCertACMETaskSuccess'" style="margin-top: 0.8em">
 				<a href="" @click.prevent="viewCert(params.certId)" target="_top">查看证书</a> &nbsp;|&nbsp; <a :href="'/servers/certs/acme'" v-if="params != null && params.acmeTaskId > 0" target="_top">查看任务&raquo;</a>
 			</div>
+			
+			<!-- 证书续期失败 -->
 			<div v-if="message.type == 'SSLCertACMETaskFailed'" style="margin-top: 0.8em">
 				<a href="" @click.prevent="viewCert(params.certId)" target="_top">查看证书</a> &nbsp;|&nbsp; <a :href="'/servers/certs/acme'" v-if="params != null && params.acmeTaskId > 0" target="_top">查看任务&raquo;</a>
 			</div>