From 039ce26f5833f5094e1fdcd1af1d5b7dbf0356f3 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: Mon, 6 Jun 2022 20:13:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E8=8A=82=E7=82=B9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=B8=AD=E6=8F=90=E7=A4=BA=E8=BE=B9=E7=BC=98=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=92=8CAPI=E8=8A=82=E7=82=B9=E6=97=B6=E9=97=B4=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/clusters/cluster/node/detail.go      | 16 ++++++++++++++++
 .../@default/clusters/cluster/node/detail.html   |  8 ++++++++
 2 files changed, 24 insertions(+)

diff --git a/internal/web/actions/default/clusters/cluster/node/detail.go b/internal/web/actions/default/clusters/cluster/node/detail.go
index 7ea65395..f0479c22 100644
--- a/internal/web/actions/default/clusters/cluster/node/detail.go
+++ b/internal/web/actions/default/clusters/cluster/node/detail.go
@@ -11,6 +11,7 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
+	timeutil "github.com/iwind/TeaGo/utils/time"
 	"time"
 )
 
@@ -198,6 +199,8 @@ func (this *DetailAction) RunGet(params struct {
 
 	// 运行状态
 	var status = &nodeconfigs.NodeStatus{}
+	this.Data["nodeDatetime"] = ""
+	this.Data["nodeTimeDiff"] = 0
 	if len(node.StatusJSON) > 0 {
 		err = json.Unmarshal(node.StatusJSON, &status)
 		if err != nil {
@@ -205,6 +208,19 @@ func (this *DetailAction) RunGet(params struct {
 			return
 		}
 		status.IsActive = status.IsActive && time.Now().Unix()-status.UpdatedAt <= 60 // N秒之内认为活跃
+
+		if status.Timestamp > 0 {
+			this.Data["nodeDatetime"] = timeutil.FormatTime("Y-m-d H:i:s", status.Timestamp)
+			if status.UpdatedAt > 0 {
+				var diff = status.UpdatedAt - status.Timestamp
+				if diff < 0 {
+					diff = -diff
+				}
+				this.Data["nodeTimeDiff"] = diff
+			}
+		} else if status.UpdatedAt > 0 {
+			this.Data["nodeDatetime"] = timeutil.FormatTime("Y-m-d H:i:s", status.UpdatedAt)
+		}
 	}
 
 	// 检查是否有新版本
diff --git a/web/views/@default/clusters/cluster/node/detail.html b/web/views/@default/clusters/cluster/node/detail.html
index 8a07f84c..8bac8cfe 100644
--- a/web/views/@default/clusters/cluster/node/detail.html
+++ b/web/views/@default/clusters/cluster/node/detail.html
@@ -176,6 +176,7 @@
 				</div>
 			</td>
 		</tr>
+
 		<tbody v-show="node.status.isActive">
 			<tr>
 				<td>CPU用量</td>
@@ -204,6 +205,13 @@
                 <td>v{{node.status.buildVersion}}
                     &nbsp; <a :href="'/clusters/cluster/upgradeRemote?clusterId=' + clusterId" v-if="shouldUpgrade"><span class="red">发现新版本v{{newVersion}} &raquo;</span></a>
                 </td>
+            </tr>
+            <tr v-if="nodeDatetime.length > 0">
+                <td>上次更新时间</td>
+                <td>
+                    {{nodeDatetime}}
+                    <p class="comment" v-if="nodeTimeDiff > 0"><span class="red">当前节点时间与API节点时间相差 {{nodeTimeDiff}} 秒，请同步节点时间。</span></p>
+                </td>
             </tr>
 		</tbody>
 	</table>