From d17c51d9c527a63e779bd0770a61b5e6db9816a2 Mon Sep 17 00:00:00 2001 From: 3y Date: Sun, 27 Mar 2022 16:55:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=BF=E9=87=8C=E6=8F=92=E4=BB=B6=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NightShieldLazyPendingHandler.java | 3 ++- .../austin/handler/shield/ShieldService.java | 4 ++++ .../shield/impl/ShieldServiceImpl.java | 7 ++++-- .../austin/web/controller/ThreadPoolTest.java | 24 ------------------- 4 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 austin-web/src/main/java/com/java3y/austin/web/controller/ThreadPoolTest.java diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/handler/NightShieldLazyPendingHandler.java b/austin-cron/src/main/java/com/java3y/austin/cron/handler/NightShieldLazyPendingHandler.java index a65ced1..c7452bb 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/handler/NightShieldLazyPendingHandler.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/handler/NightShieldLazyPendingHandler.java @@ -48,7 +48,8 @@ public class NightShieldLazyPendingHandler { String taskInfo = redisUtils.lPop(NIGHT_SHIELD_BUT_NEXT_DAY_SEND_KEY); if (StrUtil.isNotBlank(taskInfo)) { try { - kafkaUtils.send(topicName, JSON.toJSONString(Arrays.asList(JSON.parseObject(taskInfo, TaskInfo.class)), new SerializerFeature[]{SerializerFeature.WriteClassName})); + kafkaUtils.send(topicName, JSON.toJSONString(Arrays.asList(JSON.parseObject(taskInfo, TaskInfo.class)) + , new SerializerFeature[]{SerializerFeature.WriteClassName})); } catch (Exception e) { log.error("nightShieldLazyJob send kafka fail! e:{},params:{}", Throwables.getStackTraceAsString(e), taskInfo); } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/shield/ShieldService.java b/austin-handler/src/main/java/com/java3y/austin/handler/shield/ShieldService.java index f9f7b39..e0107b2 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/shield/ShieldService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/shield/ShieldService.java @@ -10,5 +10,9 @@ import com.java3y.austin.common.domain.TaskInfo; public interface ShieldService { + /** + * 屏蔽消息 + * @param taskInfo + */ void shield(TaskInfo taskInfo); } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java b/austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java index be5263a..475fd1b 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java @@ -20,6 +20,7 @@ import java.util.HashSet; /** * 屏蔽服务 + * @author 3y */ @Service @Slf4j @@ -40,10 +41,12 @@ public class ShieldServiceImpl implements ShieldService { */ if (isNight()) { if (ShieldType.NIGHT_SHIELD.getCode().equals(taskInfo.getShieldType())) { - logUtils.print(AnchorInfo.builder().state(AnchorState.NIGHT_SHIELD.getCode()).businessId(taskInfo.getBusinessId()).ids(taskInfo.getReceiver()).build()); + logUtils.print(AnchorInfo.builder().state(AnchorState.NIGHT_SHIELD.getCode()) + .businessId(taskInfo.getBusinessId()).ids(taskInfo.getReceiver()).build()); } if (ShieldType.NIGHT_SHIELD_BUT_NEXT_DAY_SEND.getCode().equals(taskInfo.getShieldType())) { - redisUtils.lPush(NIGHT_SHIELD_BUT_NEXT_DAY_SEND_KEY, JSON.toJSONString(taskInfo, new SerializerFeature[]{SerializerFeature.WriteClassName}), + redisUtils.lPush(NIGHT_SHIELD_BUT_NEXT_DAY_SEND_KEY, JSON.toJSONString(taskInfo, + new SerializerFeature[]{SerializerFeature.WriteClassName}), (DateUtil.offsetDay(new Date(), 1).getTime() / 1000) - DateUtil.currentSeconds()); logUtils.print(AnchorInfo.builder().state(AnchorState.NIGHT_SHIELD_NEXT_SEND.getCode()).businessId(taskInfo.getBusinessId()).ids(taskInfo.getReceiver()).build()); } diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/ThreadPoolTest.java b/austin-web/src/main/java/com/java3y/austin/web/controller/ThreadPoolTest.java deleted file mode 100644 index c302b59..0000000 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/ThreadPoolTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.java3y.austin.web.controller; - - -import com.dtp.core.DtpRegistry; -import com.dtp.core.thread.DtpExecutor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class ThreadPoolTest { - - - @GetMapping("/tp") - public void send() { - DtpExecutor dtpExecutor1 = DtpRegistry.getExecutor("austin-im.notice"); - DtpExecutor dtpExecutor2 = DtpRegistry.getExecutor("execute-xxl-thread-pool"); - DtpExecutor dtpExecutor3 = DtpRegistry.getExecutor("dynamic-tp-test-2"); - - System.out.println(dtpExecutor1); - System.out.println(dtpExecutor2); - System.out.println(dtpExecutor3); - - } -}