Merge branch 'master' into vip

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);

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<SendTaskModel> {
 
 
     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<SendTaskModel> context) {
+        SendTaskModel sendTaskModel = context.getProcessModel();
         List<TaskInfo> taskInfo = sendTaskModel.getTaskInfo();
 
         // 1. 过滤掉不合法的手机号

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<SendTaskModel> {
 
     @Autowired
     private MessageTemplateDao messageTemplateDao;
 
     @Override
-    public void process(ProcessContext context) {
-        SendTaskModel sendTaskModel = (SendTaskModel) context.getProcessModel();
+    public void process(ProcessContext<SendTaskModel> context) {
+        SendTaskModel sendTaskModel = context.getProcessModel();
         Long messageTemplateId = sendTaskModel.getMessageTemplateId();
 
         try {

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<SendTaskModel> {
 
     @Override
-    public void process(ProcessContext context) {
-        SendTaskModel sendTaskModel = (SendTaskModel) context.getProcessModel();
+    public void process(ProcessContext<SendTaskModel> context) {
+        SendTaskModel sendTaskModel = context.getProcessModel();
 
         Long messageTemplateId = sendTaskModel.getMessageTemplateId();
         List<MessageParam> messageParamList = sendTaskModel.getMessageParamList();

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<SendTaskModel> {
 
     @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<SendTaskModel> context) {
+        SendTaskModel sendTaskModel = context.getProcessModel();
         String message = JSON.toJSONString(sendTaskModel.getTaskInfo(), new SerializerFeature[]{SerializerFeature.WriteClassName});
 
         try {

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<T extends ProcessModel> {
 
     /**
      * 真正处理逻辑
      * @param context
      */
-    void process(ProcessContext context);
+    void process(ProcessContext<T> context);
 }

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<T extends ProcessModel> {
 
     /**
      * 标识责任链的code
@@ -27,7 +27,7 @@ public class ProcessContext {
     /**
      * 存储责任链上下文数据的模型
      */
-    private ProcessModel processModel;
+    private T processModel;
 
     /**
      * 责任链中断的标识