diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/EmailSendMessageHandler.java b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/EmailSendMessageHandler.java index a7d3e003..9edd3646 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/EmailSendMessageHandler.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/EmailSendMessageHandler.java @@ -69,8 +69,9 @@ public class EmailSendMessageHandler implements SendMessageHandler FileUtil.readUtf8String(emailAlarmTxtKey)); String renderedEmailAlarmTxt = render(dataModel, emailAlarmTxt); + String alarmSubject = render(dataModel, EmailAlarmConstants.Email_ALARM_TITLE); String[] recipients = notifyConfig.getReceives().split(","); - execute(recipients, EmailAlarmConstants.Email_ALARM_TITLE, renderedEmailAlarmTxt); + execute(recipients, alarmSubject, renderedEmailAlarmTxt); } catch (Exception e) { log.error("Email failed to send message", e); } @@ -81,10 +82,11 @@ public class EmailSendMessageHandler implements SendMessageHandler dataModel = getDataModel(changeParameterNotifyRequest); - String emailAlarmTxt = Singleton.get(emailConfigTxtKey, () -> FileUtil.readUtf8String(emailConfigTxtKey)); - String renderedEmailAlarmTxt = render(dataModel, emailAlarmTxt); + String emailConfigTxt = Singleton.get(emailConfigTxtKey, () -> FileUtil.readUtf8String(emailConfigTxtKey)); + String renderedEmailConfigTxt = render(dataModel, emailConfigTxt); + String configSubject = render(dataModel, EmailAlarmConstants.Email_NOTICE_TITLE); String[] recipients = notifyConfig.getReceives().split(","); - execute(recipients, EmailAlarmConstants.Email_NOTICE_TITLE, renderedEmailAlarmTxt); + execute(recipients, configSubject, renderedEmailConfigTxt); } catch (Exception e) { log.error("Email failed to send message", e); } diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/EmailAlarmConstants.java b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/EmailAlarmConstants.java index 3daa24ac..b20c45dc 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/EmailAlarmConstants.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/EmailAlarmConstants.java @@ -25,10 +25,10 @@ public class EmailAlarmConstants { /** * Thread Pool Alert Notification Title */ - public static final String Email_ALARM_TITLE = "动态线程池告警"; + public static String Email_ALARM_TITLE = "【Hippo4J】${active}-${threadPoolId} 线程池 ${notifyTypeEnum} 预警"; /** * Thread pool parameter change notification title */ - public static final String Email_NOTICE_TITLE = "动态线程池通知"; + public static String Email_NOTICE_TITLE = "【Hippo4J】${active}-${threadPoolId} 线程池参数变更通知"; } \ No newline at end of file diff --git a/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/email-alarm.ftl b/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/email-alarm.ftl index 42a0c04d..ef1fd737 100644 --- a/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/email-alarm.ftl +++ b/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/email-alarm.ftl @@ -1,8 +1,3 @@ - [警报] ${active} - 动态线程池运行告警(${notifyTypeEnum}) - 播报时间:${date} \ No newline at end of file + 播报时间:${date} + + \ No newline at end of file diff --git a/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/email-config.ftl b/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/email-config.ftl index 3f6ad711..620b3305 100644 --- a/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/email-config.ftl +++ b/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/email-config.ftl @@ -1,6 +1,3 @@ - [通知] ${active} - 动态线程池参数变更 播报时间:${date} + +