From 305ba3096ef1eb8029017399118645c5f76b2594 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Mon, 15 Nov 2021 16:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=BF=90=E8=A1=8C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=B8=AD=E6=98=BE=E7=A4=BA=E7=9B=B8=E5=85=B3=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actions/default/clusters/cluster/node/logs.go | 15 +++++++++++++++
 .../web/actions/default/clusters/logs/index.go    | 15 +++++++++++++++
 web/public/js/components/common/node-log-row.js   |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/internal/web/actions/default/clusters/cluster/node/logs.go b/internal/web/actions/default/clusters/cluster/node/logs.go
index c387d1ea..45fd34b6 100644
--- a/internal/web/actions/default/clusters/cluster/node/logs.go
+++ b/internal/web/actions/default/clusters/cluster/node/logs.go
@@ -69,6 +69,20 @@ func (this *LogsAction) RunGet(params struct {
 
 	logs := []maps.Map{}
 	for _, log := range logsResp.NodeLogs {
+		// 服务信息
+		var serverMap = maps.Map{"id": 0}
+		if log.ServerId > 0 {
+			serverResp, err := this.RPC().ServerRPC().FindEnabledUserServerBasic(this.AdminContext(), &pb.FindEnabledUserServerBasicRequest{ServerId: log.ServerId})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			var server = serverResp.Server
+			if server != nil {
+				serverMap = maps.Map{"id": server.Id, "name": server.Name}
+			}
+		}
+
 		logs = append(logs, maps.Map{
 			"tag":         log.Tag,
 			"description": log.Description,
@@ -76,6 +90,7 @@ func (this *LogsAction) RunGet(params struct {
 			"level":       log.Level,
 			"isToday":     timeutil.FormatTime("Y-m-d", log.CreatedAt) == timeutil.Format("Y-m-d"),
 			"count":       log.Count,
+			"server":      serverMap,
 		})
 	}
 	this.Data["logs"] = logs
diff --git a/internal/web/actions/default/clusters/logs/index.go b/internal/web/actions/default/clusters/logs/index.go
index f0b6c5c0..599069d9 100644
--- a/internal/web/actions/default/clusters/logs/index.go
+++ b/internal/web/actions/default/clusters/logs/index.go
@@ -90,6 +90,20 @@ func (this *IndexAction) RunGet(params struct {
 			continue
 		}
 
+		// 服务信息
+		var serverMap = maps.Map{"id": 0}
+		if log.ServerId > 0 {
+			serverResp, err := this.RPC().ServerRPC().FindEnabledUserServerBasic(this.AdminContext(), &pb.FindEnabledUserServerBasicRequest{ServerId: log.ServerId})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			var server = serverResp.Server
+			if server != nil {
+				serverMap = maps.Map{"id": server.Id, "name": server.Name}
+			}
+		}
+
 		logs = append(logs, maps.Map{
 			"id":          log.Id,
 			"tag":         log.Tag,
@@ -107,6 +121,7 @@ func (this *IndexAction) RunGet(params struct {
 				},
 				"name": node.Name,
 			},
+			"server": serverMap,
 		})
 	}
 	this.Data["logs"] = logs
diff --git a/web/public/js/components/common/node-log-row.js b/web/public/js/components/common/node-log-row.js
index e98de8dc..59a75efe 100644
--- a/web/public/js/components/common/node-log-row.js
+++ b/web/public/js/components/common/node-log-row.js
@@ -7,6 +7,6 @@ Vue.component("node-log-row", {
 		}
 	},
 	template: `<div>
-	<pre class="log-box" style="margin: 0; padding: 0"><span :class="{red:log.level == 'error', orange:log.level == 'warning', green: log.level == 'success'}"><span v-if="!log.isToday">[{{log.createdTime}}]</span><strong v-if="log.isToday">[{{log.createdTime}}]</strong><keyword :v-word="keyword">[{{log.tag}}]{{log.description}}</keyword></span> &nbsp; <span v-if="log.count > 1" class="ui label tiny" :class="{red:log.level == 'error', orange:log.level == 'warning'}">共{{log.count}}条</span></pre>
+	<pre class="log-box" style="margin: 0; padding: 0"><span :class="{red:log.level == 'error', orange:log.level == 'warning', green: log.level == 'success'}"><span v-if="!log.isToday">[{{log.createdTime}}]</span><strong v-if="log.isToday">[{{log.createdTime}}]</strong><keyword :v-word="keyword">[{{log.tag}}]{{log.description}}</keyword></span> &nbsp; <span v-if="log.count > 1" class="ui label tiny" :class="{red:log.level == 'error', orange:log.level == 'warning'}">共{{log.count}}条</span> <span v-if="log.server != null && log.server.id > 0"><a :href="'/servers/server?serverId=' + log.server.id" class="ui label tiny basic">{{log.server.name}}</a></span></pre>
 </div>`
 })
\ No newline at end of file