From 8d069c941f00b056cfdb2da2fc3dbdc4a17de8be Mon Sep 17 00:00:00 2001
From: baymax55 <xingbai56@gmail.com>
Date: Mon, 14 Nov 2022 10:12:32 +0800
Subject: [PATCH] rename email msg subject

---
 .../message/platform/EmailSendMessageHandler.java   | 10 ++++++----
 .../platform/constant/EmailAlarmConstants.java      |  4 ++--
 .../robot/dynamic-thread-pool/email-alarm.ftl       | 13 +++++++------
 .../robot/dynamic-thread-pool/email-config.ftl      |  9 ++++++---
 4 files changed, 21 insertions(+), 15 deletions(-)

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<AlarmNotifyRe
             dataModel.put("interval", notifyConfig.getInterval().toString());
             String emailAlarmTxt = Singleton.get(emailAlarmTxtKey, () -> 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<AlarmNotifyRe
         try {
             String emailConfigTxtKey = "message/robot/dynamic-thread-pool/email-config.ftl";
             Map<String, String> 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 @@
-<style>
-    li {
-        list-style-type: none;
-    }
-</style>
 <span style="color: rgb(255, 0, 0);">[警报] </span>${active} - 动态线程池运行告警（${notifyTypeEnum}）
 <ul>
     <li>线程池ID：<span style="color: rgb(160, 0, 0);">${threadPoolId}</span></li>
@@ -24,4 +19,10 @@
     <li>提示：${interval} 分钟内此线程池不会重复告警（可配置）</li>
 </ul>
 
-<b> 播报时间：${date} </b>
\ No newline at end of file
+<b> 播报时间：${date} </b>
+
+<style>
+    li {
+        list-style-type: none;
+    }
+</style>
\ 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 @@
-<style>
-    li{list-style-type:none;}
-</style>
 <span style="color: rgb(0, 240, 0); ">[通知] </span>${active} - 动态线程池参数变更
 <ul>
     <li>线程池ID：<span style="color: rgb(160, 0, 0);">${threadPoolId}</span></li>
@@ -19,3 +16,9 @@
 </ul>
 
 <b> 播报时间：${date} </b>
+
+<style>
+    li {
+        list-style-type: none;
+    }
+</style>