diff --git a/README.md b/README.md index 9b925c5..c7d34d5 100644 --- a/README.md +++ b/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 diff --git a/austin-common/src/main/java/com/java3y/austin/constant/AustinConstant.java b/austin-common/src/main/java/com/java3y/austin/common/constant/AustinConstant.java similarity index 93% rename from austin-common/src/main/java/com/java3y/austin/constant/AustinConstant.java rename to austin-common/src/main/java/com/java3y/austin/common/constant/AustinConstant.java index 333a161..8b335ae 100644 --- a/austin-common/src/main/java/com/java3y/austin/constant/AustinConstant.java +++ b/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; /** diff --git a/austin-common/src/main/java/com/java3y/austin/domain/AnchorInfo.java b/austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java similarity index 93% rename from austin-common/src/main/java/com/java3y/austin/domain/AnchorInfo.java rename to austin-common/src/main/java/com/java3y/austin/common/domain/AnchorInfo.java index 0aa01d9..f1f15b5 100644 --- a/austin-common/src/main/java/com/java3y/austin/domain/AnchorInfo.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/domain/LogParam.java b/austin-common/src/main/java/com/java3y/austin/common/domain/LogParam.java similarity index 91% rename from austin-common/src/main/java/com/java3y/austin/domain/LogParam.java rename to austin-common/src/main/java/com/java3y/austin/common/domain/LogParam.java index 6445529..88704e5 100644 --- a/austin-common/src/main/java/com/java3y/austin/domain/LogParam.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/domain/TaskInfo.java b/austin-common/src/main/java/com/java3y/austin/common/domain/TaskInfo.java similarity index 93% rename from austin-common/src/main/java/com/java3y/austin/domain/TaskInfo.java rename to austin-common/src/main/java/com/java3y/austin/common/domain/TaskInfo.java index ec5fde6..68cf4f4 100644 --- a/austin-common/src/main/java/com/java3y/austin/domain/TaskInfo.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/dto/ContentModel.java b/austin-common/src/main/java/com/java3y/austin/common/dto/ContentModel.java similarity index 76% rename from austin-common/src/main/java/com/java3y/austin/dto/ContentModel.java rename to austin-common/src/main/java/com/java3y/austin/common/dto/ContentModel.java index f5851cd..9d85b9e 100644 --- a/austin-common/src/main/java/com/java3y/austin/dto/ContentModel.java +++ b/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; /** * 发送内容的模型 diff --git a/austin-common/src/main/java/com/java3y/austin/dto/EmailContentModel.java b/austin-common/src/main/java/com/java3y/austin/common/dto/EmailContentModel.java similarity index 90% rename from austin-common/src/main/java/com/java3y/austin/dto/EmailContentModel.java rename to austin-common/src/main/java/com/java3y/austin/common/dto/EmailContentModel.java index 854629b..e2dec9c 100644 --- a/austin-common/src/main/java/com/java3y/austin/dto/EmailContentModel.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/dto/ImContentModel.java b/austin-common/src/main/java/com/java3y/austin/common/dto/ImContentModel.java similarity index 67% rename from austin-common/src/main/java/com/java3y/austin/dto/ImContentModel.java rename to austin-common/src/main/java/com/java3y/austin/common/dto/ImContentModel.java index e471994..97a5118 100644 --- a/austin-common/src/main/java/com/java3y/austin/dto/ImContentModel.java +++ b/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 diff --git a/austin-common/src/main/java/com/java3y/austin/dto/MiniProgramContentModel.java b/austin-common/src/main/java/com/java3y/austin/common/dto/MiniProgramContentModel.java similarity index 69% rename from austin-common/src/main/java/com/java3y/austin/dto/MiniProgramContentModel.java rename to austin-common/src/main/java/com/java3y/austin/common/dto/MiniProgramContentModel.java index 552b1a6..7d1486c 100644 --- a/austin-common/src/main/java/com/java3y/austin/dto/MiniProgramContentModel.java +++ b/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 diff --git a/austin-common/src/main/java/com/java3y/austin/dto/OfficialAccountsContentModel.java b/austin-common/src/main/java/com/java3y/austin/common/dto/OfficialAccountsContentModel.java similarity index 70% rename from austin-common/src/main/java/com/java3y/austin/dto/OfficialAccountsContentModel.java rename to austin-common/src/main/java/com/java3y/austin/common/dto/OfficialAccountsContentModel.java index 676245f..ee3a80e 100644 --- a/austin-common/src/main/java/com/java3y/austin/dto/OfficialAccountsContentModel.java +++ b/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 diff --git a/austin-common/src/main/java/com/java3y/austin/dto/PushContentModel.java b/austin-common/src/main/java/com/java3y/austin/common/dto/PushContentModel.java similarity index 67% rename from austin-common/src/main/java/com/java3y/austin/dto/PushContentModel.java rename to austin-common/src/main/java/com/java3y/austin/common/dto/PushContentModel.java index 90bae84..dadd5d9 100644 --- a/austin-common/src/main/java/com/java3y/austin/dto/PushContentModel.java +++ b/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; /** diff --git a/austin-common/src/main/java/com/java3y/austin/dto/SmsContentModel.java b/austin-common/src/main/java/com/java3y/austin/common/dto/SmsContentModel.java similarity index 92% rename from austin-common/src/main/java/com/java3y/austin/dto/SmsContentModel.java rename to austin-common/src/main/java/com/java3y/austin/common/dto/SmsContentModel.java index 59ba0f9..3ed9f12 100644 --- a/austin-common/src/main/java/com/java3y/austin/dto/SmsContentModel.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/enums/AnchorState.java b/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java similarity index 93% rename from austin-common/src/main/java/com/java3y/austin/enums/AnchorState.java rename to austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java index 32274cf..8722b34 100644 --- a/austin-common/src/main/java/com/java3y/austin/enums/AnchorState.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/enums/AuditStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java similarity index 91% rename from austin-common/src/main/java/com/java3y/austin/enums/AuditStatus.java rename to austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java index 15b55e9..8001d13 100644 --- a/austin-common/src/main/java/com/java3y/austin/enums/AuditStatus.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/enums/ChannelType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java similarity index 95% rename from austin-common/src/main/java/com/java3y/austin/enums/ChannelType.java rename to austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java index 11da1e8..4735ad6 100644 --- a/austin-common/src/main/java/com/java3y/austin/enums/ChannelType.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/enums/DeduplicationType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java similarity index 94% rename from austin-common/src/main/java/com/java3y/austin/enums/DeduplicationType.java rename to austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java index 3cf4b1c..3adee2f 100644 --- a/austin-common/src/main/java/com/java3y/austin/enums/DeduplicationType.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/enums/IdType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java similarity index 90% rename from austin-common/src/main/java/com/java3y/austin/enums/IdType.java rename to austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java index 49209bf..64e1d2d 100644 --- a/austin-common/src/main/java/com/java3y/austin/enums/IdType.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/enums/MessageStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java similarity index 93% rename from austin-common/src/main/java/com/java3y/austin/enums/MessageStatus.java rename to austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java index 29bcbfe..5986c36 100644 --- a/austin-common/src/main/java/com/java3y/austin/enums/MessageStatus.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/enums/MessageType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java similarity index 95% rename from austin-common/src/main/java/com/java3y/austin/enums/MessageType.java rename to austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java index f049dc0..fe8d214 100644 --- a/austin-common/src/main/java/com/java3y/austin/enums/MessageType.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/enums/RespStatusEnum.java b/austin-common/src/main/java/com/java3y/austin/common/enums/RespStatusEnum.java similarity index 96% rename from austin-common/src/main/java/com/java3y/austin/enums/RespStatusEnum.java rename to austin-common/src/main/java/com/java3y/austin/common/enums/RespStatusEnum.java index fb9b6f1..40985c7 100644 --- a/austin-common/src/main/java/com/java3y/austin/enums/RespStatusEnum.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/enums/SmsStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java similarity index 92% rename from austin-common/src/main/java/com/java3y/austin/enums/SmsStatus.java rename to austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java index 6765c1c..2ee30ba 100644 --- a/austin-common/src/main/java/com/java3y/austin/enums/SmsStatus.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/enums/TemplateType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java similarity index 90% rename from austin-common/src/main/java/com/java3y/austin/enums/TemplateType.java rename to austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java index b5a39eb..75b0c8d 100644 --- a/austin-common/src/main/java/com/java3y/austin/enums/TemplateType.java +++ b/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; diff --git a/austin-common/src/main/java/com/java3y/austin/vo/BasicResultVO.java b/austin-common/src/main/java/com/java3y/austin/common/vo/BasicResultVO.java similarity index 96% rename from austin-common/src/main/java/com/java3y/austin/vo/BasicResultVO.java rename to austin-common/src/main/java/com/java3y/austin/common/vo/BasicResultVO.java index ea2458e..3d4bd98 100644 --- a/austin-common/src/main/java/com/java3y/austin/vo/BasicResultVO.java +++ b/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; diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/domain/CrowdInfoVo.java b/austin-cron/src/main/java/com/java3y/austin/cron/domain/CrowdInfoVo.java new file mode 100644 index 0000000..7e994c4 --- /dev/null +++ b/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 params; +} diff --git a/austin-cron/src/main/java/com/java3y/austin/handler/CronTaskHandler.java b/austin-cron/src/main/java/com/java3y/austin/cron/handler/CronTaskHandler.java similarity index 57% rename from austin-cron/src/main/java/com/java3y/austin/handler/CronTaskHandler.java rename to austin-cron/src/main/java/com/java3y/austin/cron/handler/CronTaskHandler.java index b296b5c..2f830a7 100644 --- a/austin-cron/src/main/java/com/java3y/austin/handler/CronTaskHandler.java +++ b/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); + } } diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/service/TaskHandler.java b/austin-cron/src/main/java/com/java3y/austin/cron/service/TaskHandler.java new file mode 100644 index 0000000..3af3c74 --- /dev/null +++ b/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); + +} diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/service/impl/TaskHandlerImpl.java b/austin-cron/src/main/java/com/java3y/austin/cron/service/impl/TaskHandlerImpl.java new file mode 100644 index 0000000..d299bd9 --- /dev/null +++ b/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 csvRowList = ReadFileUtils.getCsvRowList(messageTemplate.getCronCrowdPath()); + + if (CollUtil.isNotEmpty(csvRowList)) { + + } + + log.info("csv info:", JSON.toJSONString(csvRowList)); + } + +} diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/utils/ReadFileUtils.java b/austin-cron/src/main/java/com/java3y/austin/cron/utils/ReadFileUtils.java new file mode 100644 index 0000000..f9279aa --- /dev/null +++ b/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 getCsvRowList(String path) { + List 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 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; + } +} diff --git a/austin-cron/src/main/java/com/java3y/austin/config/XxlJobConfig.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/config/XxlJobConfig.java similarity index 94% rename from austin-cron/src/main/java/com/java3y/austin/config/XxlJobConfig.java rename to austin-cron/src/main/java/com/java3y/austin/cron/xxl/config/XxlJobConfig.java index df1aa11..9176ffd 100644 --- a/austin-cron/src/main/java/com/java3y/austin/config/XxlJobConfig.java +++ b/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 { diff --git a/austin-cron/src/main/java/com/java3y/austin/constants/XxlJobConstant.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/constants/XxlJobConstant.java similarity index 95% rename from austin-cron/src/main/java/com/java3y/austin/constants/XxlJobConstant.java rename to austin-cron/src/main/java/com/java3y/austin/cron/xxl/constants/XxlJobConstant.java index 763e5c3..0d71e45 100644 --- a/austin-cron/src/main/java/com/java3y/austin/constants/XxlJobConstant.java +++ b/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; /** diff --git a/austin-cron/src/main/java/com/java3y/austin/entity/XxlJobGroup.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobGroup.java similarity index 96% rename from austin-cron/src/main/java/com/java3y/austin/entity/XxlJobGroup.java rename to austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobGroup.java index 1783956..d7d59db 100644 --- a/austin-cron/src/main/java/com/java3y/austin/entity/XxlJobGroup.java +++ b/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; diff --git a/austin-cron/src/main/java/com/java3y/austin/entity/XxlJobInfo.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobInfo.java similarity index 98% rename from austin-cron/src/main/java/com/java3y/austin/entity/XxlJobInfo.java rename to austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobInfo.java index d5a03db..64b24ab 100644 --- a/austin-cron/src/main/java/com/java3y/austin/entity/XxlJobInfo.java +++ b/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; diff --git a/austin-cron/src/main/java/com/java3y/austin/enums/ExecutorBlockStrategyEnum.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorBlockStrategyEnum.java similarity index 88% rename from austin-cron/src/main/java/com/java3y/austin/enums/ExecutorBlockStrategyEnum.java rename to austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorBlockStrategyEnum.java index fe4dea5..b65b608 100644 --- a/austin-cron/src/main/java/com/java3y/austin/enums/ExecutorBlockStrategyEnum.java +++ b/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; /** * 执行阻塞队列 diff --git a/austin-cron/src/main/java/com/java3y/austin/enums/ExecutorRouteStrategyEnum.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorRouteStrategyEnum.java similarity index 87% rename from austin-cron/src/main/java/com/java3y/austin/enums/ExecutorRouteStrategyEnum.java rename to austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ExecutorRouteStrategyEnum.java index d1e702b..1f22ffd 100644 --- a/austin-cron/src/main/java/com/java3y/austin/enums/ExecutorRouteStrategyEnum.java +++ b/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; /** diff --git a/austin-cron/src/main/java/com/java3y/austin/enums/GlueTypeEnum.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/GlueTypeEnum.java similarity index 84% rename from austin-cron/src/main/java/com/java3y/austin/enums/GlueTypeEnum.java rename to austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/GlueTypeEnum.java index 14fcdca..96cb286 100644 --- a/austin-cron/src/main/java/com/java3y/austin/enums/GlueTypeEnum.java +++ b/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) diff --git a/austin-cron/src/main/java/com/java3y/austin/enums/MisfireStrategyEnum.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/MisfireStrategyEnum.java similarity index 84% rename from austin-cron/src/main/java/com/java3y/austin/enums/MisfireStrategyEnum.java rename to austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/MisfireStrategyEnum.java index b5fa6ae..93fd718 100644 --- a/austin-cron/src/main/java/com/java3y/austin/enums/MisfireStrategyEnum.java +++ b/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; /** * 调度过期策略 diff --git a/austin-cron/src/main/java/com/java3y/austin/enums/ScheduleTypeEnum.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ScheduleTypeEnum.java similarity index 85% rename from austin-cron/src/main/java/com/java3y/austin/enums/ScheduleTypeEnum.java rename to austin-cron/src/main/java/com/java3y/austin/cron/xxl/enums/ScheduleTypeEnum.java index 7fe2e03..ed73f34 100644 --- a/austin-cron/src/main/java/com/java3y/austin/enums/ScheduleTypeEnum.java +++ b/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; /** * 调度类型 diff --git a/austin-cron/src/main/java/com/java3y/austin/service/CronTaskService.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/CronTaskService.java similarity index 63% rename from austin-cron/src/main/java/com/java3y/austin/service/CronTaskService.java rename to austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/CronTaskService.java index a9b155d..1e21209 100644 --- a/austin-cron/src/main/java/com/java3y/austin/service/CronTaskService.java +++ b/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); diff --git a/austin-cron/src/main/java/com/java3y/austin/service/impl/CronTaskServiceImpl.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java similarity index 95% rename from austin-cron/src/main/java/com/java3y/austin/service/impl/CronTaskServiceImpl.java rename to austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java index bf8ed01..5374516 100644 --- a/austin-cron/src/main/java/com/java3y/austin/service/impl/CronTaskServiceImpl.java +++ b/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; diff --git a/austin-cron/src/main/java/com/java3y/austin/utils/XxlJobUtils.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/utils/XxlJobUtils.java similarity index 83% rename from austin-cron/src/main/java/com/java3y/austin/utils/XxlJobUtils.java rename to austin-cron/src/main/java/com/java3y/austin/cron/xxl/utils/XxlJobUtils.java index 747cf73..cb6de84 100644 --- a/austin-cron/src/main/java/com/java3y/austin/utils/XxlJobUtils.java +++ b/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) diff --git a/austin-handler/src/main/java/com/java3y/austin/config/PrototypeBeanConfig.java b/austin-handler/src/main/java/com/java3y/austin/handler/config/PrototypeBeanConfig.java similarity index 83% rename from austin-handler/src/main/java/com/java3y/austin/config/PrototypeBeanConfig.java rename to austin-handler/src/main/java/com/java3y/austin/handler/config/PrototypeBeanConfig.java index 7f30604..5f76b25 100644 --- a/austin-handler/src/main/java/com/java3y/austin/config/PrototypeBeanConfig.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/config/ThreadPoolConfig.java b/austin-handler/src/main/java/com/java3y/austin/handler/config/ThreadPoolConfig.java similarity index 95% rename from austin-handler/src/main/java/com/java3y/austin/config/ThreadPoolConfig.java rename to austin-handler/src/main/java/com/java3y/austin/handler/config/ThreadPoolConfig.java index 00e92fc..25cf7cb 100644 --- a/austin-handler/src/main/java/com/java3y/austin/config/ThreadPoolConfig.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/DeduplicationHolder.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationHolder.java similarity index 81% rename from austin-handler/src/main/java/com/java3y/austin/service/deduplication/DeduplicationHolder.java rename to austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationHolder.java index 342c5a8..04902db 100644 --- a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/DeduplicationHolder.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/DeduplicationRuleService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java similarity index 82% rename from austin-handler/src/main/java/com/java3y/austin/service/deduplication/DeduplicationRuleService.java rename to austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java index abfc5d0..0577827 100644 --- a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/DeduplicationRuleService.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/build/AbstractDeduplicationBuilder.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/AbstractDeduplicationBuilder.java similarity index 82% rename from austin-handler/src/main/java/com/java3y/austin/service/deduplication/build/AbstractDeduplicationBuilder.java rename to austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/AbstractDeduplicationBuilder.java index 68fd9bf..722317f 100644 --- a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/build/AbstractDeduplicationBuilder.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/build/Builder.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/Builder.java similarity index 67% rename from austin-handler/src/main/java/com/java3y/austin/service/deduplication/build/Builder.java rename to austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/Builder.java index 2b45acc..abe55e8 100644 --- a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/build/Builder.java +++ b/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 diff --git a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/build/ContentDeduplicationBuilder.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java similarity index 72% rename from austin-handler/src/main/java/com/java3y/austin/service/deduplication/build/ContentDeduplicationBuilder.java rename to austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java index 238819e..c040f2a 100644 --- a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/build/ContentDeduplicationBuilder.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/build/FrequencyDeduplicationBuilder.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/FrequencyDeduplicationBuilder.java similarity index 76% rename from austin-handler/src/main/java/com/java3y/austin/service/deduplication/build/FrequencyDeduplicationBuilder.java rename to austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/FrequencyDeduplicationBuilder.java index b1d0ab4..ae4603a 100644 --- a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/build/FrequencyDeduplicationBuilder.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/AbstractDeduplicationService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/AbstractDeduplicationService.java similarity index 89% rename from austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/AbstractDeduplicationService.java rename to austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/AbstractDeduplicationService.java index 07548fe..5456eb1 100644 --- a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/AbstractDeduplicationService.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/ContentDeduplicationService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/ContentDeduplicationService.java similarity index 85% rename from austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/ContentDeduplicationService.java rename to austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/ContentDeduplicationService.java index a305359..ca14bb7 100644 --- a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/ContentDeduplicationService.java +++ b/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; /** diff --git a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/DeduplicationService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/DeduplicationService.java similarity index 61% rename from austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/DeduplicationService.java rename to austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/DeduplicationService.java index e0abf27..6eac046 100644 --- a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/DeduplicationService.java +++ b/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 diff --git a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/FrequencyDeduplicationService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/FrequencyDeduplicationService.java similarity index 85% rename from austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/FrequencyDeduplicationService.java rename to austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/FrequencyDeduplicationService.java index bc23513..102a93b 100644 --- a/austin-handler/src/main/java/com/java3y/austin/service/deduplication/service/FrequencyDeduplicationService.java +++ b/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; /** diff --git a/austin-handler/src/main/java/com/java3y/austin/service/discard/DiscardMessageService.java b/austin-handler/src/main/java/com/java3y/austin/handler/discard/DiscardMessageService.java similarity index 78% rename from austin-handler/src/main/java/com/java3y/austin/service/discard/DiscardMessageService.java rename to austin-handler/src/main/java/com/java3y/austin/handler/discard/DiscardMessageService.java index 1749b6d..2668555 100644 --- a/austin-handler/src/main/java/com/java3y/austin/service/discard/DiscardMessageService.java +++ b/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; /** diff --git a/austin-handler/src/main/java/com/java3y/austin/domain/DeduplicationParam.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/DeduplicationParam.java similarity index 83% rename from austin-handler/src/main/java/com/java3y/austin/domain/DeduplicationParam.java rename to austin-handler/src/main/java/com/java3y/austin/handler/domain/DeduplicationParam.java index 8f73ea5..e6c98c6 100644 --- a/austin-handler/src/main/java/com/java3y/austin/domain/DeduplicationParam.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/domain/SmsParam.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/SmsParam.java similarity index 91% rename from austin-handler/src/main/java/com/java3y/austin/domain/SmsParam.java rename to austin-handler/src/main/java/com/java3y/austin/handler/domain/SmsParam.java index 3e4e70b..bd79df9 100644 --- a/austin-handler/src/main/java/com/java3y/austin/domain/SmsParam.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/domain/TencentSmsParam.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/TencentSmsParam.java similarity index 95% rename from austin-handler/src/main/java/com/java3y/austin/domain/TencentSmsParam.java rename to austin-handler/src/main/java/com/java3y/austin/handler/domain/TencentSmsParam.java index b208b6b..821df40 100644 --- a/austin-handler/src/main/java/com/java3y/austin/domain/TencentSmsParam.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/BaseHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/BaseHandler.java similarity index 82% rename from austin-handler/src/main/java/com/java3y/austin/handler/BaseHandler.java rename to austin-handler/src/main/java/com/java3y/austin/handler/handler/BaseHandler.java index 8055cf1..0edf0da 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/BaseHandler.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/EmailHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/EmailHandler.java similarity index 89% rename from austin-handler/src/main/java/com/java3y/austin/handler/EmailHandler.java rename to austin-handler/src/main/java/com/java3y/austin/handler/handler/EmailHandler.java index a97de4d..b0c2886 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/EmailHandler.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/Handler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/Handler.java similarity index 64% rename from austin-handler/src/main/java/com/java3y/austin/handler/Handler.java rename to austin-handler/src/main/java/com/java3y/austin/handler/handler/Handler.java index e149d83..c01b1f0 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/Handler.java +++ b/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 diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/HandlerHolder.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/HandlerHolder.java similarity index 92% rename from austin-handler/src/main/java/com/java3y/austin/handler/HandlerHolder.java rename to austin-handler/src/main/java/com/java3y/austin/handler/handler/HandlerHolder.java index 29b523a..afe9915 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/HandlerHolder.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/SmsHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/SmsHandler.java similarity index 80% rename from austin-handler/src/main/java/com/java3y/austin/handler/SmsHandler.java rename to austin-handler/src/main/java/com/java3y/austin/handler/handler/SmsHandler.java index 413c367..10bbb7f 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/SmsHandler.java +++ b/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(); diff --git a/austin-handler/src/main/java/com/java3y/austin/pending/Task.java b/austin-handler/src/main/java/com/java3y/austin/handler/pending/Task.java similarity index 79% rename from austin-handler/src/main/java/com/java3y/austin/pending/Task.java rename to austin-handler/src/main/java/com/java3y/austin/handler/pending/Task.java index b0afa41..8a63bbf 100644 --- a/austin-handler/src/main/java/com/java3y/austin/pending/Task.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/pending/TaskPendingHolder.java b/austin-handler/src/main/java/com/java3y/austin/handler/pending/TaskPendingHolder.java similarity index 88% rename from austin-handler/src/main/java/com/java3y/austin/pending/TaskPendingHolder.java rename to austin-handler/src/main/java/com/java3y/austin/handler/pending/TaskPendingHolder.java index bbd3174..57fe9d5 100644 --- a/austin-handler/src/main/java/com/java3y/austin/pending/TaskPendingHolder.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/receiver/Receiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/Receiver.java similarity index 80% rename from austin-handler/src/main/java/com/java3y/austin/receiver/Receiver.java rename to austin-handler/src/main/java/com/java3y/austin/handler/receiver/Receiver.java index 29a6aff..b4e96dd 100644 --- a/austin-handler/src/main/java/com/java3y/austin/receiver/Receiver.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/receiver/ReceiverStart.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/ReceiverStart.java similarity index 94% rename from austin-handler/src/main/java/com/java3y/austin/receiver/ReceiverStart.java rename to austin-handler/src/main/java/com/java3y/austin/handler/receiver/ReceiverStart.java index 2e2d0c8..a7f02a6 100644 --- a/austin-handler/src/main/java/com/java3y/austin/receiver/ReceiverStart.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/script/SmsScript.java b/austin-handler/src/main/java/com/java3y/austin/handler/script/SmsScript.java similarity index 66% rename from austin-handler/src/main/java/com/java3y/austin/script/SmsScript.java rename to austin-handler/src/main/java/com/java3y/austin/handler/script/SmsScript.java index b04b81e..daeb1a2 100644 --- a/austin-handler/src/main/java/com/java3y/austin/script/SmsScript.java +++ b/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 diff --git a/austin-handler/src/main/java/com/java3y/austin/script/TencentSmsScript.java b/austin-handler/src/main/java/com/java3y/austin/handler/script/TencentSmsScript.java similarity index 92% rename from austin-handler/src/main/java/com/java3y/austin/script/TencentSmsScript.java rename to austin-handler/src/main/java/com/java3y/austin/handler/script/TencentSmsScript.java index ce9d7b7..64e40cd 100644 --- a/austin-handler/src/main/java/com/java3y/austin/script/TencentSmsScript.java +++ b/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; diff --git a/austin-handler/src/main/java/com/java3y/austin/utils/GroupIdMappingUtils.java b/austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java similarity index 84% rename from austin-handler/src/main/java/com/java3y/austin/utils/GroupIdMappingUtils.java rename to austin-handler/src/main/java/com/java3y/austin/handler/utils/GroupIdMappingUtils.java index 8497339..dc34b70 100644 --- a/austin-handler/src/main/java/com/java3y/austin/utils/GroupIdMappingUtils.java +++ b/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; diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/action/AfterParamCheckAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AfterParamCheckAction.java similarity index 82% rename from austin-service-api-impl/src/main/java/com/java3y/austin/action/AfterParamCheckAction.java rename to austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AfterParamCheckAction.java index cd538d2..52c76c3 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/action/AfterParamCheckAction.java +++ b/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; diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/action/AssembleAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java similarity index 84% rename from austin-service-api-impl/src/main/java/com/java3y/austin/action/AssembleAction.java rename to austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java index ed3ab33..f9ac5aa 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/action/AssembleAction.java +++ b/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; diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/action/PreParamCheckAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java similarity index 78% rename from austin-service-api-impl/src/main/java/com/java3y/austin/action/PreParamCheckAction.java rename to austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java index 79df995..7f64689 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/action/PreParamCheckAction.java +++ b/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; diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/action/SendMqAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/SendMqAction.java similarity index 78% rename from austin-service-api-impl/src/main/java/com/java3y/austin/action/SendMqAction.java rename to austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/SendMqAction.java index bdad98f..dae555a 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/action/SendMqAction.java +++ b/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; diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/config/PipelineConfig.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/config/PipelineConfig.java similarity index 79% rename from austin-service-api-impl/src/main/java/com/java3y/austin/config/PipelineConfig.java rename to austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/config/PipelineConfig.java index 1b85bf7..5639735 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/config/PipelineConfig.java +++ b/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; diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/domain/SendTaskModel.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/domain/SendTaskModel.java similarity index 72% rename from austin-service-api-impl/src/main/java/com/java3y/austin/domain/SendTaskModel.java rename to austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/domain/SendTaskModel.java index c022ed7..f0e6fe2 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/domain/SendTaskModel.java +++ b/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; diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/SendServiceImpl.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/SendServiceImpl.java similarity index 80% rename from austin-service-api-impl/src/main/java/com/java3y/austin/service/SendServiceImpl.java rename to austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/SendServiceImpl.java index 7741ca5..5277384 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/SendServiceImpl.java +++ b/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; diff --git a/austin-service-api/src/main/java/com/java3y/austin/domain/BatchSendRequest.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/BatchSendRequest.java similarity index 91% rename from austin-service-api/src/main/java/com/java3y/austin/domain/BatchSendRequest.java rename to austin-service-api/src/main/java/com/java3y/austin/service/api/domain/BatchSendRequest.java index 48b7257..a7b9885 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/domain/BatchSendRequest.java +++ b/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; diff --git a/austin-service-api/src/main/java/com/java3y/austin/domain/MessageParam.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/MessageParam.java similarity index 92% rename from austin-service-api/src/main/java/com/java3y/austin/domain/MessageParam.java rename to austin-service-api/src/main/java/com/java3y/austin/service/api/domain/MessageParam.java index 830fe2f..a126ba2 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/domain/MessageParam.java +++ b/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; diff --git a/austin-service-api/src/main/java/com/java3y/austin/domain/SendRequest.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendRequest.java similarity index 92% rename from austin-service-api/src/main/java/com/java3y/austin/domain/SendRequest.java rename to austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendRequest.java index df2985f..62d06ca 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/domain/SendRequest.java +++ b/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; diff --git a/austin-service-api/src/main/java/com/java3y/austin/domain/SendResponse.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendResponse.java similarity index 88% rename from austin-service-api/src/main/java/com/java3y/austin/domain/SendResponse.java rename to austin-service-api/src/main/java/com/java3y/austin/service/api/domain/SendResponse.java index bc1f386..7c3da90 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/domain/SendResponse.java +++ b/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; diff --git a/austin-service-api/src/main/java/com/java3y/austin/enums/BusinessCode.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/enums/BusinessCode.java similarity index 91% rename from austin-service-api/src/main/java/com/java3y/austin/enums/BusinessCode.java rename to austin-service-api/src/main/java/com/java3y/austin/service/api/enums/BusinessCode.java index 4cc3687..e42540d 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/enums/BusinessCode.java +++ b/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; diff --git a/austin-service-api/src/main/java/com/java3y/austin/service/SendService.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/service/SendService.java similarity index 62% rename from austin-service-api/src/main/java/com/java3y/austin/service/SendService.java rename to austin-service-api/src/main/java/com/java3y/austin/service/api/service/SendService.java index 0b8918f..5ca147d 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/service/SendService.java +++ b/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; /** * 发送接口 diff --git a/austin-support/src/main/java/com/java3y/austin/config/OkHttpConfiguration.java b/austin-support/src/main/java/com/java3y/austin/support/config/OkHttpConfiguration.java similarity index 89% rename from austin-support/src/main/java/com/java3y/austin/config/OkHttpConfiguration.java rename to austin-support/src/main/java/com/java3y/austin/support/config/OkHttpConfiguration.java index ddc9567..974942d 100644 --- a/austin-support/src/main/java/com/java3y/austin/config/OkHttpConfiguration.java +++ b/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; diff --git a/austin-support/src/main/java/com/java3y/austin/dao/MessageTemplateDao.java b/austin-support/src/main/java/com/java3y/austin/support/dao/MessageTemplateDao.java similarity index 86% rename from austin-support/src/main/java/com/java3y/austin/dao/MessageTemplateDao.java rename to austin-support/src/main/java/com/java3y/austin/support/dao/MessageTemplateDao.java index 297c442..a856f68 100644 --- a/austin-support/src/main/java/com/java3y/austin/dao/MessageTemplateDao.java +++ b/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 diff --git a/austin-support/src/main/java/com/java3y/austin/dao/SmsRecordDao.java b/austin-support/src/main/java/com/java3y/austin/support/dao/SmsRecordDao.java similarity index 66% rename from austin-support/src/main/java/com/java3y/austin/dao/SmsRecordDao.java rename to austin-support/src/main/java/com/java3y/austin/support/dao/SmsRecordDao.java index bd9d3e5..c312996 100644 --- a/austin-support/src/main/java/com/java3y/austin/dao/SmsRecordDao.java +++ b/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; /** diff --git a/austin-support/src/main/java/com/java3y/austin/domain/MessageTemplate.java b/austin-support/src/main/java/com/java3y/austin/support/domain/MessageTemplate.java similarity index 98% rename from austin-support/src/main/java/com/java3y/austin/domain/MessageTemplate.java rename to austin-support/src/main/java/com/java3y/austin/support/domain/MessageTemplate.java index dd73920..207199d 100644 --- a/austin-support/src/main/java/com/java3y/austin/domain/MessageTemplate.java +++ b/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; diff --git a/austin-support/src/main/java/com/java3y/austin/domain/SmsRecord.java b/austin-support/src/main/java/com/java3y/austin/support/domain/SmsRecord.java similarity index 96% rename from austin-support/src/main/java/com/java3y/austin/domain/SmsRecord.java rename to austin-support/src/main/java/com/java3y/austin/support/domain/SmsRecord.java index bdbec1e..889e7fe 100644 --- a/austin-support/src/main/java/com/java3y/austin/domain/SmsRecord.java +++ b/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; diff --git a/austin-support/src/main/java/com/java3y/austin/pipeline/BusinessProcess.java b/austin-support/src/main/java/com/java3y/austin/support/pipeline/BusinessProcess.java similarity index 81% rename from austin-support/src/main/java/com/java3y/austin/pipeline/BusinessProcess.java rename to austin-support/src/main/java/com/java3y/austin/support/pipeline/BusinessProcess.java index b8502eb..19951be 100644 --- a/austin-support/src/main/java/com/java3y/austin/pipeline/BusinessProcess.java +++ b/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; /** * 业务执行器 diff --git a/austin-support/src/main/java/com/java3y/austin/pipeline/ProcessContext.java b/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessContext.java similarity index 87% rename from austin-support/src/main/java/com/java3y/austin/pipeline/ProcessContext.java rename to austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessContext.java index 685ef72..6936dc6 100644 --- a/austin-support/src/main/java/com/java3y/austin/pipeline/ProcessContext.java +++ b/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; diff --git a/austin-support/src/main/java/com/java3y/austin/pipeline/ProcessController.java b/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessController.java similarity index 92% rename from austin-support/src/main/java/com/java3y/austin/pipeline/ProcessController.java rename to austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessController.java index b36dacd..977178b 100644 --- a/austin-support/src/main/java/com/java3y/austin/pipeline/ProcessController.java +++ b/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; diff --git a/austin-support/src/main/java/com/java3y/austin/pipeline/ProcessModel.java b/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessModel.java similarity index 54% rename from austin-support/src/main/java/com/java3y/austin/pipeline/ProcessModel.java rename to austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessModel.java index 9a2e2d0..2501e0e 100644 --- a/austin-support/src/main/java/com/java3y/austin/pipeline/ProcessModel.java +++ b/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 diff --git a/austin-support/src/main/java/com/java3y/austin/pipeline/ProcessTemplate.java b/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessTemplate.java similarity index 89% rename from austin-support/src/main/java/com/java3y/austin/pipeline/ProcessTemplate.java rename to austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessTemplate.java index cb9f964..b773041 100644 --- a/austin-support/src/main/java/com/java3y/austin/pipeline/ProcessTemplate.java +++ b/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; diff --git a/austin-support/src/main/java/com/java3y/austin/utils/AccountUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java similarity index 93% rename from austin-support/src/main/java/com/java3y/austin/utils/AccountUtils.java rename to austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java index 3ca5c9f..b8f96dd 100644 --- a/austin-support/src/main/java/com/java3y/austin/utils/AccountUtils.java +++ b/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; /** diff --git a/austin-support/src/main/java/com/java3y/austin/utils/ContentHolderUtil.java b/austin-support/src/main/java/com/java3y/austin/support/utils/ContentHolderUtil.java similarity index 98% rename from austin-support/src/main/java/com/java3y/austin/utils/ContentHolderUtil.java rename to austin-support/src/main/java/com/java3y/austin/support/utils/ContentHolderUtil.java index ea8718d..386dd70 100644 --- a/austin-support/src/main/java/com/java3y/austin/utils/ContentHolderUtil.java +++ b/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; diff --git a/austin-support/src/main/java/com/java3y/austin/utils/LogUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/LogUtils.java similarity index 89% rename from austin-support/src/main/java/com/java3y/austin/utils/LogUtils.java rename to austin-support/src/main/java/com/java3y/austin/support/utils/LogUtils.java index fed49dd..f8f8c17 100644 --- a/austin-support/src/main/java/com/java3y/austin/utils/LogUtils.java +++ b/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; diff --git a/austin-support/src/main/java/com/java3y/austin/utils/OkHttpUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/OkHttpUtils.java similarity index 99% rename from austin-support/src/main/java/com/java3y/austin/utils/OkHttpUtils.java rename to austin-support/src/main/java/com/java3y/austin/support/utils/OkHttpUtils.java index 3ad46d4..b72f4cf 100644 --- a/austin-support/src/main/java/com/java3y/austin/utils/OkHttpUtils.java +++ b/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; diff --git a/austin-support/src/main/java/com/java3y/austin/utils/RedisUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java similarity index 97% rename from austin-support/src/main/java/com/java3y/austin/utils/RedisUtils.java rename to austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java index ac37fd0..cb7f3e1 100644 --- a/austin-support/src/main/java/com/java3y/austin/utils/RedisUtils.java +++ b/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; diff --git a/austin-support/src/main/java/com/java3y/austin/utils/TaskInfoUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/TaskInfoUtils.java similarity index 91% rename from austin-support/src/main/java/com/java3y/austin/utils/TaskInfoUtils.java rename to austin-support/src/main/java/com/java3y/austin/support/utils/TaskInfoUtils.java index 046f24c..3a71e3f 100644 --- a/austin-support/src/main/java/com/java3y/austin/utils/TaskInfoUtils.java +++ b/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; diff --git a/austin-web/src/main/java/com/java3y/austin/config/SwaggerConfiguration.java b/austin-web/src/main/java/com/java3y/austin/web/config/SwaggerConfiguration.java similarity index 96% rename from austin-web/src/main/java/com/java3y/austin/config/SwaggerConfiguration.java rename to austin-web/src/main/java/com/java3y/austin/web/config/SwaggerConfiguration.java index 8751c85..10fa89f 100644 --- a/austin-web/src/main/java/com/java3y/austin/config/SwaggerConfiguration.java +++ b/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(); diff --git a/austin-web/src/main/java/com/java3y/austin/controller/MessageTemplateController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java similarity index 85% rename from austin-web/src/main/java/com/java3y/austin/controller/MessageTemplateController.java rename to austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java index 24406a8..e856127 100644 --- a/austin-web/src/main/java/com/java3y/austin/controller/MessageTemplateController.java +++ b/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 flatFieldName = Arrays.asList("msgContent"); + private static final List 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> result = ConvertMap.flatList(messageTemplateService.queryList(messageTemplateParam), flatFieldName); + List> 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 result = ConvertMap.flatSingle(messageTemplateService.queryById(id), flatFieldName); + Map result = ConvertMap.flatSingle(messageTemplateService.queryById(id), FLAT_FIELD_NAME); return BasicResultVO.success(result); } diff --git a/austin-web/src/main/java/com/java3y/austin/controller/SendController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/SendController.java similarity index 77% rename from austin-web/src/main/java/com/java3y/austin/controller/SendController.java rename to austin-web/src/main/java/com/java3y/austin/web/controller/SendController.java index 7d6c7c0..9259433 100644 --- a/austin-web/src/main/java/com/java3y/austin/controller/SendController.java +++ b/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; diff --git a/austin-web/src/main/java/com/java3y/austin/service/MessageTemplateService.java b/austin-web/src/main/java/com/java3y/austin/web/service/MessageTemplateService.java similarity index 81% rename from austin-web/src/main/java/com/java3y/austin/service/MessageTemplateService.java rename to austin-web/src/main/java/com/java3y/austin/web/service/MessageTemplateService.java index 63e883c..3359321 100644 --- a/austin-web/src/main/java/com/java3y/austin/service/MessageTemplateService.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/MessageTemplateService.java @@ -1,8 +1,9 @@ -package com.java3y.austin.service; +package com.java3y.austin.web.service; -import com.java3y.austin.domain.MessageTemplate; -import com.java3y.austin.vo.BasicResultVO; -import com.java3y.austin.vo.MessageTemplateParam; + +import com.java3y.austin.common.vo.BasicResultVO; +import com.java3y.austin.support.domain.MessageTemplate; +import com.java3y.austin.web.vo.MessageTemplateParam; import java.util.List; @@ -64,11 +65,15 @@ public interface MessageTemplateService { /** * 启动模板的定时任务 + * @param id + * @return */ BasicResultVO startCronTask(Long id); /** * 暂停模板的定时任务 + * @param id + * @return */ BasicResultVO stopCronTask(Long id); diff --git a/austin-web/src/main/java/com/java3y/austin/service/impl/MessageTemplateServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/web/service/impl/MessageTemplateServiceImpl.java similarity index 87% rename from austin-web/src/main/java/com/java3y/austin/service/impl/MessageTemplateServiceImpl.java rename to austin-web/src/main/java/com/java3y/austin/web/service/impl/MessageTemplateServiceImpl.java index 4471156..5a55cc7 100644 --- a/austin-web/src/main/java/com/java3y/austin/service/impl/MessageTemplateServiceImpl.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/impl/MessageTemplateServiceImpl.java @@ -1,21 +1,21 @@ -package com.java3y.austin.service.impl; +package com.java3y.austin.web.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.java3y.austin.constant.AustinConstant; -import com.java3y.austin.dao.MessageTemplateDao; -import com.java3y.austin.domain.MessageTemplate; -import com.java3y.austin.entity.XxlJobInfo; -import com.java3y.austin.enums.AuditStatus; -import com.java3y.austin.enums.MessageStatus; -import com.java3y.austin.enums.RespStatusEnum; -import com.java3y.austin.enums.TemplateType; -import com.java3y.austin.service.CronTaskService; -import com.java3y.austin.service.MessageTemplateService; -import com.java3y.austin.utils.XxlJobUtils; -import com.java3y.austin.vo.BasicResultVO; -import com.java3y.austin.vo.MessageTemplateParam; +import com.java3y.austin.common.constant.AustinConstant; +import com.java3y.austin.common.enums.AuditStatus; +import com.java3y.austin.common.enums.MessageStatus; +import com.java3y.austin.common.enums.RespStatusEnum; +import com.java3y.austin.common.enums.TemplateType; +import com.java3y.austin.common.vo.BasicResultVO; +import com.java3y.austin.cron.xxl.entity.XxlJobInfo; +import com.java3y.austin.cron.xxl.service.CronTaskService; +import com.java3y.austin.cron.xxl.utils.XxlJobUtils; +import com.java3y.austin.support.dao.MessageTemplateDao; +import com.java3y.austin.support.domain.MessageTemplate; +import com.java3y.austin.web.service.MessageTemplateService; +import com.java3y.austin.web.vo.MessageTemplateParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; diff --git a/austin-web/src/main/java/com/java3y/austin/utils/ConvertMap.java b/austin-web/src/main/java/com/java3y/austin/web/utils/ConvertMap.java similarity index 98% rename from austin-web/src/main/java/com/java3y/austin/utils/ConvertMap.java rename to austin-web/src/main/java/com/java3y/austin/web/utils/ConvertMap.java index d66d86e..239bd24 100644 --- a/austin-web/src/main/java/com/java3y/austin/utils/ConvertMap.java +++ b/austin-web/src/main/java/com/java3y/austin/web/utils/ConvertMap.java @@ -1,4 +1,4 @@ -package com.java3y.austin.utils; +package com.java3y.austin.web.utils; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ReflectUtil; diff --git a/austin-web/src/main/java/com/java3y/austin/vo/MessageTemplateParam.java b/austin-web/src/main/java/com/java3y/austin/web/vo/MessageTemplateParam.java similarity index 94% rename from austin-web/src/main/java/com/java3y/austin/vo/MessageTemplateParam.java rename to austin-web/src/main/java/com/java3y/austin/web/vo/MessageTemplateParam.java index bb362a5..6b53215 100644 --- a/austin-web/src/main/java/com/java3y/austin/vo/MessageTemplateParam.java +++ b/austin-web/src/main/java/com/java3y/austin/web/vo/MessageTemplateParam.java @@ -1,4 +1,4 @@ -package com.java3y.austin.vo; +package com.java3y.austin.web.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/austin-web/src/main/java/com/java3y/austin/vo/MessageTemplateVo.java b/austin-web/src/main/java/com/java3y/austin/web/vo/MessageTemplateVo.java similarity index 92% rename from austin-web/src/main/java/com/java3y/austin/vo/MessageTemplateVo.java rename to austin-web/src/main/java/com/java3y/austin/web/vo/MessageTemplateVo.java index d715818..0e9d27f 100644 --- a/austin-web/src/main/java/com/java3y/austin/vo/MessageTemplateVo.java +++ b/austin-web/src/main/java/com/java3y/austin/web/vo/MessageTemplateVo.java @@ -1,4 +1,4 @@ -package com.java3y.austin.vo; +package com.java3y.austin.web.vo; import lombok.AllArgsConstructor; import lombok.Builder;