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: | ### {}通知 - **服务名**: {}