From 7c184f28ad7201f00fd1326f361e466ddab10f6d Mon Sep 17 00:00:00 2001
From: "chen.ma" <machencoding@163.com>
Date: Fri, 25 Feb 2022 23:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8A=BD=E8=B1=A1=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=A8=A1=E5=9D=97.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/notify/ThreadPoolNotifyAlarm.java  | 28 +++++++++++++++----
 .../platform/DingSendMessageHandler.java      |  6 ++--
 .../platform/LarkSendMessageHandler.java      |  6 ++--
 .../notify/platform/WeChatAlarmConstants.java |  2 +-
 .../platform/WeChatSendMessageHandler.java    |  4 +--
 5 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyAlarm.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyAlarm.java
index a5116134..3d92606a 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyAlarm.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/ThreadPoolNotifyAlarm.java
@@ -1,31 +1,49 @@
 package cn.hippo4j.common.notify;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Map;
 
 /**
  * Thread pool notify alarm.
  *
  * @author chen.ma
- * @date 2021/8/15 13:13
+ * @date 2021/8/15 19:13
  */
 @Data
-@AllArgsConstructor
+@NoArgsConstructor
+@RequiredArgsConstructor
 public class ThreadPoolNotifyAlarm {
 
     /**
      * isAlarm
      */
+    @NonNull
     private Boolean isAlarm;
 
     /**
-     * livenessAlarm
+     * activeAlarm
      */
-    private Integer livenessAlarm;
+    @NonNull
+    private Integer activeAlarm;
 
     /**
      * capacityAlarm
      */
+    @NonNull
     private Integer capacityAlarm;
 
+    /**
+     * interval
+     */
+    private Integer interval;
+
+    /**
+     * receives
+     */
+    private Map<String, String> receives;
+
 }
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java
index b5bfaf8f..d6f18ec4 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/DingSendMessageHandler.java
@@ -49,7 +49,7 @@ public class DingSendMessageHandler implements SendMessageHandler<AlarmNotifyReq
                 // 实例信息
                 alarmNotifyRequest.getIdentify(),
                 // 报警类型
-                alarmNotifyRequest.getNotifyTypeEnum(),
+                notifyConfig.getTypeEnum(),
                 // 核心线程数
                 alarmNotifyRequest.getCorePoolSize(),
                 // 最大线程数
@@ -63,7 +63,7 @@ public class DingSendMessageHandler implements SendMessageHandler<AlarmNotifyReq
                 // 线程池任务总量
                 alarmNotifyRequest.getCompletedTaskCount(),
                 // 队列类型名称
-                alarmNotifyRequest.getClass().getSimpleName(),
+                alarmNotifyRequest.getQueueName(),
                 // 队列容量
                 alarmNotifyRequest.getCapacity(),
                 // 队列元素个数
@@ -77,7 +77,7 @@ public class DingSendMessageHandler implements SendMessageHandler<AlarmNotifyReq
                 // 告警手机号
                 afterReceives,
                 // 报警频率
-                alarmNotifyRequest.getInterval(),
+                notifyConfig.getInterval(),
                 // 当前时间
                 DateUtil.now()
         );
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkSendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkSendMessageHandler.java
index 1771bf73..1ed16d93 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkSendMessageHandler.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/LarkSendMessageHandler.java
@@ -49,7 +49,7 @@ public class LarkSendMessageHandler implements SendMessageHandler<AlarmNotifyReq
                 // 实例信息
                 alarmNotifyRequest.getIdentify(),
                 // 报警类型
-                alarmNotifyRequest.getNotifyTypeEnum(),
+                notifyConfig.getTypeEnum(),
                 // 核心线程数
                 alarmNotifyRequest.getCorePoolSize(),
                 // 最大线程数
@@ -63,7 +63,7 @@ public class LarkSendMessageHandler implements SendMessageHandler<AlarmNotifyReq
                 // 线程池任务总量
                 alarmNotifyRequest.getCompletedTaskCount(),
                 // 队列类型名称
-                alarmNotifyRequest.getClass().getSimpleName(),
+                alarmNotifyRequest.getQueueName(),
                 // 队列容量
                 alarmNotifyRequest.getCapacity(),
                 // 队列元素个数
@@ -79,7 +79,7 @@ public class LarkSendMessageHandler implements SendMessageHandler<AlarmNotifyReq
                 // 当前时间
                 DateUtil.now(),
                 // 报警频率
-                alarmNotifyRequest.getInterval()
+                notifyConfig.getInterval()
         );
 
         execute(notifyConfig.getSecretKey(), text);
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatAlarmConstants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatAlarmConstants.java
index c8c418a5..48542c62 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatAlarmConstants.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatAlarmConstants.java
@@ -34,7 +34,7 @@ public class WeChatAlarmConstants {
                     "> 队列剩余个数：%s \n" +
                     "> 拒绝策略：%s \n" +
                     "> 拒绝策略执行次数：%s \n" +
-                    "> OWNER：@%s \n" +
+                    "> OWNER：<@%s> \n" +
                     "> 提示：%d 分钟内此线程池不会重复告警（可配置） \n\n" +
                     "**播报时间：%s**";
 
diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java
index 97995574..913796c3 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/platform/WeChatSendMessageHandler.java
@@ -32,7 +32,7 @@ public class WeChatSendMessageHandler implements SendMessageHandler<AlarmNotifyR
     @Override
     public void sendAlarmMessage(NotifyConfigDTO notifyConfig, AlarmNotifyRequest alarmNotifyRequest) {
         String[] receives = notifyConfig.getReceives().split(",");
-        String afterReceives = Joiner.on(", @").join(receives);
+        String afterReceives = Joiner.on("><@").join(receives);
 
         String text = String.format(
                 WE_CHAT_ALARM_TXT,
@@ -59,7 +59,7 @@ public class WeChatSendMessageHandler implements SendMessageHandler<AlarmNotifyR
                 // 线程池任务总量
                 alarmNotifyRequest.getCompletedTaskCount(),
                 // 队列类型名称
-                alarmNotifyRequest.getClass().getSimpleName(),
+                alarmNotifyRequest.getQueueName(),
                 // 队列容量
                 alarmNotifyRequest.getCapacity(),
                 // 队列元素个数