From 5038667c74aea5ddf2330669a0a6463da03ed28b Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Mon, 28 Mar 2022 20:51:40 +0800 Subject: [PATCH] Unified thread pool id --- .../hippo4j/common/notify/HippoBaseSendMessageService.java | 2 +- .../main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java | 2 +- .../core/starter/notify/CoreNotifyConfigBuilder.java | 6 +++--- .../hippo4j/starter/notify/ServerNotifyConfigBuilder.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoBaseSendMessageService.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoBaseSendMessageService.java index 07904b96..0eaf2012 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoBaseSendMessageService.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/HippoBaseSendMessageService.java @@ -49,7 +49,7 @@ public class HippoBaseSendMessageService implements HippoSendMessageService, Com return; } - if (isSendAlarm(each.getThreadPoolId(), each.getPlatform(), typeEnum)) { + if (isSendAlarm(each.getTpId(), each.getPlatform(), typeEnum)) { alarmNotifyRequest.setNotifyTypeEnum(typeEnum); messageHandler.sendAlarmMessage(each, alarmNotifyRequest); } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java index 5f7ef7b6..84d5e48c 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/notify/NotifyConfigDTO.java @@ -26,7 +26,7 @@ public class NotifyConfigDTO { /** * 线程池id */ - private String threadPoolId; + private String tpId; /** * 通知平台 diff --git a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/notify/CoreNotifyConfigBuilder.java b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/notify/CoreNotifyConfigBuilder.java index 65d9765c..320797e0 100644 --- a/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/notify/CoreNotifyConfigBuilder.java +++ b/hippo4j-spring-boot/hippo4j-core-spring-boot-starter/src/main/java/cn/hippo4j/core/starter/notify/CoreNotifyConfigBuilder.java @@ -58,7 +58,7 @@ public class CoreNotifyConfigBuilder implements NotifyConfigBuilder { for (NotifyPlatformProperties platformProperties : notifyPlatforms) { NotifyConfigDTO notifyConfig = new NotifyConfigDTO(); notifyConfig.setPlatform(platformProperties.getPlatform()); - notifyConfig.setThreadPoolId(threadPoolId); + notifyConfig.setTpId(threadPoolId); notifyConfig.setType("ALARM"); notifyConfig.setSecretKey(platformProperties.getSecretKey()); int interval = Optional.ofNullable(executor.getNotify()) @@ -76,7 +76,7 @@ public class CoreNotifyConfigBuilder implements NotifyConfigBuilder { for (NotifyPlatformProperties platformProperties : notifyPlatforms) { NotifyConfigDTO notifyConfig = new NotifyConfigDTO(); notifyConfig.setPlatform(platformProperties.getPlatform()); - notifyConfig.setThreadPoolId(threadPoolId); + notifyConfig.setTpId(threadPoolId); notifyConfig.setType("CONFIG"); notifyConfig.setSecretKey(platformProperties.getSecretKey()); notifyConfig.setReceives(buildReceive(executor, platformProperties)); @@ -87,7 +87,7 @@ public class CoreNotifyConfigBuilder implements NotifyConfigBuilder { resultMap.forEach( (key, val) -> val.stream() .filter(each -> StrUtil.equals("ALARM", each.getType())) - .forEach(each -> alarmControlHandler.initCacheAndLock(each.getThreadPoolId(), each.getPlatform(), each.getInterval())) + .forEach(each -> alarmControlHandler.initCacheAndLock(each.getTpId(), each.getPlatform(), each.getInterval())) ); return resultMap; diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/notify/ServerNotifyConfigBuilder.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/notify/ServerNotifyConfigBuilder.java index c357933f..aa89727d 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/notify/ServerNotifyConfigBuilder.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/notify/ServerNotifyConfigBuilder.java @@ -68,7 +68,7 @@ public class ServerNotifyConfigBuilder implements NotifyConfigBuilder { resultMap.forEach((key, val) -> val.stream().filter(each -> StrUtil.equals("ALARM", each.getType())) - .forEach(each -> alarmControlHandler.initCacheAndLock(each.getThreadPoolId(), each.getPlatform(), each.getInterval())) + .forEach(each -> alarmControlHandler.initCacheAndLock(each.getTpId(), each.getPlatform(), each.getInterval())) ); }