From c62f6a33c2c7066ad0c0bd9b405dc8308a18ff5f Mon Sep 17 00:00:00 2001 From: SamLee <1142245564@qq.com> Date: Sat, 2 Apr 2022 00:16:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BA=E8=B4=A3=E4=BB=BB=E9=93=BE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=9B=E5=9E=8B=EF=BC=8C=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=BC=BA=E5=88=B6=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/api/impl/action/AfterParamCheckAction.java | 6 +++--- .../austin/service/api/impl/action/AssembleAction.java | 6 +++--- .../austin/service/api/impl/action/PreParamCheckAction.java | 6 +++--- .../java3y/austin/service/api/impl/action/SendMqAction.java | 6 +++--- .../com/java3y/austin/support/pipeline/BusinessProcess.java | 4 ++-- .../com/java3y/austin/support/pipeline/ProcessContext.java | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AfterParamCheckAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AfterParamCheckAction.java index 87b70a0..39216ba 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AfterParamCheckAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AfterParamCheckAction.java @@ -25,14 +25,14 @@ import java.util.stream.Collectors; * 后置参数检查 */ @Slf4j -public class AfterParamCheckAction implements BusinessProcess { +public class AfterParamCheckAction implements BusinessProcess { public static final String PHONE_REGEX_EXP = "^((13[0-9])|(14[5,7,9])|(15[0-3,5-9])|(166)|(17[0-9])|(18[0-9])|(19[1,8,9]))\\d{8}$"; @Override - public void process(ProcessContext context) { - SendTaskModel sendTaskModel = (SendTaskModel) context.getProcessModel(); + public void process(ProcessContext context) { + SendTaskModel sendTaskModel = context.getProcessModel(); List taskInfo = sendTaskModel.getTaskInfo(); // 1. 过滤掉不合法的手机号 diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java index 403b07c..7114bc4 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java @@ -31,14 +31,14 @@ import java.util.*; * @description 拼装参数 */ @Slf4j -public class AssembleAction implements BusinessProcess { +public class AssembleAction implements BusinessProcess { @Autowired private MessageTemplateDao messageTemplateDao; @Override - public void process(ProcessContext context) { - SendTaskModel sendTaskModel = (SendTaskModel) context.getProcessModel(); + public void process(ProcessContext context) { + SendTaskModel sendTaskModel = context.getProcessModel(); Long messageTemplateId = sendTaskModel.getMessageTemplateId(); try { diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java index 7f64689..794e1d9 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java @@ -19,11 +19,11 @@ import java.util.stream.Collectors; * @description 前置参数校验 */ @Slf4j -public class PreParamCheckAction implements BusinessProcess { +public class PreParamCheckAction implements BusinessProcess { @Override - public void process(ProcessContext context) { - SendTaskModel sendTaskModel = (SendTaskModel) context.getProcessModel(); + public void process(ProcessContext context) { + SendTaskModel sendTaskModel = context.getProcessModel(); Long messageTemplateId = sendTaskModel.getMessageTemplateId(); List messageParamList = sendTaskModel.getMessageParamList(); diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/SendMqAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/SendMqAction.java index e441e03..8bb27df 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/SendMqAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/SendMqAction.java @@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Value; * 将消息发送到MQ */ @Slf4j -public class SendMqAction implements BusinessProcess { +public class SendMqAction implements BusinessProcess { @Autowired private KafkaUtils kafkaUtils; @@ -28,8 +28,8 @@ public class SendMqAction implements BusinessProcess { private String topicName; @Override - public void process(ProcessContext context) { - SendTaskModel sendTaskModel = (SendTaskModel) context.getProcessModel(); + public void process(ProcessContext context) { + SendTaskModel sendTaskModel = context.getProcessModel(); String message = JSON.toJSONString(sendTaskModel.getTaskInfo(), new SerializerFeature[]{SerializerFeature.WriteClassName}); try { diff --git a/austin-support/src/main/java/com/java3y/austin/support/pipeline/BusinessProcess.java b/austin-support/src/main/java/com/java3y/austin/support/pipeline/BusinessProcess.java index 19951be..06367c6 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/pipeline/BusinessProcess.java +++ b/austin-support/src/main/java/com/java3y/austin/support/pipeline/BusinessProcess.java @@ -5,11 +5,11 @@ package com.java3y.austin.support.pipeline; * * @author 3y */ -public interface BusinessProcess { +public interface BusinessProcess { /** * 真正处理逻辑 * @param context */ - void process(ProcessContext context); + void process(ProcessContext context); } diff --git a/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessContext.java b/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessContext.java index 6936dc6..4bafd7d 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessContext.java +++ b/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessContext.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; @NoArgsConstructor @Builder @Accessors(chain = true) -public class ProcessContext { +public class ProcessContext { /** * 标识责任链的code @@ -27,7 +27,7 @@ public class ProcessContext { /** * 存储责任链上下文数据的模型 */ - private ProcessModel processModel; + private T processModel; /** * 责任链中断的标识 From a0a60db33a67878b9997f310d2b4672340c987f9 Mon Sep 17 00:00:00 2001 From: You <573248398@qq.com> Date: Sun, 3 Apr 2022 15:59:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=EF=BC=8C=E5=88=A4=E6=96=AD=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deduplication/build/ContentDeduplicationBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java index c040f2a..11094a2 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java @@ -21,7 +21,7 @@ public class ContentDeduplicationBuilder extends AbstractDeduplicationBuilder im @Override public DeduplicationParam build(String deduplication, TaskInfo taskInfo) { DeduplicationParam deduplicationParam = getParamsFromConfig(deduplicationType, deduplication, taskInfo); - if (deduplication == null) { + if (deduplicationParam == null) { return null; } deduplicationParam.setAnchorState(AnchorState.CONTENT_DEDUPLICATION);