1. 定时任务 处理 读取 csv文件开发

2. 调整 项目包名

README.md

@@ -68,9 +68,9 @@ austin项目**核心流程**：`austin-api`接收到发送消息请求，直接
 
 **8**、由于使用了Apollo且我是在云服务器上安装的，我这边会直接跳过`metaserver`服务发现，在`AustinApplication`需要配置对应的apollo地址
 
-**9**、目前短信和邮件账号的信息都配置在**apollo**，配置的示例参照`com.java3y.austin.utils.AccountUtils#getAccount`中的注释
+**9**、目前短信和邮件账号的信息都配置在**apollo**，配置的示例参照`com.java3y.austin.support.utils#getAccount`中的注释
 
-**10**、调用http接口`com.java3y.austin.controller.SendController#send`给自己发一条短信或者邮件感受
+**10**、调用http接口`com.java3y.austin.web.controller#send`给自己发一条短信或者邮件感受
 
 ```shell
 

austin-common/src/main/java/com/java3y/austin/common/constant/AustinConstant.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.constant;
+package com.java3y.austin.common.constant;
 
 
 /**

austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.common.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

austin-common/src/main/java/com/java3y/austin/common/domain/LogParam.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.common.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

austin-common/src/main/java/com/java3y/austin/common/domain/TaskInfo.java

@@ -1,6 +1,6 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.common.domain;
 
-import com.java3y.austin.dto.ContentModel;
+import com.java3y.austin.common.dto.ContentModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

austin-common/src/main/java/com/java3y/austin/common/dto/ContentModel.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.dto;
+package com.java3y.austin.common.dto;
 
 /**
  * 发送内容的模型

austin-common/src/main/java/com/java3y/austin/common/dto/EmailContentModel.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.dto;
+package com.java3y.austin.common.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

austin-common/src/main/java/com/java3y/austin/common/dto/ImContentModel.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.dto;
+package com.java3y.austin.common.dto;
 
 /**
  * @author 3y

austin-common/src/main/java/com/java3y/austin/common/dto/MiniProgramContentModel.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.dto;
+package com.java3y.austin.common.dto;
 
 /**
  * @author 3y

austin-common/src/main/java/com/java3y/austin/common/dto/OfficialAccountsContentModel.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.dto;
+package com.java3y.austin.common.dto;
 
 /**
  * @author 3y

austin-common/src/main/java/com/java3y/austin/common/dto/PushContentModel.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.dto;
+package com.java3y.austin.common.dto;
 
 
 /**

austin-common/src/main/java/com/java3y/austin/common/dto/SmsContentModel.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.dto;
+package com.java3y.austin.common.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.common.enums;
 
 
 import lombok.AllArgsConstructor;

austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.common.enums;
 
 
 import lombok.AllArgsConstructor;

austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java

@@ -1,7 +1,7 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.common.enums;
 
 
-import com.java3y.austin.dto.*;
+import com.java3y.austin.common.dto.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;

austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.common.enums;
 
 
 import lombok.AllArgsConstructor;

austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

austin-common/src/main/java/com/java3y/austin/common/enums/RespStatusEnum.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

austin-common/src/main/java/com/java3y/austin/common/vo/BasicResultVO.java

@@ -1,6 +1,6 @@
-package com.java3y.austin.vo;
+package com.java3y.austin.common.vo;
 
-import com.java3y.austin.enums.RespStatusEnum;
+import com.java3y.austin.common.enums.RespStatusEnum;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

austin-cron/src/main/java/com/java3y/austin/cron/domain/CrowdInfoVo.java

@@ -0,0 +1,33 @@
+package com.java3y.austin.cron.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * 每一行csv的记录
+ * @author 3y
+ * @date 2022/2/9
+ */
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class CrowdInfoVo implements Serializable {
+
+    /**
+     * 接收者id
+     */
+    private String id;
+
+    /**
+     * 参数信息
+     */
+    private Map<String, String> params;
+}

austin-cron/src/main/java/com/java3y/austin/cron/handler/CronTaskHandler.java

@@ -1,10 +1,10 @@
-package com.java3y.austin.handler;
+package com.java3y.austin.cron.handler;
 
-import com.alibaba.fastjson.JSON;
-import com.java3y.austin.domain.MessageTemplate;
+import com.java3y.austin.cron.service.TaskHandler;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
@@ -16,13 +16,19 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class CronTaskHandler {
 
+    @Autowired
+    private TaskHandler taskHandler;
+
     /**
      * 处理所有的 austin 定时任务消息
      */
     @XxlJob("austinJob")
     public void execute() {
         log.info("XXL-JOB, Hello World.");
-        MessageTemplate messageTemplate = JSON.parseObject(XxlJobHelper.getJobParam(), MessageTemplate.class);
+        Long messageTemplateId = Long.valueOf(XxlJobHelper.getJobParam());
+
+        taskHandler.handle(messageTemplateId);
+
     }
 
 }

austin-cron/src/main/java/com/java3y/austin/cron/service/TaskHandler.java

@@ -0,0 +1,17 @@
+package com.java3y.austin.cron.service;
+
+/**
+ * @author 3y
+ * @date 2022/2/9
+ * 具体处理定时任务逻辑的Handler
+ */
+public interface TaskHandler {
+
+    /**
+     * 处理具体的逻辑
+     *
+     * @param messageTemplateId
+     */
+    void handle(Long messageTemplateId);
+
+}

austin-cron/src/main/java/com/java3y/austin/cron/service/impl/TaskHandlerImpl.java

@@ -0,0 +1,46 @@
+package com.java3y.austin.cron.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.java3y.austin.cron.domain.CrowdInfoVo;
+import com.java3y.austin.cron.service.TaskHandler;
+import com.java3y.austin.cron.utils.ReadFileUtils;
+import com.java3y.austin.support.dao.MessageTemplateDao;
+import com.java3y.austin.support.domain.MessageTemplate;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author 3y
+ * @date 2022/2/9
+ */
+@Service
+@Slf4j
+public class TaskHandlerImpl implements TaskHandler {
+    @Autowired
+    private MessageTemplateDao messageTemplateDao;
+
+
+    @Override
+    @Async
+    public void handle(Long messageTemplateId) {
+        MessageTemplate messageTemplate = messageTemplateDao.findById(messageTemplateId).get();
+        if (messageTemplate == null || StrUtil.isBlank(messageTemplate.getCronCrowdPath())) {
+            log.error("TaskHandler#handle crowdPath empty!");
+            return;
+        }
+        List<CrowdInfoVo> csvRowList = ReadFileUtils.getCsvRowList(messageTemplate.getCronCrowdPath());
+
+        if (CollUtil.isNotEmpty(csvRowList)) {
+
+        }
+
+        log.info("csv info:", JSON.toJSONString(csvRowList));
+    }
+
+}

austin-cron/src/main/java/com/java3y/austin/cron/utils/ReadFileUtils.java

@@ -0,0 +1,57 @@
+package com.java3y.austin.cron.utils;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.text.csv.CsvData;
+import cn.hutool.core.text.csv.CsvRow;
+import cn.hutool.core.text.csv.CsvUtil;
+import com.google.common.base.Throwables;
+import com.java3y.austin.cron.domain.CrowdInfoVo;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 读取人群文件 工具类
+ *
+ * @author 3y
+ * @date 2022/2/9
+ */
+@Slf4j
+public class ReadFileUtils {
+
+    /**
+     * 读取csv文件
+     * 1. 获取第一行信息(id,paramsKey1,params2Key2)，第一列默认为接收者Id
+     * 2. 把文件信息塞进对象内
+     * 3. 把对象返回
+     *
+     * @param path
+     * @return
+     */
+    public static List<CrowdInfoVo> getCsvRowList(String path) {
+        List<CrowdInfoVo> result = new ArrayList<>();
+        try {
+            CsvData data = CsvUtil.getReader().read(FileUtil.file(path));
+            if (data == null || data.getRow(0) == null || data.getRow(1) == null) {
+                log.error("read csv file empty!,path:{}", path);
+            }
+            // 第一行为默认为头信息,所以遍历从第二行开始,第一列默认为接收者Id(不处理)
+            CsvRow headerInfo = data.getRow(0);
+            for (int i = 1; i < data.getRowCount(); i++) {
+                CsvRow row = data.getRow(i);
+                Map<String, String> param = MapUtil.newHashMap();
+                for (int j = 1; j < headerInfo.size(); j++) {
+                    param.put(headerInfo.get(j), row.get(j));
+                }
+                result.add(CrowdInfoVo.builder().id(row.get(0)).params(param).build());
+            }
+
+        } catch (Exception e) {
+            log.error("TaskHandler#getCsvRowList fail!{}", Throwables.getStackTraceAsString(e));
+        }
+        return result;
+    }
+}

austin-cron/src/main/java/com/java3y/austin/cron/xxl/config/XxlJobConfig.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.config;
+package com.java3y.austin.cron.xxl.config;
 
 import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
 import lombok.extern.slf4j.Slf4j;
@@ -6,6 +6,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+/**
+ * @author 3y
+ * 配置类
+ */
 @Slf4j
 @Configuration
 public class XxlJobConfig {

austin-cron/src/main/java/com/java3y/austin/cron/xxl/constants/XxlJobConstant.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.constants;
+package com.java3y.austin.cron.xxl.constants;
 
 
 /**

austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobGroup.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.entity;
+package com.java3y.austin.cron.xxl.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobInfo.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.entity;
+package com.java3y.austin.cron.xxl.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorBlockStrategyEnum.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.cron.xxl.enums;
 
 /**
  * 执行阻塞队列

austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorRouteStrategyEnum.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.cron.xxl.enums;
 
 
 /**

austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/GlueTypeEnum.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.cron.xxl.enums;
 
 /**
  * GlueTyp 类型（默认BEAN)

austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/MisfireStrategyEnum.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.cron.xxl.enums;
 
 /**
  * 调度过期策略

austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ScheduleTypeEnum.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.cron.xxl.enums;
 
 /**
  * 调度类型

austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/CronTaskService.java

@@ -1,17 +1,19 @@
-package com.java3y.austin.service;
+package com.java3y.austin.cron.xxl.service;
 
-import com.java3y.austin.entity.XxlJobGroup;
-import com.java3y.austin.entity.XxlJobInfo;
-import com.java3y.austin.vo.BasicResultVO;
+import com.java3y.austin.cron.xxl.entity.XxlJobGroup;
+import com.java3y.austin.cron.xxl.entity.XxlJobInfo;
+import com.java3y.austin.common.vo.BasicResultVO;
 
 /**
  * 定时任务服务
+ * @author 3y
  */
 public interface CronTaskService {
 
 
     /**
      * 新增/修改 定时任务
+     * @param xxlJobInfo
      *
      * @return 新增时返回任务Id，修改时无返回
      */
@@ -21,6 +23,7 @@ public interface CronTaskService {
      * 删除定时任务
      *
      * @param taskId
+     * @return BasicResultVO
      */
     BasicResultVO deleteCronTask(Integer taskId);
 
@@ -28,6 +31,7 @@ public interface CronTaskService {
      * 启动定时任务
      *
      * @param taskId
+     * @return BasicResultVO
      */
     BasicResultVO startCronTask(Integer taskId);
 
@@ -36,19 +40,23 @@ public interface CronTaskService {
      * 暂停定时任务
      *
      * @param taskId
+     * @return BasicResultVO
      */
     BasicResultVO stopCronTask(Integer taskId);
 
 
     /**
      * 得到执行器Id
-     *
-     * @return
+     * @param appName
+     * @param title
+     * @return BasicResultVO
      */
     BasicResultVO getGroupId(String appName, String title);
 
     /**
      * 创建执行器
+     * @param xxlJobGroup
+     * @return BasicResultVO
      */
     BasicResultVO createGroup(XxlJobGroup xxlJobGroup);
 

austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.service.impl;
+package com.java3y.austin.cron.xxl.service.impl;
 
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.IdUtil;
@@ -6,12 +6,12 @@ import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSON;
 import com.google.common.base.Throwables;
-import com.java3y.austin.constants.XxlJobConstant;
-import com.java3y.austin.entity.XxlJobGroup;
-import com.java3y.austin.entity.XxlJobInfo;
-import com.java3y.austin.enums.RespStatusEnum;
-import com.java3y.austin.service.CronTaskService;
-import com.java3y.austin.vo.BasicResultVO;
+import com.java3y.austin.cron.xxl.constants.XxlJobConstant;
+import com.java3y.austin.cron.xxl.entity.XxlJobGroup;
+import com.java3y.austin.cron.xxl.entity.XxlJobInfo;
+import com.java3y.austin.common.enums.RespStatusEnum;
+import com.java3y.austin.cron.xxl.service.CronTaskService;
+import com.java3y.austin.common.vo.BasicResultVO;
 import com.xxl.job.core.biz.model.ReturnT;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;

austin-cron/src/main/java/com/java3y/austin/cron/xxl/utils/XxlJobUtils.java

@@ -1,16 +1,16 @@
-package com.java3y.austin.utils;
+package com.java3y.austin.cron.xxl.utils;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.java3y.austin.constant.AustinConstant;
-import com.java3y.austin.constants.XxlJobConstant;
-import com.java3y.austin.domain.MessageTemplate;
-import com.java3y.austin.entity.XxlJobGroup;
-import com.java3y.austin.entity.XxlJobInfo;
-import com.java3y.austin.enums.*;
-import com.java3y.austin.service.CronTaskService;
-import com.java3y.austin.vo.BasicResultVO;
+import com.java3y.austin.common.constant.AustinConstant;
+import com.java3y.austin.common.enums.RespStatusEnum;
+import com.java3y.austin.common.vo.BasicResultVO;
+import com.java3y.austin.cron.xxl.constants.XxlJobConstant;
+import com.java3y.austin.cron.xxl.entity.XxlJobGroup;
+import com.java3y.austin.cron.xxl.entity.XxlJobInfo;
+import com.java3y.austin.cron.xxl.enums.*;
+import com.java3y.austin.cron.xxl.service.CronTaskService;
+import com.java3y.austin.support.domain.MessageTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -56,7 +56,7 @@ public class XxlJobUtils {
                 .misfireStrategy(MisfireStrategyEnum.DO_NOTHING.name())
                 .executorRouteStrategy(ExecutorRouteStrategyEnum.CONSISTENT_HASH.name())
                 .executorHandler(XxlJobConstant.JOB_HANDLER_NAME)
-                .executorParam(JSON.toJSONString(messageTemplate))
+                .executorParam(String.valueOf(messageTemplate.getId()))
                 .executorBlockStrategy(ExecutorBlockStrategyEnum.SERIAL_EXECUTION.name())
                 .executorTimeout(XxlJobConstant.TIME_OUT)
                 .executorFailRetryCount(XxlJobConstant.RETRY_COUNT)

austin-handler/src/main/java/com/java3y/austin/handler/config/PrototypeBeanConfig.java

@@ -1,7 +1,7 @@
-package com.java3y.austin.config;
+package com.java3y.austin.handler.config;
 
-import com.java3y.austin.pending.Task;
-import com.java3y.austin.receiver.Receiver;
+import com.java3y.austin.handler.pending.Task;
+import com.java3y.austin.handler.receiver.Receiver;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

austin-handler/src/main/java/com/java3y/austin/handler/config/ThreadPoolConfig.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.config;
+package com.java3y.austin.handler.config;
 
 import cn.hutool.core.thread.ExecutorBuilder;
 

austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationHolder.java

@@ -1,7 +1,7 @@
-package com.java3y.austin.service.deduplication;
+package com.java3y.austin.handler.deduplication;
 
-import com.java3y.austin.service.deduplication.build.Builder;
-import com.java3y.austin.service.deduplication.service.DeduplicationService;
+import com.java3y.austin.handler.deduplication.build.Builder;
+import com.java3y.austin.handler.deduplication.service.DeduplicationService;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;

austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java

@@ -1,11 +1,11 @@
-package com.java3y.austin.service.deduplication;
+package com.java3y.austin.handler.deduplication;
 
 import com.ctrip.framework.apollo.Config;
 import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
-import com.java3y.austin.constant.AustinConstant;
-import com.java3y.austin.domain.DeduplicationParam;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.enums.DeduplicationType;
+import com.java3y.austin.common.constant.AustinConstant;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.enums.DeduplicationType;
+import com.java3y.austin.handler.domain.DeduplicationParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/AbstractDeduplicationBuilder.java

@@ -1,9 +1,9 @@
-package com.java3y.austin.service.deduplication.build;
+package com.java3y.austin.handler.deduplication.build;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java3y.austin.domain.DeduplicationParam;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.service.deduplication.DeduplicationHolder;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.handler.deduplication.DeduplicationHolder;
+import com.java3y.austin.handler.domain.DeduplicationParam;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.PostConstruct;

austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/Builder.java

@@ -1,7 +1,7 @@
-package com.java3y.austin.service.deduplication.build;
+package com.java3y.austin.handler.deduplication.build;
 
-import com.java3y.austin.domain.DeduplicationParam;
-import com.java3y.austin.domain.TaskInfo;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.handler.domain.DeduplicationParam;
 
 /**
  * @author luohaojie

austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java

@@ -1,9 +1,9 @@
-package com.java3y.austin.service.deduplication.build;
+package com.java3y.austin.handler.deduplication.build;
 
-import com.java3y.austin.domain.DeduplicationParam;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.enums.AnchorState;
-import com.java3y.austin.enums.DeduplicationType;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.enums.AnchorState;
+import com.java3y.austin.common.enums.DeduplicationType;
+import com.java3y.austin.handler.domain.DeduplicationParam;
 import org.springframework.stereotype.Service;
 
 

austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/FrequencyDeduplicationBuilder.java

@@ -1,10 +1,10 @@
-package com.java3y.austin.service.deduplication.build;
+package com.java3y.austin.handler.deduplication.build;
 
 import cn.hutool.core.date.DateUtil;
-import com.java3y.austin.domain.DeduplicationParam;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.enums.AnchorState;
-import com.java3y.austin.enums.DeduplicationType;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.enums.AnchorState;
+import com.java3y.austin.common.enums.DeduplicationType;
+import com.java3y.austin.handler.domain.DeduplicationParam;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/AbstractDeduplicationService.java

@@ -1,13 +1,13 @@
-package com.java3y.austin.service.deduplication.service;
+package com.java3y.austin.handler.deduplication.service;
 
 import cn.hutool.core.collection.CollUtil;
-import com.java3y.austin.constant.AustinConstant;
-import com.java3y.austin.domain.AnchorInfo;
-import com.java3y.austin.domain.DeduplicationParam;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.service.deduplication.DeduplicationHolder;
-import com.java3y.austin.utils.LogUtils;
-import com.java3y.austin.utils.RedisUtils;
+import com.java3y.austin.common.constant.AustinConstant;
+import com.java3y.austin.common.domain.AnchorInfo;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.handler.deduplication.DeduplicationHolder;
+import com.java3y.austin.handler.domain.DeduplicationParam;
+import com.java3y.austin.support.utils.LogUtils;
+import com.java3y.austin.support.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 

austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/ContentDeduplicationService.java

@@ -1,9 +1,9 @@
-package com.java3y.austin.service.deduplication.service;
+package com.java3y.austin.handler.deduplication.service;
 
 import cn.hutool.crypto.digest.DigestUtil;
 import com.alibaba.fastjson.JSON;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.enums.DeduplicationType;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.enums.DeduplicationType;
 import org.springframework.stereotype.Service;
 
 /**

austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/DeduplicationService.java

@@ -1,6 +1,7 @@
-package com.java3y.austin.service.deduplication.service;
+package com.java3y.austin.handler.deduplication.service;
 
-import com.java3y.austin.domain.DeduplicationParam;
+
+import com.java3y.austin.handler.domain.DeduplicationParam;
 
 /**
  * @author huskey

austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/FrequencyDeduplicationService.java

@@ -1,8 +1,8 @@
-package com.java3y.austin.service.deduplication.service;
+package com.java3y.austin.handler.deduplication.service;
 
 import cn.hutool.core.util.StrUtil;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.enums.DeduplicationType;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.enums.DeduplicationType;
 import org.springframework.stereotype.Service;
 
 /**

austin-handler/src/main/java/com/java3y/austin/handler/discard/DiscardMessageService.java

@@ -1,14 +1,14 @@
-package com.java3y.austin.service.discard;
+package com.java3y.austin.handler.discard;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.ctrip.framework.apollo.Config;
 import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
-import com.java3y.austin.constant.AustinConstant;
-import com.java3y.austin.domain.AnchorInfo;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.enums.AnchorState;
-import com.java3y.austin.utils.LogUtils;
+import com.java3y.austin.common.constant.AustinConstant;
+import com.java3y.austin.common.domain.AnchorInfo;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.enums.AnchorState;
+import com.java3y.austin.support.utils.LogUtils;
 import org.springframework.stereotype.Service;
 
 /**

austin-handler/src/main/java/com/java3y/austin/handler/domain/DeduplicationParam.java

@@ -1,7 +1,8 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.handler.domain;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.java3y.austin.enums.AnchorState;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.enums.AnchorState;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

austin-handler/src/main/java/com/java3y/austin/handler/domain/SmsParam.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.handler.domain;
 
 import lombok.Builder;
 import lombok.Data;

austin-handler/src/main/java/com/java3y/austin/handler/domain/TencentSmsParam.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.handler.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

austin-handler/src/main/java/com/java3y/austin/handler/handler/BaseHandler.java

@@ -1,9 +1,9 @@
-package com.java3y.austin.handler;
+package com.java3y.austin.handler.handler;
 
-import com.java3y.austin.domain.AnchorInfo;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.enums.AnchorState;
-import com.java3y.austin.utils.LogUtils;
+import com.java3y.austin.common.domain.AnchorInfo;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.enums.AnchorState;
+import com.java3y.austin.support.utils.LogUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.PostConstruct;

austin-handler/src/main/java/com/java3y/austin/handler/handler/EmailHandler.java

@@ -1,14 +1,13 @@
-package com.java3y.austin.handler;
+package com.java3y.austin.handler.handler;
 
 
 import cn.hutool.extra.mail.MailAccount;
 import cn.hutool.extra.mail.MailUtil;
-
 import com.google.common.base.Throwables;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.dto.EmailContentModel;
-import com.java3y.austin.enums.ChannelType;
-import com.java3y.austin.utils.AccountUtils;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.dto.EmailContentModel;
+import com.java3y.austin.common.enums.ChannelType;
+import com.java3y.austin.support.utils.AccountUtils;
 import com.sun.mail.util.MailSSLSocketFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

austin-handler/src/main/java/com/java3y/austin/handler/handler/Handler.java

@@ -1,6 +1,6 @@
-package com.java3y.austin.handler;
+package com.java3y.austin.handler.handler;
 
-import com.java3y.austin.domain.TaskInfo;
+import com.java3y.austin.common.domain.TaskInfo;
 
 /**
  * @author 3y

austin-handler/src/main/java/com/java3y/austin/handler/handler/HandlerHolder.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.handler;
+package com.java3y.austin.handler.handler;
 
 
 import org.springframework.stereotype.Component;

austin-handler/src/main/java/com/java3y/austin/handler/handler/SmsHandler.java

@@ -1,16 +1,16 @@
-package com.java3y.austin.handler;
+package com.java3y.austin.handler.handler;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.google.common.base.Throwables;
-import com.java3y.austin.dao.SmsRecordDao;
-import com.java3y.austin.domain.SmsParam;
-import com.java3y.austin.domain.SmsRecord;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.dto.SmsContentModel;
-import com.java3y.austin.enums.ChannelType;
-import com.java3y.austin.script.SmsScript;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.dto.SmsContentModel;
+import com.java3y.austin.common.enums.ChannelType;
+import com.java3y.austin.handler.domain.SmsParam;
+import com.java3y.austin.handler.script.SmsScript;
+import com.java3y.austin.support.dao.SmsRecordDao;
+import com.java3y.austin.support.domain.SmsRecord;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -24,7 +24,7 @@ import java.util.List;
  */
 @Component
 @Slf4j
-public class SmsHandler extends BaseHandler implements Handler  {
+public class SmsHandler extends BaseHandler implements Handler {
 
     public SmsHandler() {
         channelCode = ChannelType.SMS.getCode();

austin-handler/src/main/java/com/java3y/austin/handler/pending/Task.java

@@ -1,11 +1,11 @@
-package com.java3y.austin.pending;
+package com.java3y.austin.handler.pending;
 
 
 import cn.hutool.core.collection.CollUtil;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.handler.HandlerHolder;
-import com.java3y.austin.service.deduplication.DeduplicationRuleService;
-import com.java3y.austin.service.discard.DiscardMessageService;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.handler.deduplication.DeduplicationRuleService;
+import com.java3y.austin.handler.discard.DiscardMessageService;
+import com.java3y.austin.handler.handler.HandlerHolder;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;

austin-handler/src/main/java/com/java3y/austin/handler/pending/TaskPendingHolder.java

@@ -1,7 +1,7 @@
-package com.java3y.austin.pending;
+package com.java3y.austin.handler.pending;
 
-import com.java3y.austin.config.ThreadPoolConfig;
-import com.java3y.austin.utils.GroupIdMappingUtils;
+import com.java3y.austin.handler.config.ThreadPoolConfig;
+import com.java3y.austin.handler.utils.GroupIdMappingUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;

austin-handler/src/main/java/com/java3y/austin/handler/receiver/Receiver.java

@@ -1,14 +1,14 @@
-package com.java3y.austin.receiver;
+package com.java3y.austin.handler.receiver;
 
 import com.alibaba.fastjson.JSON;
-import com.java3y.austin.domain.AnchorInfo;
-import com.java3y.austin.domain.LogParam;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.enums.AnchorState;
-import com.java3y.austin.pending.Task;
-import com.java3y.austin.pending.TaskPendingHolder;
-import com.java3y.austin.utils.GroupIdMappingUtils;
-import com.java3y.austin.utils.LogUtils;
+import com.java3y.austin.common.domain.AnchorInfo;
+import com.java3y.austin.common.domain.LogParam;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.enums.AnchorState;
+import com.java3y.austin.handler.pending.Task;
+import com.java3y.austin.handler.pending.TaskPendingHolder;
+import com.java3y.austin.handler.utils.GroupIdMappingUtils;
+import com.java3y.austin.support.utils.LogUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.beans.factory.annotation.Autowired;

austin-handler/src/main/java/com/java3y/austin/handler/receiver/ReceiverStart.java

@@ -1,6 +1,6 @@
-package com.java3y.austin.receiver;
+package com.java3y.austin.handler.receiver;
 
-import com.java3y.austin.utils.GroupIdMappingUtils;
+import com.java3y.austin.handler.utils.GroupIdMappingUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;

austin-handler/src/main/java/com/java3y/austin/handler/script/SmsScript.java

@@ -1,10 +1,12 @@
-package com.java3y.austin.script;
+package com.java3y.austin.handler.script;
 
-import com.java3y.austin.domain.SmsParam;
-import com.java3y.austin.domain.SmsRecord;
+
+import com.java3y.austin.handler.domain.SmsParam;
+import com.java3y.austin.support.domain.SmsRecord;
 
 import java.util.List;
 
+
 /**
  * 短信脚本 接口
  * @author 3y

austin-handler/src/main/java/com/java3y/austin/handler/script/TencentSmsScript.java

@@ -1,14 +1,14 @@
-package com.java3y.austin.script;
+package com.java3y.austin.handler.script;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.IdUtil;
-import com.java3y.austin.constant.AustinConstant;
-import com.java3y.austin.domain.SmsParam;
-import com.java3y.austin.domain.SmsRecord;
-import com.java3y.austin.domain.TencentSmsParam;
-import com.java3y.austin.enums.SmsStatus;
-import com.java3y.austin.utils.AccountUtils;
+import com.java3y.austin.common.constant.AustinConstant;
+import com.java3y.austin.common.enums.SmsStatus;
+import com.java3y.austin.handler.domain.SmsParam;
+import com.java3y.austin.handler.domain.TencentSmsParam;
+import com.java3y.austin.support.domain.SmsRecord;
+import com.java3y.austin.support.utils.AccountUtils;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.profile.ClientProfile;
 import com.tencentcloudapi.common.profile.HttpProfile;

austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java

@@ -1,9 +1,9 @@
-package com.java3y.austin.utils;
+package com.java3y.austin.handler.utils;
 
 
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.enums.ChannelType;
-import com.java3y.austin.enums.MessageType;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.enums.ChannelType;
+import com.java3y.austin.common.enums.MessageType;
 
 import java.util.ArrayList;
 import java.util.List;

austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AfterParamCheckAction.java

@@ -1,17 +1,17 @@
-package com.java3y.austin.action;
+package com.java3y.austin.service.api.impl.action;
 
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReUtil;
 import com.alibaba.fastjson.JSON;
-import com.java3y.austin.domain.SendTaskModel;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.enums.ChannelType;
-import com.java3y.austin.enums.IdType;
-import com.java3y.austin.enums.RespStatusEnum;
-import com.java3y.austin.pipeline.BusinessProcess;
-import com.java3y.austin.pipeline.ProcessContext;
-import com.java3y.austin.vo.BasicResultVO;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.enums.ChannelType;
+import com.java3y.austin.common.enums.IdType;
+import com.java3y.austin.common.enums.RespStatusEnum;
+import com.java3y.austin.common.vo.BasicResultVO;
+import com.java3y.austin.service.api.impl.domain.SendTaskModel;
+import com.java3y.austin.support.pipeline.BusinessProcess;
+import com.java3y.austin.support.pipeline.ProcessContext;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Iterator;

austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java

@@ -1,24 +1,24 @@
-package com.java3y.austin.action;
+package com.java3y.austin.service.api.impl.action;
 
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Throwables;
-import com.java3y.austin.constant.AustinConstant;
-import com.java3y.austin.dao.MessageTemplateDao;
-import com.java3y.austin.domain.MessageParam;
-import com.java3y.austin.domain.MessageTemplate;
-import com.java3y.austin.domain.SendTaskModel;
-import com.java3y.austin.domain.TaskInfo;
-import com.java3y.austin.dto.ContentModel;
-import com.java3y.austin.enums.ChannelType;
-import com.java3y.austin.enums.RespStatusEnum;
-import com.java3y.austin.pipeline.BusinessProcess;
-import com.java3y.austin.pipeline.ProcessContext;
-import com.java3y.austin.utils.ContentHolderUtil;
-import com.java3y.austin.utils.TaskInfoUtils;
-import com.java3y.austin.vo.BasicResultVO;
+import com.java3y.austin.common.constant.AustinConstant;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.common.dto.ContentModel;
+import com.java3y.austin.common.enums.ChannelType;
+import com.java3y.austin.common.enums.RespStatusEnum;
+import com.java3y.austin.common.vo.BasicResultVO;
+import com.java3y.austin.service.api.domain.MessageParam;
+import com.java3y.austin.service.api.impl.domain.SendTaskModel;
+import com.java3y.austin.support.dao.MessageTemplateDao;
+import com.java3y.austin.support.domain.MessageTemplate;
+import com.java3y.austin.support.pipeline.BusinessProcess;
+import com.java3y.austin.support.pipeline.ProcessContext;
+import com.java3y.austin.support.utils.ContentHolderUtil;
+import com.java3y.austin.support.utils.TaskInfoUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 

austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java

@@ -1,13 +1,13 @@
-package com.java3y.austin.action;
+package com.java3y.austin.service.api.impl.action;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.java3y.austin.domain.MessageParam;
-import com.java3y.austin.domain.SendTaskModel;
-import com.java3y.austin.enums.RespStatusEnum;
-import com.java3y.austin.pipeline.BusinessProcess;
-import com.java3y.austin.pipeline.ProcessContext;
-import com.java3y.austin.vo.BasicResultVO;
+import com.java3y.austin.common.enums.RespStatusEnum;
+import com.java3y.austin.common.vo.BasicResultVO;
+import com.java3y.austin.service.api.domain.MessageParam;
+import com.java3y.austin.service.api.impl.domain.SendTaskModel;
+import com.java3y.austin.support.pipeline.BusinessProcess;
+import com.java3y.austin.support.pipeline.ProcessContext;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;

austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/SendMqAction.java

@@ -1,13 +1,13 @@
-package com.java3y.austin.action;
+package com.java3y.austin.service.api.impl.action;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.google.common.base.Throwables;
-import com.java3y.austin.domain.SendTaskModel;
-import com.java3y.austin.enums.RespStatusEnum;
-import com.java3y.austin.pipeline.BusinessProcess;
-import com.java3y.austin.pipeline.ProcessContext;
-import com.java3y.austin.vo.BasicResultVO;
+import com.java3y.austin.common.enums.RespStatusEnum;
+import com.java3y.austin.common.vo.BasicResultVO;
+import com.java3y.austin.service.api.impl.domain.SendTaskModel;
+import com.java3y.austin.support.pipeline.BusinessProcess;
+import com.java3y.austin.support.pipeline.ProcessContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/config/PipelineConfig.java

@@ -1,13 +1,14 @@
-package com.java3y.austin.config;
+package com.java3y.austin.service.api.impl.config;
 
-import com.java3y.austin.action.AfterParamCheckAction;
-import com.java3y.austin.action.AssembleAction;
-import com.java3y.austin.action.PreParamCheckAction;
-import com.java3y.austin.action.SendMqAction;
-import com.java3y.austin.enums.BusinessCode;
-import com.java3y.austin.pipeline.BusinessProcess;
-import com.java3y.austin.pipeline.ProcessController;
-import com.java3y.austin.pipeline.ProcessTemplate;
+
+import com.java3y.austin.service.api.enums.BusinessCode;
+import com.java3y.austin.service.api.impl.action.AfterParamCheckAction;
+import com.java3y.austin.service.api.impl.action.AssembleAction;
+import com.java3y.austin.service.api.impl.action.PreParamCheckAction;
+import com.java3y.austin.service.api.impl.action.SendMqAction;
+import com.java3y.austin.support.pipeline.BusinessProcess;
+import com.java3y.austin.support.pipeline.ProcessController;
+import com.java3y.austin.support.pipeline.ProcessTemplate;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/domain/SendTaskModel.java

@@ -1,6 +1,8 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.service.api.impl.domain;
 
-import com.java3y.austin.pipeline.ProcessModel;
+import com.java3y.austin.common.domain.TaskInfo;
+import com.java3y.austin.service.api.domain.MessageParam;
+import com.java3y.austin.support.pipeline.ProcessModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/SendServiceImpl.java

@@ -1,13 +1,14 @@
-package com.java3y.austin.service;
+package com.java3y.austin.service.api.impl.service;
 
 import cn.monitor4all.logRecord.annotation.OperationLog;
-import com.java3y.austin.domain.BatchSendRequest;
-import com.java3y.austin.domain.SendRequest;
-import com.java3y.austin.domain.SendResponse;
-import com.java3y.austin.domain.SendTaskModel;
-import com.java3y.austin.pipeline.ProcessContext;
-import com.java3y.austin.pipeline.ProcessController;
-import com.java3y.austin.vo.BasicResultVO;
+import com.java3y.austin.common.vo.BasicResultVO;
+import com.java3y.austin.service.api.domain.BatchSendRequest;
+import com.java3y.austin.service.api.domain.SendRequest;
+import com.java3y.austin.service.api.domain.SendResponse;
+import com.java3y.austin.service.api.impl.domain.SendTaskModel;
+import com.java3y.austin.service.api.service.SendService;
+import com.java3y.austin.support.pipeline.ProcessContext;
+import com.java3y.austin.support.pipeline.ProcessController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

austin-service-api/src/main/java/com/java3y/austin/service/api/domain/BatchSendRequest.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.service.api.domain;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

austin-service-api/src/main/java/com/java3y/austin/service/api/domain/MessageParam.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.service.api.domain;
 
 import lombok.Builder;
 import lombok.Data;

austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendRequest.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.service.api.domain;
 
 
 import lombok.AllArgsConstructor;

austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendResponse.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.service.api.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

austin-service-api/src/main/java/com/java3y/austin/service/api/enums/BusinessCode.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.enums;
+package com.java3y.austin.service.api.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

austin-service-api/src/main/java/com/java3y/austin/service/api/service/SendService.java

@@ -1,8 +1,8 @@
-package com.java3y.austin.service;
+package com.java3y.austin.service.api.service;
 
-import com.java3y.austin.domain.BatchSendRequest;
-import com.java3y.austin.domain.SendRequest;
-import com.java3y.austin.domain.SendResponse;
+import com.java3y.austin.service.api.domain.BatchSendRequest;
+import com.java3y.austin.service.api.domain.SendRequest;
+import com.java3y.austin.service.api.domain.SendResponse;
 
 /**
  * 发送接口

austin-support/src/main/java/com/java3y/austin/support/config/OkHttpConfiguration.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.config;
+package com.java3y.austin.support.config;
 
 
 import okhttp3.ConnectionPool;
@@ -7,8 +7,13 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.net.ssl.*;
-import java.security.*;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.concurrent.TimeUnit;

austin-support/src/main/java/com/java3y/austin/support/dao/MessageTemplateDao.java

@@ -1,11 +1,12 @@
-package com.java3y.austin.dao;
+package com.java3y.austin.support.dao;
 
-import com.java3y.austin.domain.MessageTemplate;
+import com.java3y.austin.support.domain.MessageTemplate;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 
+
 /**
  * 消息模板Dao
  * @author 3y

austin-support/src/main/java/com/java3y/austin/support/dao/SmsRecordDao.java

@@ -1,6 +1,7 @@
-package com.java3y.austin.dao;
+package com.java3y.austin.support.dao;
 
-import com.java3y.austin.domain.SmsRecord;
+
+import com.java3y.austin.support.domain.SmsRecord;
 import org.springframework.data.repository.CrudRepository;
 
 /**

austin-support/src/main/java/com/java3y/austin/support/domain/MessageTemplate.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.support.domain;
 
 
 import lombok.AllArgsConstructor;

austin-support/src/main/java/com/java3y/austin/support/domain/SmsRecord.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.domain;
+package com.java3y.austin.support.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

austin-support/src/main/java/com/java3y/austin/support/pipeline/BusinessProcess.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.pipeline;
+package com.java3y.austin.support.pipeline;
 
 /**
  * 业务执行器

austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessContext.java

@@ -1,6 +1,6 @@
-package com.java3y.austin.pipeline;
+package com.java3y.austin.support.pipeline;
 
-import com.java3y.austin.vo.BasicResultVO;
+import com.java3y.austin.common.vo.BasicResultVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessController.java

@@ -1,13 +1,12 @@
-package com.java3y.austin.pipeline;
+package com.java3y.austin.support.pipeline;
 
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.java3y.austin.enums.RespStatusEnum;
-import com.java3y.austin.vo.BasicResultVO;
+import com.java3y.austin.common.enums.RespStatusEnum;
+import com.java3y.austin.common.vo.BasicResultVO;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;

austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessModel.java

@@ -1,8 +1,6 @@
-package com.java3y.austin.pipeline;
+package com.java3y.austin.support.pipeline;
 
 
-import com.java3y.austin.vo.BasicResultVO;
-
 /**
  * 真正存储着责任链的数据
  * @author 3y

austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessTemplate.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.pipeline;
+package com.java3y.austin.support.pipeline;
 
 import java.util.List;
 

austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java

@@ -1,11 +1,11 @@
-package com.java3y.austin.utils;
+package com.java3y.austin.support.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.Config;
 import com.ctrip.framework.apollo.spring.annotation.ApolloConfig;
-import com.java3y.austin.constant.AustinConstant;
+import com.java3y.austin.common.constant.AustinConstant;
 import org.springframework.stereotype.Component;
 
 /**

austin-support/src/main/java/com/java3y/austin/support/utils/ContentHolderUtil.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.utils;
+package com.java3y.austin.support.utils;
 
 import org.springframework.context.expression.MapAccessor;
 import org.springframework.expression.spel.support.StandardEvaluationContext;

austin-support/src/main/java/com/java3y/austin/support/utils/LogUtils.java

@@ -1,10 +1,10 @@
-package com.java3y.austin.utils;
+package com.java3y.austin.support.utils;
 
 import cn.monitor4all.logRecord.bean.LogDTO;
 import cn.monitor4all.logRecord.service.CustomLogListener;
 import com.alibaba.fastjson.JSON;
-import com.java3y.austin.domain.AnchorInfo;
-import com.java3y.austin.domain.LogParam;
+import com.java3y.austin.common.domain.AnchorInfo;
+import com.java3y.austin.common.domain.LogParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

austin-support/src/main/java/com/java3y/austin/support/utils/OkHttpUtils.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.utils;
+package com.java3y.austin.support.utils;
 
 import cn.hutool.core.map.MapUtil;
 import com.google.common.base.Throwables;

austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.utils;
+package com.java3y.austin.support.utils;
 
 import cn.hutool.core.collection.CollUtil;
 import com.google.common.base.Throwables;

austin-support/src/main/java/com/java3y/austin/support/utils/TaskInfoUtils.java

@@ -1,7 +1,7 @@
-package com.java3y.austin.utils;
+package com.java3y.austin.support.utils;
 
 import cn.hutool.core.date.DateUtil;
-import com.java3y.austin.constant.AustinConstant;
+import com.java3y.austin.common.constant.AustinConstant;
 
 import java.util.Date;
 

austin-web/src/main/java/com/java3y/austin/web/config/SwaggerConfiguration.java

@@ -1,4 +1,4 @@
-package com.java3y.austin.config;
+package com.java3y.austin.web.config;
 
 import io.swagger.annotations.ApiModel;
 import org.springframework.context.annotation.Bean;
@@ -35,7 +35,7 @@ public class SwaggerConfiguration {
                 //配置文档的元信息
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.java3y.austin.controller"))
+                .apis(RequestHandlerSelectors.basePackage("com.java3y.austin.web.controller"))
                 //正则匹配请求路径，并分配到当前项目组
                 //.paths(PathSelectors.ant("/api/**"))
                 .build();

austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java

@@ -1,22 +1,22 @@
-package com.java3y.austin.controller;
+package com.java3y.austin.web.controller;
 
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.google.common.base.Throwables;
-import com.java3y.austin.domain.MessageParam;
-import com.java3y.austin.domain.MessageTemplate;
-import com.java3y.austin.domain.SendRequest;
-import com.java3y.austin.domain.SendResponse;
-import com.java3y.austin.enums.BusinessCode;
-import com.java3y.austin.enums.RespStatusEnum;
-import com.java3y.austin.service.MessageTemplateService;
-import com.java3y.austin.service.SendService;
-import com.java3y.austin.utils.ConvertMap;
-import com.java3y.austin.vo.BasicResultVO;
-import com.java3y.austin.vo.MessageTemplateParam;
-import com.java3y.austin.vo.MessageTemplateVo;
+import com.java3y.austin.common.enums.RespStatusEnum;
+import com.java3y.austin.common.vo.BasicResultVO;
+import com.java3y.austin.service.api.domain.MessageParam;
+import com.java3y.austin.service.api.domain.SendRequest;
+import com.java3y.austin.service.api.domain.SendResponse;
+import com.java3y.austin.service.api.enums.BusinessCode;
+import com.java3y.austin.service.api.service.SendService;
+import com.java3y.austin.support.domain.MessageTemplate;
+import com.java3y.austin.web.service.MessageTemplateService;
+import com.java3y.austin.web.utils.ConvertMap;
+import com.java3y.austin.web.vo.MessageTemplateParam;
+import com.java3y.austin.web.vo.MessageTemplateVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
 @Api("发送消息")
 @CrossOrigin(origins = "http://localhost:3000", allowCredentials = "true", allowedHeaders = "*")
 public class MessageTemplateController {
-    private static final List<String> flatFieldName = Arrays.asList("msgContent");
+    private static final List<String> FLAT_FIELD_NAME = Arrays.asList("msgContent");
 
     @Autowired
     private MessageTemplateService messageTemplateService;
@@ -74,7 +74,7 @@ public class MessageTemplateController {
     @GetMapping("/list")
     @ApiOperation("/列表页")
     public BasicResultVO queryList(MessageTemplateParam messageTemplateParam) {
-        List<Map<String, Object>> result = ConvertMap.flatList(messageTemplateService.queryList(messageTemplateParam), flatFieldName);
+        List<Map<String, Object>> result = ConvertMap.flatList(messageTemplateService.queryList(messageTemplateParam), FLAT_FIELD_NAME);
 
         long count = messageTemplateService.count();
         MessageTemplateVo messageTemplateVo = MessageTemplateVo.builder().count(count).rows(result).build();
@@ -87,7 +87,7 @@ public class MessageTemplateController {
     @GetMapping("query/{id}")
     @ApiOperation("/根据Id查找")
     public BasicResultVO queryById(@PathVariable("id") Long id) {
-        Map<String, Object> result = ConvertMap.flatSingle(messageTemplateService.queryById(id), flatFieldName);
+        Map<String, Object> result = ConvertMap.flatSingle(messageTemplateService.queryById(id), FLAT_FIELD_NAME);
         return BasicResultVO.success(result);
     }
 

austin-web/src/main/java/com/java3y/austin/web/controller/SendController.java

@@ -1,9 +1,11 @@
-package com.java3y.austin.controller;
+package com.java3y.austin.web.controller;
 
-import com.java3y.austin.domain.SendRequest;
-import com.java3y.austin.domain.SendResponse;
-import com.java3y.austin.service.SendService;
-import io.swagger.annotations.*;
+
+import com.java3y.austin.service.api.domain.SendRequest;
+import com.java3y.austin.service.api.domain.SendResponse;
+import com.java3y.austin.service.api.service.SendService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;