From 3f1f74151f2f9bd4d8f5781b0ced0583d109c6f7 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: Fri, 26 Jul 2024 11:40:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=BF=BD=E5=8A=A0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/monitor/admin/notifier/InfoNotifier.java   | 7 ++++---
 .../ruoyi-monitor-admin/src/main/resources/application.yml | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/InfoNotifier.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/InfoNotifier.java
index da6dbdbb0..f53a1bb6d 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/InfoNotifier.java
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/InfoNotifier.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mail.utils.MailUtils;
 import org.dromara.monitor.admin.config.properties.NotifyProperties;
@@ -72,7 +73,7 @@ public class InfoNotifier {
         NotifyProperties.Mail mail = notifyProperties.getMail();
         if (mail.getEnabled()) {
             String message = StringUtils.format(mail.getTemplate(), notifier.getRegistName(), notifier.getInstanceId(),
-                notifier.getStatusName(), notifier.getStatus(), notifier.getServiceUrl());
+                notifier.getStatusName(), notifier.getStatus(), notifier.getServiceUrl(), DateUtils.getTime());
             try {
                 MailUtils.sendHtml(mail.getTo(), notifier.getRegistName() + notifier.getStatusName(), message);
                 log.info("邮件已发送至: {}", mail.getTo());
@@ -91,8 +92,8 @@ public class InfoNotifier {
         NotifyProperties.WebHook webHook = notifyProperties.getWebHook();
         if (webHook.getEnabled()) {
             String title = notifier.getRegistName() + notifier.getStatusName();
-            String message = StringUtils.format(webHook.getTemplate(), title,
-                notifier.getRegistName(), notifier.getInstanceId(), notifier.getStatus(), notifier.getServiceUrl());
+            String message = StringUtils.format(webHook.getTemplate(), title, notifier.getRegistName(),
+                notifier.getInstanceId(), notifier.getStatus(), notifier.getServiceUrl(), DateUtils.getTime());
             if (StringUtils.isNotBlank(webHook.getKeywords())) {
                 //追加关键词到标题中
                 title += "——" + webHook.getKeywords();
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
index f134a68a6..832338102 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -79,6 +79,7 @@ notify:
                   <p>服务名: <b>{}</b> ({})</p>
                   <p>状态: <b>{}</b> ({})</p>
                   <p>服务IP: <b>{}</b></p>
+                  <p>时间: <b>{}</b></p>
                </body></html>"
   web-hook:
     enabled: false
@@ -87,8 +88,9 @@ notify:
     secret:
     keywords:
     template: |
-      ### {}通知
+      #### **{}通知**
       - **服务名**: {}
       - **实例ID**: {}
       - **状态**: {}
       - **服务IP**: {}
+      - **时间**: {}