diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java index 44a23934..edb83a57 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/Singleton.java @@ -28,9 +28,9 @@ import java.util.function.Supplier; */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public final class Singleton { - + private static final ConcurrentHashMap SINGLE_OBJECT_POOL = new ConcurrentHashMap(); - + /** * Get a singleton object by key. * @@ -42,7 +42,8 @@ public final class Singleton { Object result = SINGLE_OBJECT_POOL.get(key); return result == null ? null : (T) result; } - + + /** * Get a singleton object by key. * @@ -60,7 +61,7 @@ public final class Singleton { } return result != null ? (T) result : null; } - + /** * Object into container. * @@ -69,7 +70,7 @@ public final class Singleton { public static void put(Object value) { put(value.getClass().getName(), value); } - + /** * Object into container. * diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/ThreadPoolNotifyAlarmHandler.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/ThreadPoolNotifyAlarmHandler.java index 9bd9c2f5..04e4d8b0 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/ThreadPoolNotifyAlarmHandler.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/ThreadPoolNotifyAlarmHandler.java @@ -24,7 +24,7 @@ import cn.hippo4j.core.executor.manage.GlobalThreadPoolManage; import cn.hippo4j.core.executor.support.ThreadPoolBuilder; import cn.hippo4j.core.toolkit.IdentifyUtil; import cn.hippo4j.core.toolkit.TraceContextUtil; -import cn.hippo4j.message.service.HippoSendMessageService; +import cn.hippo4j.message.service.Hippo4jSendMessageService; import cn.hippo4j.message.enums.NotifyTypeEnum; import cn.hippo4j.message.service.ThreadPoolNotifyAlarm; import cn.hippo4j.message.request.AlarmNotifyRequest; @@ -51,7 +51,7 @@ import java.util.concurrent.*; public class ThreadPoolNotifyAlarmHandler implements Runnable, CommandLineRunner { @NonNull - private final HippoSendMessageService hippoSendMessageService; + private final Hippo4jSendMessageService hippoSendMessageService; @Value("${spring.profiles.active:UNKNOWN}") private String active; diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/config/MessageConfiguration.java b/hippo4j-message/src/main/java/cn/hippo4j/message/config/MessageConfiguration.java index 8ae5a1bd..e495cfe4 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/config/MessageConfiguration.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/config/MessageConfiguration.java @@ -22,8 +22,8 @@ import cn.hippo4j.message.platform.DingSendMessageHandler; import cn.hippo4j.message.platform.LarkSendMessageHandler; import cn.hippo4j.message.platform.WeChatSendMessageHandler; import cn.hippo4j.message.service.AlarmControlHandler; -import cn.hippo4j.message.service.HippoBaseSendMessageService; -import cn.hippo4j.message.service.HippoSendMessageService; +import cn.hippo4j.message.service.Hippo4jBaseSendMessageService; +import cn.hippo4j.message.service.Hippo4jSendMessageService; import cn.hippo4j.message.service.SendMessageHandler; import org.springframework.context.annotation.Bean; @@ -33,9 +33,9 @@ import org.springframework.context.annotation.Bean; public class MessageConfiguration { @Bean - public HippoSendMessageService hippoSendMessageService(NotifyConfigBuilder serverNotifyConfigBuilder, - AlarmControlHandler alarmControlHandler) { - return new HippoBaseSendMessageService(serverNotifyConfigBuilder, alarmControlHandler); + public Hippo4jSendMessageService hippo4jSendMessageService(NotifyConfigBuilder serverNotifyConfigBuilder, + AlarmControlHandler alarmControlHandler) { + return new Hippo4jBaseSendMessageService(serverNotifyConfigBuilder, alarmControlHandler); } @Bean diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/dto/AlarmControlDTO.java b/hippo4j-message/src/main/java/cn/hippo4j/message/dto/AlarmControlDTO.java index 51ade83a..91901772 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/dto/AlarmControlDTO.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/dto/AlarmControlDTO.java @@ -22,29 +22,29 @@ import lombok.Builder; import lombok.Data; /** - * Alarm control dto. + * Alarm control DTO. */ @Data @Builder public class AlarmControlDTO { /** - * 线程池 Id + * Thread pool id */ private String threadPool; /** - * 推送报警平台 + * Push alarm platform */ private String platform; /** - * 推送报警类型 + * Push Alert Type */ private NotifyTypeEnum typeEnum; /** - * 构建线程池报警标识 + * Build thread pool alarm id * * @return */ diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/dto/NotifyConfigDTO.java b/hippo4j-message/src/main/java/cn/hippo4j/message/dto/NotifyConfigDTO.java index 72bda5ca..6b4370c2 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/dto/NotifyConfigDTO.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/dto/NotifyConfigDTO.java @@ -23,7 +23,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * Notify config dto. + * Notify config DTO. */ @Data @EqualsAndHashCode diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/dto/ThreadPoolNotifyDTO.java b/hippo4j-message/src/main/java/cn/hippo4j/message/dto/ThreadPoolNotifyDTO.java index dc25f57f..c0519b0f 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/dto/ThreadPoolNotifyDTO.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/dto/ThreadPoolNotifyDTO.java @@ -28,12 +28,12 @@ import java.util.List; public class ThreadPoolNotifyDTO { /** - * notifyKey + * Notify key */ private String notifyKey; /** - * notifyList + * Notify list */ private List notifyList; } diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/DingAlarmConstants.java b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/DingAlarmConstants.java index 7f4aec17..9688fe98 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/DingAlarmConstants.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/DingAlarmConstants.java @@ -23,27 +23,27 @@ package cn.hippo4j.message.platform.constant; public class DingAlarmConstants { /** - * 钉钉机器人 Url + * DingTalk Robot Url */ public static final String DING_ROBOT_SERVER_URL = "https://oapi.dingtalk.com/robot/send?access_token="; /** - * 线程池报警通知标题 + * Thread Pool Alert Notification Title */ public static final String DING_ALARM_TITLE = "动态线程池告警"; /** - * 线程池参数变更通知标题 + * Thread pool parameter change notification title */ public static final String DING_NOTICE_TITLE = "动态线程池通知"; /** - * Trace 信息 + * Trace info */ public static final String DING_ALARM_TIMOUT_TRACE_REPLACE_TXT = "链路信息：%s \n\n "; /** - * 替换任务超时模板 + * Replace task timeout template */ public static final String DING_ALARM_TIMOUT_REPLACE_TXT = "任务执行时间：%d / ms \n\n " + diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/LarkAlarmConstants.java b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/LarkAlarmConstants.java index fd0f164f..a8e9c4a5 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/LarkAlarmConstants.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/LarkAlarmConstants.java @@ -23,51 +23,24 @@ package cn.hippo4j.message.platform.constant; public class LarkAlarmConstants { /** - * lark bot url + * Lark bot url */ public static final String LARK_BOT_URL = "https://open.feishu.cn/open-apis/bot/v2/hook/"; /** - * lark at format. openid - * 当配置openid时,机器人可以@人 + * Lark at format. openid + * When openid is configured, the bot can @person */ public static final String LARK_AT_FORMAT_OPENID = ""; /** - * lark at format. username - * 当配置username时,只能蓝色字体展示@username,被@人无@提醒 + * Lark at format. username + * When configuring username, only @username can be displayed in blue font, and it is reminded by @people without @ */ public static final String LARK_AT_FORMAT_USERNAME = "%s"; /** - * lark openid prefix + * Lark openid prefix */ public static final String LARK_OPENID_PREFIX = "ou_"; - - /** - * Trace 信息 - */ - public static final String LARK_ALARM_TIMOUT_TRACE_REPLACE_TXT = ",{\"is_short\":true,\"text\":{\"content\":\"** 链路信息：** %s\",\"tag\":\"lark_md\"}}"; - - /** - * 替换任务超时模板 - */ - public static final String LARK_ALARM_TIMOUT_REPLACE_TXT = - "{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 任务执行时间：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 超时时间：** %s\",\"tag\":\"lark_md\"}}" + - LARK_ALARM_TIMOUT_TRACE_REPLACE_TXT + - "],\"tag\":\"div\"},{\"tag\":\"hr\"},"; - - /** - * lark alarm json str - */ - public static final String LARK_ALARM_JSON_STR = - "{\"msg_type\":\"interactive\",\"card\":{\"config\":{\"wide_screen_mode\":true},\"header\":{\"template\":\"red\",\"title\":{\"content\":\"[\uD83D\uDD25警报] %s 动态线程池运行告警（%s）\",\"tag\":\"plain_text\"}},\"elements\":[{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 线程池ID：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用名称：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用实例：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 核心线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 最大线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 当前线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 活跃线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 同存最大线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 线程池任务总量：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 队列类型：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列容量：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列元素个数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列剩余个数：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"}," - + LARK_ALARM_TIMOUT_REPLACE_TXT - + "{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 拒绝策略：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 拒绝策略执行次数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** OWNER：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 播报时间： ** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"tag\":\"note\",\"elements\":[{\"tag\":\"plain_text\",\"content\":\"提示： %s 分钟内此线程池不会重复告警（可配置）\"}]}]}}"; - - /** - * lark notice json str - */ - public static final String LARK_NOTICE_JSON_STR = - "{\"msg_type\":\"interactive\",\"card\":{\"config\":{\"wide_screen_mode\":true},\"header\":{\"template\":\"greed\",\"title\":{\"content\":\"[通知] %s 动态线程池参数变更\",\"tag\":\"plain_text\"}},\"elements\":[{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 线程池ID：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用名称：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 应用实例：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 核心线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 最大线程数：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 核心线程超时：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 线程存活时间：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** 队列类型：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 队列容量：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 执行超时时间：** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"fields\":[{\"is_short\":true,\"text\":{\"content\":\"** AGO 拒绝策略：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** NOW 拒绝策略：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** OWNER：** %s\",\"tag\":\"lark_md\"}},{\"is_short\":true,\"text\":{\"content\":\"** 播报时间： ** %s\",\"tag\":\"lark_md\"}}],\"tag\":\"div\"},{\"tag\":\"hr\"},{\"tag\":\"note\",\"elements\":[{\"tag\":\"plain_text\",\"content\":\"提示：动态线程池配置变更实时通知（无限制）\"}]}]}}"; } diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/WeChatAlarmConstants.java b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/WeChatAlarmConstants.java index 83bc5182..8d4f56f8 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/WeChatAlarmConstants.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/constant/WeChatAlarmConstants.java @@ -23,17 +23,17 @@ package cn.hippo4j.message.platform.constant; public class WeChatAlarmConstants { /** - * 企微机器人 Url + * Enterprise Micro Robot Url */ public static final String WE_CHAT_SERVER_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key="; /** - * Trace 信息 + * Trace info */ public static final String WE_CHAT_ALARM_TIMOUT_TRACE_REPLACE_TXT = "\n> 链路信息：%s "; /** - * 替换任务超时模板 + * Replace task timeout template */ public static final String WE_CHAT_ALARM_TIMOUT_REPLACE_TXT = "\n> 任务执行时间：%s / ms \n" + diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/request/AlarmNotifyRequest.java b/hippo4j-message/src/main/java/cn/hippo4j/message/request/AlarmNotifyRequest.java index b57ea82a..3b57289f 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/request/AlarmNotifyRequest.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/request/AlarmNotifyRequest.java @@ -30,102 +30,102 @@ import lombok.experimental.Accessors; public class AlarmNotifyRequest extends BaseNotifyRequest { /** - * interval + * Interval */ private Integer interval; /** - * notifyTypeEnum + * Notify type enum */ private NotifyTypeEnum notifyTypeEnum; /** - * active + * Active */ private String active; /** - * appName + * App name */ private String appName; /** - * identify + * Identify */ private String identify; /** - * corePoolSize + * Core pool size */ private Integer corePoolSize; /** - * maximumPoolSize + * Maximum pool size */ private Integer maximumPoolSize; /** - * poolSize + * Pool size */ private Integer poolSize; /** - * activeCount + * Active count */ private Integer activeCount; /** - * largestPoolSize + * Largest pool size */ private Integer largestPoolSize; /** - * completedTaskCount + * Completed task count */ private Long completedTaskCount; /** - * queueName + * Queue name */ private String queueName; /** - * capacity + * Capacity */ private Integer capacity; /** - * queueSize + * Queue size */ private Integer queueSize; /** - * remainingCapacity + * Remaining capacity */ private Integer remainingCapacity; /** - * rejectedExecutionHandlerName + * Rejected execution handler name */ private String rejectedExecutionHandlerName; /** - * rejectCountNum + * Reject count num */ private Long rejectCountNum; /** - * executeTime + * Execute time */ private Long executeTime; /** - * executeTimeOut + * Execute timeout */ private Long executeTimeOut; /** - * executeTimeoutTrace + * Execute timeout trace */ private String executeTimeoutTrace; } diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/request/RobotAlarmNotifyRequest.java b/hippo4j-message/src/main/java/cn/hippo4j/message/request/RobotAlarmNotifyRequest.java index c053b994..4d0828c7 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/request/RobotAlarmNotifyRequest.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/request/RobotAlarmNotifyRequest.java @@ -26,7 +26,7 @@ import lombok.Data; public class RobotAlarmNotifyRequest extends AlarmNotifyRequest { /** - * secretKey + * Secret key */ private String secretKey; } diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/request/RobotChangeParameterNotifyRequest.java b/hippo4j-message/src/main/java/cn/hippo4j/message/request/RobotChangeParameterNotifyRequest.java index 64281e45..2b35b95b 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/request/RobotChangeParameterNotifyRequest.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/request/RobotChangeParameterNotifyRequest.java @@ -26,7 +26,7 @@ import lombok.Data; public class RobotChangeParameterNotifyRequest extends ChangeParameterNotifyRequest { /** - * secretKey + * Secret key */ private String secretKey; } diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/request/ThreadPoolNotifyRequest.java b/hippo4j-message/src/main/java/cn/hippo4j/message/request/ThreadPoolNotifyRequest.java index 34f7c8c8..7b73175a 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/request/ThreadPoolNotifyRequest.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/request/ThreadPoolNotifyRequest.java @@ -30,7 +30,7 @@ import java.util.List; public class ThreadPoolNotifyRequest { /** - * groupKeys + * Group keys */ private List groupKeys; } diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/request/base/BaseNotifyRequest.java b/hippo4j-message/src/main/java/cn/hippo4j/message/request/base/BaseNotifyRequest.java index 151bd039..5c96e994 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/request/base/BaseNotifyRequest.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/request/base/BaseNotifyRequest.java @@ -26,32 +26,32 @@ import lombok.Data; public class BaseNotifyRequest implements NotifyRequest { /** - * tenantId + * Tenant id */ private String tenantId; /** - * itemId + * Item id */ private String itemId; /** - * threadPoolId + * Thread pool id */ private String threadPoolId; /** - * platform + * Platform */ private String platform; /** - * type + * Type */ private String type; /** - * receives + * Receives */ private String receives; } diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/service/HippoBaseSendMessageService.java b/hippo4j-message/src/main/java/cn/hippo4j/message/service/Hippo4jBaseSendMessageService.java similarity index 97% rename from hippo4j-message/src/main/java/cn/hippo4j/message/service/HippoBaseSendMessageService.java rename to hippo4j-message/src/main/java/cn/hippo4j/message/service/Hippo4jBaseSendMessageService.java index 10fcab2a..93ffc794 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/service/HippoBaseSendMessageService.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/service/Hippo4jBaseSendMessageService.java @@ -36,11 +36,11 @@ import java.util.List; import java.util.Map; /** - * Hippo base send message service. + * Hippo-4j base send message service. */ @Slf4j @RequiredArgsConstructor -public class HippoBaseSendMessageService implements HippoSendMessageService, CommandLineRunner { +public class Hippo4jBaseSendMessageService implements Hippo4jSendMessageService, CommandLineRunner { private final NotifyConfigBuilder notifyConfigBuilder; diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/service/HippoSendMessageService.java b/hippo4j-message/src/main/java/cn/hippo4j/message/service/Hippo4jSendMessageService.java similarity index 87% rename from hippo4j-message/src/main/java/cn/hippo4j/message/service/HippoSendMessageService.java rename to hippo4j-message/src/main/java/cn/hippo4j/message/service/Hippo4jSendMessageService.java index 0d8c300a..f3ef3445 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/service/HippoSendMessageService.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/service/Hippo4jSendMessageService.java @@ -22,12 +22,12 @@ import cn.hippo4j.message.request.AlarmNotifyRequest; import cn.hippo4j.message.request.ChangeParameterNotifyRequest; /** - * Hippo4j send message service. + * Hippo-4j send message service. */ -public interface HippoSendMessageService { +public interface Hippo4jSendMessageService { /** - * Send alarm message. + * Send dynamic thread pool alert notifications. * * @param typeEnum * @param alarmNotifyRequest @@ -35,7 +35,7 @@ public interface HippoSendMessageService { void sendAlarmMessage(NotifyTypeEnum typeEnum, AlarmNotifyRequest alarmNotifyRequest); /** - * Send change message. + * Send dynamic thread pool parameter change notification. * * @param changeParameterNotifyRequest */ diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/service/ThreadPoolNotifyAlarm.java b/hippo4j-message/src/main/java/cn/hippo4j/message/service/ThreadPoolNotifyAlarm.java index 83032c87..15c37b16 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/service/ThreadPoolNotifyAlarm.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/service/ThreadPoolNotifyAlarm.java @@ -63,9 +63,7 @@ public class ThreadPoolNotifyAlarm { /** * Receives * - *

- * Do not enable this configuration for the time being, it may be useful if you develop mailboxes in the future. - *

+ *

Do not enable this configuration for the time being, it may be useful if you develop mailboxes in the future. */ @Deprecated private Map receives; diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/DynamicThreadPoolCoreAutoConfiguration.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/DynamicThreadPoolCoreAutoConfiguration.java index dbbc7107..28b90b38 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/DynamicThreadPoolCoreAutoConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/DynamicThreadPoolCoreAutoConfiguration.java @@ -33,8 +33,8 @@ import cn.hippo4j.core.springboot.starter.support.ThreadPoolAdapterRegister; import cn.hippo4j.message.api.NotifyConfigBuilder; import cn.hippo4j.message.config.MessageConfiguration; import cn.hippo4j.message.service.AlarmControlHandler; -import cn.hippo4j.message.service.HippoBaseSendMessageService; -import cn.hippo4j.message.service.HippoSendMessageService; +import cn.hippo4j.message.service.Hippo4jBaseSendMessageService; +import cn.hippo4j.message.service.Hippo4jSendMessageService; import lombok.AllArgsConstructor; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -78,7 +78,7 @@ public class DynamicThreadPoolCoreAutoConfiguration { } @Bean - public ThreadPoolNotifyAlarmHandler threadPoolNotifyAlarmHandler(HippoSendMessageService hippoSendMessageService) { + public ThreadPoolNotifyAlarmHandler threadPoolNotifyAlarmHandler(Hippo4jSendMessageService hippoSendMessageService) { return new ThreadPoolNotifyAlarmHandler(hippoSendMessageService); } @@ -96,7 +96,7 @@ public class DynamicThreadPoolCoreAutoConfiguration { @SuppressWarnings("all") public ExecutorsListener hippo4jExecutorsListener(ThreadPoolNotifyAlarmHandler threadPoolNotifyAlarmHandler, CoreNotifyConfigBuilder coreNotifyConfigBuilder, - HippoBaseSendMessageService hippoBaseSendMessageService) { + Hippo4jBaseSendMessageService hippoBaseSendMessageService) { return new ExecutorsListener(threadPoolNotifyAlarmHandler, coreNotifyConfigBuilder, hippoBaseSendMessageService); } diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/ExecutorsListener.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/ExecutorsListener.java index 8a9a8e05..eafb13d2 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/ExecutorsListener.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/ExecutorsListener.java @@ -33,7 +33,7 @@ import cn.hippo4j.core.springboot.starter.notify.CoreNotifyConfigBuilder; import cn.hippo4j.core.springboot.starter.support.GlobalCoreThreadPoolManage; import cn.hippo4j.message.dto.NotifyConfigDTO; import cn.hippo4j.message.request.ChangeParameterNotifyRequest; -import cn.hippo4j.message.service.HippoBaseSendMessageService; +import cn.hippo4j.message.service.Hippo4jBaseSendMessageService; import cn.hippo4j.message.service.ThreadPoolNotifyAlarm; import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; @@ -65,7 +65,7 @@ public class ExecutorsListener implements ApplicationListener changeKeys = Lists.newArrayList(); Map> newDynamicThreadPoolNotifyMap = coreNotifyConfigBuilder.buildSingleNotifyConfig(properties); - Map> notifyConfigs = hippoBaseSendMessageService.getNotifyConfigs(); + Map> notifyConfigs = hippo4jBaseSendMessageService.getNotifyConfigs(); if (CollectionUtil.isNotEmpty(notifyConfigs)) { for (Map.Entry> each : newDynamicThreadPoolNotifyMap.entrySet()) { if (checkNotifyConfig) { @@ -159,7 +159,7 @@ public class ExecutorsListener implements ApplicationListener> notifyConfig = configBuilder.buildSingleNotifyConfig(executor); sendMessageService.putPlatform(notifyConfig); diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java index 683dadeb..9b3550ca 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/config/DynamicThreadPoolAutoConfiguration.java @@ -31,7 +31,7 @@ import cn.hippo4j.core.toolkit.inet.InetUtils; import cn.hippo4j.message.api.NotifyConfigBuilder; import cn.hippo4j.message.config.MessageConfiguration; import cn.hippo4j.message.service.AlarmControlHandler; -import cn.hippo4j.message.service.HippoSendMessageService; +import cn.hippo4j.message.service.Hippo4jSendMessageService; import cn.hippo4j.springboot.starter.controller.ThreadPoolAdapterController; import cn.hippo4j.springboot.starter.controller.WebThreadPoolController; import cn.hippo4j.springboot.starter.controller.WebThreadPoolRunStateController; @@ -187,7 +187,7 @@ public class DynamicThreadPoolAutoConfiguration { } @Bean - public ThreadPoolNotifyAlarmHandler threadPoolNotifyAlarmHandler(HippoSendMessageService hippoSendMessageService) { + public ThreadPoolNotifyAlarmHandler threadPoolNotifyAlarmHandler(Hippo4jSendMessageService hippoSendMessageService) { return new ThreadPoolNotifyAlarmHandler(hippoSendMessageService); } }