From 4fad76397a0b306578cf48b439144c6a64a55db2 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: Fri, 26 Jul 2024 11:02:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=BF=BD=E5=8A=A0=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E8=AF=8D=E5=88=B0=E6=A0=87=E9=A2=98=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitor/admin/config/properties/NotifyProperties.java    | 5 +++++
 .../org/dromara/monitor/admin/notifier/InfoNotifier.java     | 5 ++++-
 .../ruoyi-monitor-admin/src/main/resources/application.yml   | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/properties/NotifyProperties.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/properties/NotifyProperties.java
index 40f7172a2..8dba895be 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/properties/NotifyProperties.java
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/properties/NotifyProperties.java
@@ -70,6 +70,11 @@ public class NotifyProperties {
          */
         private String secret;
 
+        /**
+         * 关键词
+         */
+        private String keywords;
+
         /**
          * Post地址
          */
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 49d6c100c..da6dbdbb0 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
@@ -6,7 +6,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mail.utils.MailUtils;
-
 import org.dromara.monitor.admin.config.properties.NotifyProperties;
 import org.dromara.monitor.admin.event.NotifierEvent;
 import org.springframework.context.event.EventListener;
@@ -94,6 +93,10 @@ public class InfoNotifier {
             String title = notifier.getRegistName() + notifier.getStatusName();
             String message = StringUtils.format(webHook.getTemplate(), title,
                 notifier.getRegistName(), notifier.getInstanceId(), notifier.getStatus(), notifier.getServiceUrl());
+            if (StringUtils.isNotBlank(webHook.getKeywords())) {
+                //追加关键词到标题中
+                title += "——" + webHook.getKeywords();
+            }
             try {
                 sendWebHookMessage(webHook, title, message);
                 log.info("WebHook消息已发送至: {}", webHook.getUrl());
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 f6730ce6d..f134a68a6 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -85,6 +85,7 @@ notify:
     type: 0
     url:
     secret:
+    keywords:
     template: |
       ### {}通知
       - **服务名**: {}