diff --git a/inside-notices/pom.xml b/inside-notices/pom.xml index e1a51c24..0e4e31ad 100644 --- a/inside-notices/pom.xml +++ b/inside-notices/pom.xml @@ -50,7 +50,6 @@ cn.axzo.msgcenter msg-center-api 1.0.0-SNAPSHOT - compile org.aspectj @@ -94,67 +93,11 @@ cn.axzo.msg.center.domain msg-center-domain 1.0.0-SNAPSHOT - compile - - - cn.axzo.msg.center.domain - msg-center-domain - 1.0.0-SNAPSHOT - compile cn.axzo.msg.center msg-center-dal 1.0.0-SNAPSHOT - compile - - - cn.axzo.msg.center - msg-center-dal - 1.0.0-SNAPSHOT - compile - - - cn.axzo.msg.center - msg-center-dal - Unknown - compile - - - cn.axzo.msg.center - msg-center-dal - Unknown - compile - - - cn.axzo.msg.center - msg-center-dal - 1.0.0-SNAPSHOT - compile - - - cn.axzo.msg.center - msg-center-dal - 1.0.0-SNAPSHOT - compile - - - cn.axzo.msg.center - msg-center-dal - 1.0.0-SNAPSHOT - compile - - - cn.axzo.msg.center - msg-center-dal - 1.0.0-SNAPSHOT - compile - - - cn.axzo.msg.center - msg-center-dal - 1.0.0-SNAPSHOT - compile diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/Main.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/Main.java deleted file mode 100644 index 7ba0e1cb..00000000 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/Main.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.axzo.msg.center.api; - -public class Main { - - public static void main(String[] args) { - System.out.println("aa"); - } -} diff --git a/msg-center-dal/pom.xml b/msg-center-dal/pom.xml index 36a66d5d..eac60ae3 100644 --- a/msg-center-dal/pom.xml +++ b/msg-center-dal/pom.xml @@ -52,15 +52,11 @@ mybatis-plus-generator 3.4.1 - + cn.axzo.msg.center.domain msg-center-domain 1.0.0-SNAPSHOT - compile diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageAppDao.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageAppDao.java index 99ac8cb9..60f09fe4 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageAppDao.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageAppDao.java @@ -2,6 +2,7 @@ package cn.axzo.msg.center.dal; import cn.axzo.msg.center.domain.entity.MNSMessageApp; import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * @author zhaoyong * @since 2021-05-19 */ +@Mapper public interface MNSMessageAppDao extends IService { /** diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSBatchMessageDaoImpl.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSBatchMessageDaoImpl.java index afaa1983..4ba8f45c 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSBatchMessageDaoImpl.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSBatchMessageDaoImpl.java @@ -24,7 +24,7 @@ import java.util.Objects; * @author szg * @since 2021-08-09 */ -@Repository("batchMessageDao") +@Repository("mnsBatchMessageDao") public class MNSBatchMessageDaoImpl extends ServiceImpl implements MNSBatchMessageDao { @Resource diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSBatchMessageRequestDaoImpl.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSBatchMessageRequestDaoImpl.java index 478f6341..c5d2e66d 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSBatchMessageRequestDaoImpl.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSBatchMessageRequestDaoImpl.java @@ -21,7 +21,7 @@ import java.util.Objects; * @author szg * @since 2021-08-09 */ -@Repository("batchMessageRequestDao") +@Repository("mnsBatchMessageRequestDao") public class MNSBatchMessageRequestDaoImpl extends ServiceImpl implements MNSBatchMessageRequestDao { diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSChannelMessageTemplateDaoImpl.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSChannelMessageTemplateDaoImpl.java index 2d9d1f1e..3d91b0c2 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSChannelMessageTemplateDaoImpl.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSChannelMessageTemplateDaoImpl.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository; * @author zhaoyong * @since 2021-05-19 */ -@Repository("channelMessageTemplateDao") +@Repository("mnsChannelMessageTemplateDao") public class MNSChannelMessageTemplateDaoImpl extends ServiceImpl implements MNSChannelMessageTemplateDao { @Override diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMNSMessageRedoDaoImpl.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMNSMessageRedoDaoImpl.java index 6a7537fa..d12b83f8 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMNSMessageRedoDaoImpl.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMNSMessageRedoDaoImpl.java @@ -14,7 +14,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; -@Repository("messageRedoDao") +@Repository("mnsMessageRedoDao") public class MNSMNSMessageRedoDaoImpl extends ServiceImpl implements MNSMessageRedoDao { @Override diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageAppDaoImpl.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageAppDaoImpl.java index 094d5237..86f1cc70 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageAppDaoImpl.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageAppDaoImpl.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository; * @author zhaoyong * @since 2021-05-19 */ -@Repository("messageAppDao") +@Repository("mnsMessageAppDao") public class MNSMessageAppDaoImpl extends ServiceImpl implements MNSMessageAppDao { @Override diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageChannelDaoImpl.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageChannelDaoImpl.java index 3fa85123..e4fb9d9a 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageChannelDaoImpl.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageChannelDaoImpl.java @@ -17,7 +17,7 @@ import java.util.List; * @author zhaoyong * @since 2021-05-19 */ -@Repository("messageChannelDao") +@Repository("mnsMessageChannelDao") public class MNSMessageChannelDaoImpl extends ServiceImpl implements MNSMessageChannelDao { @Override diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageChannelLogDaoImpl.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageChannelLogDaoImpl.java index 4ad19359..0d818b59 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageChannelLogDaoImpl.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageChannelLogDaoImpl.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository; * @author zhaoyong * @since 2021-05-19 */ -@Repository("messageChannelLogDao") +@Repository("mnsMessageChannelLogDao") public class MNSMessageChannelLogDaoImpl extends ServiceImpl implements MNSMessageChannelLogDao { @Override diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageDaoImpl.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageDaoImpl.java index 0a9cd485..3b9a55bb 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageDaoImpl.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageDaoImpl.java @@ -23,7 +23,7 @@ import java.util.Date; * @author zhaoyong * @since 2021-05-19 */ -@Repository("messageDao") +@Repository("mnsMessageDao") public class MNSMessageDaoImpl extends ServiceImpl implements MNSMessageDao { @Override diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageRequestLogDaoImpl.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageRequestLogDaoImpl.java index 8f9a19f9..d0892c84 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageRequestLogDaoImpl.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageRequestLogDaoImpl.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository; * @author zhaoyong * @since 2021-05-19 */ -@Repository("messageRequestLogDao") +@Repository("mnsMessageRequestLogDao") public class MNSMessageRequestLogDaoImpl extends ServiceImpl implements MNSMessageRequestLogDao { } diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageTemplateParamDaoImpl.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageTemplateParamDaoImpl.java index f0861b83..459ae986 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageTemplateParamDaoImpl.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageTemplateParamDaoImpl.java @@ -17,7 +17,7 @@ import java.util.List; * @author szg * @since 2021-08-07 */ -@Repository("messageTemplateParamDao") +@Repository("mnsMessageTemplateParamDao") public class MNSMessageTemplateParamDaoImpl extends ServiceImpl implements MNSMessageTemplateParamDao { diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageTemplateMapper.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageTemplateMapper.java index bf86737b..ef617a9b 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageTemplateMapper.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageTemplateMapper.java @@ -2,6 +2,7 @@ package cn.axzo.msg.center.dal.mapper; import cn.axzo.msg.center.domain.entity.MNSMessageTemplate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; /** diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageModuleMapper.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageModuleMapper.java index 7c31441c..76013702 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageModuleMapper.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageModuleMapper.java @@ -17,7 +17,7 @@ import java.util.Set; * @author zhangran * @since 2022-03-28 14:59:16 */ -@Mapper +/*@Mapper*/ public interface MessageModuleMapper extends BaseMapper{ diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRecordMapper.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRecordMapper.java index 0f2617c6..60c629ef 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRecordMapper.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRecordMapper.java @@ -18,7 +18,7 @@ import java.util.List; * @author zhangran * @since 2022-03-28 14:59:16 */ -@Mapper +/*@Mapper*/ public interface MessageRecordMapper extends BaseMapper{ diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRelationMapper.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRelationMapper.java index 86b13eae..ee6e6904 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRelationMapper.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRelationMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; * @author zhangran * @since 2022-03-28 14:59:16 */ -@Mapper +/*@Mapper*/ public interface MessageRelationMapper extends BaseMapper{ diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRouterMapper.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRouterMapper.java index 0a93696e..33dd91bf 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRouterMapper.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRouterMapper.java @@ -15,7 +15,7 @@ import java.util.List; * @author zhangran * @since 2022-03-28 14:59:16 */ -@Mapper +/*@Mapper*/ public interface MessageRouterMapper extends BaseMapper { diff --git a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageTemplateMapper.java b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageTemplateMapper.java index 31287ae2..4014f61c 100644 --- a/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageTemplateMapper.java +++ b/msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageTemplateMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; * @author zhangran * @since 2022-03-28 14:59:16 */ -@Mapper +/*@Mapper*/ public interface MessageTemplateMapper extends BaseMapper{ diff --git a/msg-center-domain/pom.xml b/msg-center-domain/pom.xml index 3b7bd51b..7f2d1c4c 100644 --- a/msg-center-domain/pom.xml +++ b/msg-center-domain/pom.xml @@ -22,13 +22,11 @@ cn.axzo.msgcenter msg-center-api 1.0.0-SNAPSHOT - compile cn.axzo.msg.notices.common msg-notices-common 1.0.0-SNAPSHOT - compile diff --git a/msg-center-webapi/pom.xml b/msg-center-webapi/pom.xml index 0dab1519..1e21915c 100644 --- a/msg-center-webapi/pom.xml +++ b/msg-center-webapi/pom.xml @@ -36,13 +36,11 @@ cn.axzo.msgcenter inside-notices 1.0.0-SNAPSHOT - compile cn.axzo.msg.notices.service.api msg-notices-service-api 1.0.0-SNAPSHOT - compile \ No newline at end of file diff --git a/msg-center-webapi/src/main/java/cn/axzo/msg/center/webapi/MessageNotifyController.java b/msg-center-webapi/src/main/java/cn/axzo/msg/center/webapi/MessageNotifyController.java index 4ea7542d..8515c98f 100644 --- a/msg-center-webapi/src/main/java/cn/axzo/msg/center/webapi/MessageNotifyController.java +++ b/msg-center-webapi/src/main/java/cn/axzo/msg/center/webapi/MessageNotifyController.java @@ -8,6 +8,7 @@ import cn.azxo.framework.common.logger.MethodAroundLog; import cn.azxo.framework.common.model.CommonResponse; import cn.azxo.framework.common.utils.LogUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/msg-notices/msg-notices-client/pom.xml b/msg-notices/msg-notices-client/pom.xml index e9555000..4837e6a6 100644 --- a/msg-notices/msg-notices-client/pom.xml +++ b/msg-notices/msg-notices-client/pom.xml @@ -64,25 +64,21 @@ cn.axzo.msg.notices.service.api msg-notices-service-api 1.0.0-SNAPSHOT - compile cn.axzo.msg.notices.common msg-notices-common 1.0.0-SNAPSHOT - compile cn.axzo.msg.notices.integration msg-notices-integration 1.0.0-SNAPSHOT - compile cn.axzo.msg.notices.http.api msg-notices-http-api 1.0.0-SNAPSHOT - compile diff --git a/msg-notices/msg-notices-manager-api/pom.xml b/msg-notices/msg-notices-manager-api/pom.xml index cee37e19..f80b6ebf 100644 --- a/msg-notices/msg-notices-manager-api/pom.xml +++ b/msg-notices/msg-notices-manager-api/pom.xml @@ -20,29 +20,15 @@ - - cn.axzo.msg.notices.dao - msg-notices-dao - 1.0.0-SNAPSHOT - compile - cn.axzo.msg.notices.common msg-notices-common 1.0.0-SNAPSHOT - compile cn.axzo.msg.center.domain msg-center-domain 1.0.0-SNAPSHOT - compile - - - cn.axzo.msg.center.domain - msg-center-domain - 1.0.0-SNAPSHOT - compile \ No newline at end of file diff --git a/msg-notices/msg-notices-manager/pom.xml b/msg-notices/msg-notices-manager/pom.xml index 6c24fe82..34445eea 100644 --- a/msg-notices/msg-notices-manager/pom.xml +++ b/msg-notices/msg-notices-manager/pom.xml @@ -36,31 +36,16 @@ cn.axzo.msg.notices.manager.api msg-notices-manager-api 1.0.0-SNAPSHOT - compile - - - cn.axzo.msg.notices.dao - msg-notices-dao - 1.0.0-SNAPSHOT - compile cn.axzo.msg.notices.integration msg-notices-integration 1.0.0-SNAPSHOT - compile cn.axzo.msg.center msg-center-dal 1.0.0-SNAPSHOT - compile - - - cn.axzo.msg.center - msg-center-dal - 1.0.0-SNAPSHOT - compile diff --git a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/BatchMessageMangerImpl.java b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/BatchMessageMangerImpl.java index b5ecd0e3..d5696214 100644 --- a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/BatchMessageMangerImpl.java +++ b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/BatchMessageMangerImpl.java @@ -42,11 +42,11 @@ import java.util.Objects; @Slf4j public class BatchMessageMangerImpl implements BatchMessageManger { - @Resource(name = "messageDao") - private MNSMessageDao messageDao; + @Resource + private MNSMessageDao mnsMessageDao; - @Resource(name = "batchMessageDao") - private MNSBatchMessageDao batchMessageDao; + @Resource + private MNSBatchMessageDao mnsBatchMessageDao; @Resource(name = "transactionTemplate") private TransactionTemplate transactionTemplate; @@ -61,7 +61,7 @@ public class BatchMessageMangerImpl implements BatchMessageManger { public Page queryByPage(BatchMessageRequestDto requestDto) { BatchMessageQuery query = new BatchMessageQuery(); BeanUtils.copyProperties(requestDto, query); - IPage messagePage = batchMessageDao.queryByPage(query); + IPage messagePage = mnsBatchMessageDao.queryByPage(query); if (messagePage == null) { log.info("BatchMessageMangerImpl.queryByPage result is null"); return null; @@ -76,7 +76,7 @@ public class BatchMessageMangerImpl implements BatchMessageManger { @Override public MNSBatchMessage queryBatchMessage(String batchNo) { - return batchMessageDao.queryBatchMessage(batchNo); + return mnsBatchMessageDao.queryBatchMessage(batchNo); } @Override @@ -87,10 +87,10 @@ public class BatchMessageMangerImpl implements BatchMessageManger { return false; } return transactionTemplate.execute(status -> { - Boolean updateRes = batchMessageDao + Boolean updateRes = mnsBatchMessageDao .updateStatusById(batchMessage.getId(), BatchMessageStatusEnum.SPLIT_COMPLETED.getCode()); if (updateRes) { - return messageDao.saveBatch(messages); + return mnsMessageDao.saveBatch(messages); } return false; }); @@ -105,7 +105,7 @@ public class BatchMessageMangerImpl implements BatchMessageManger { BatchMessageSendRequestDto requestDto = genericConversionService .convert(batchMessage, BatchMessageSendRequestDto.class); //1.变更状态 - batchMessageDao.updateStatusById(batchMessage.getId(),BatchMessageStatusEnum.PROCESSING.getCode()); + mnsBatchMessageDao.updateStatusById(batchMessage.getId(),BatchMessageStatusEnum.PROCESSING.getCode()); //2.发送消息 try { log.info("开始发送短信批次->BatchMessageMangerImpl.sendBatchMessageAndHandleReceipt BatchMessage = {}", diff --git a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/BatchMessageRequestMangerImpl.java b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/BatchMessageRequestMangerImpl.java index e9bc18d2..ad55b1e4 100644 --- a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/BatchMessageRequestMangerImpl.java +++ b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/BatchMessageRequestMangerImpl.java @@ -45,10 +45,10 @@ import java.util.stream.Collectors; public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger { @Resource - private MNSBatchMessageRequestDao batchMessageRequestDao; + private MNSBatchMessageRequestDao mnsBatchMessageRequestDao; @Resource - private MNSBatchMessageDao batchMessageDao; + private MNSBatchMessageDao mnsBatchMessageDao; @Resource(name = "transactionTemplate") private TransactionTemplate transactionTemplate; @@ -58,7 +58,7 @@ public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger @Override public boolean saveBatchMessageRequest(MNSBatchMessageRequest batchMessageRequest) { - return batchMessageRequestDao.save(batchMessageRequest); + return mnsBatchMessageRequestDao.save(batchMessageRequest); } @Override @@ -66,7 +66,7 @@ public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger BatchMessageRequestDto requestDto) { BatchMessageRequestQuery query = new BatchMessageRequestQuery(); BeanUtils.copyProperties(requestDto, query); - IPage messagePage = batchMessageRequestDao.queryByPage(query); + IPage messagePage = mnsBatchMessageRequestDao.queryByPage(query); if (messagePage == null) { return null; } @@ -104,10 +104,10 @@ public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger } boolean result = transactionTemplate.execute(status ->{ - boolean updateRes = batchMessageRequestDao.updateStatusById(batchMessageRequest.getId(), + boolean updateRes = mnsBatchMessageRequestDao.updateStatusById(batchMessageRequest.getId(), BatchMessageRequestStatusEnum.SPLIT_COMPLETED.getCode()); if (updateRes){ - return batchMessageDao.saveBatch(batchMessageList); + return mnsBatchMessageDao.saveBatch(batchMessageList); } return false; }); @@ -121,12 +121,12 @@ public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger @Override public MNSBatchMessageRequest queryBatchMessage(String appCode, String requestNo) { - return batchMessageRequestDao.queryBatchMessage(appCode, requestNo); + return mnsBatchMessageRequestDao.queryBatchMessage(appCode, requestNo); } @Override public boolean updateRequestSuccess(String remark, Long id) { - return batchMessageRequestDao.updateRequestSuccess(remark, id); + return mnsBatchMessageRequestDao.updateRequestSuccess(remark, id); } @Override @@ -136,7 +136,7 @@ public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger return; } // 统计 batch_message - BatchMessageStatisticsResponseDto responseDto = batchMessageDao + BatchMessageStatisticsResponseDto responseDto = mnsBatchMessageDao .getStatisticsMessageInfo(request.getAppNo(), request.getRequestNo()); if (Objects.isNull(responseDto)) { @@ -149,7 +149,7 @@ public class BatchMessageRequestMangerImpl implements BatchMessageRequestManger Integer batchMessageRequestStatus = getBatchMessageRequestStatus(request, responseDto); //更新此次统计 - batchMessageRequestDao + mnsBatchMessageRequestDao .updateBatchMessageRequestInfoById(request.getId(), batchMessageRequestStatus, responseDto.getSuccessCount(), responseDto.getFailCount()); } diff --git a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/ChuangLanSmsSendManagerImpl.java b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/ChuangLanSmsSendManagerImpl.java index dde4728a..c037ede1 100644 --- a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/ChuangLanSmsSendManagerImpl.java +++ b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/ChuangLanSmsSendManagerImpl.java @@ -43,14 +43,14 @@ public class ChuangLanSmsSendManagerImpl implements SmsSendManager { @Resource(name = "chuangLanSmsClient") private ChuangLanSmsClient chuangLanSmsClient; - @Resource(name = "channelMessageTemplateDao") - private MNSChannelMessageTemplateDao templateDao; + @Resource + private MNSChannelMessageTemplateDao mnsChannelMessageTemplateDao; - @Resource(name = "messageDao") - private MNSMessageDao messageDao; + @Resource + private MNSMessageDao mnsMessageDao; - @Resource(name = "batchMessageDao") - private MNSBatchMessageDao batchMessageDao; + @Resource + private MNSBatchMessageDao mnsBatchMessageDao; @Resource(name = "dingDingClient") private DingDingClient dingDingClient; @@ -75,7 +75,7 @@ public class ChuangLanSmsSendManagerImpl implements SmsSendManager { String channelCode = MessageChannelEnum.CHUANG_LAN.getCode(); // 获取渠道模板 MNSChannelMessageTemplate template = - templateDao.queryByTemplateNo(requestDto.getInnerTemplateNo(), channelCode); + mnsChannelMessageTemplateDao.queryByTemplateNo(requestDto.getInnerTemplateNo(), channelCode); BizException.error(template != null, ReturnCodeEnum.SYSTEM_ERROR, "渠道模板不能为空"); MessageRequest request = new MessageRequest(); @@ -109,13 +109,13 @@ public class ChuangLanSmsSendManagerImpl implements SmsSendManager { // 获取渠道模板 MNSChannelMessageTemplate template = - templateDao.queryByTemplateNo(requestDto.getInnerTemplateNo(), channelCode); + mnsChannelMessageTemplateDao.queryByTemplateNo(requestDto.getInnerTemplateNo(), channelCode); BizException.error(template != null, ReturnCodeEnum.SYSTEM_ERROR, "渠道模板不能为空"); // 修改批量短信渠道和渠道模板 transactionTemplate.executeWithoutResult(status -> { - batchMessageDao.updateChannelInfo(channelCode, template.getTemplateNo(), requestDto.getBatchNo()); - messageDao.updateBatchMessageChannelInfo(channelCode, channelName, requestDto.getBatchNo()); + mnsBatchMessageDao.updateChannelInfo(channelCode, template.getTemplateNo(), requestDto.getBatchNo()); + mnsMessageDao.updateBatchMessageChannelInfo(channelCode, channelName, requestDto.getBatchNo()); }); MessageRequest request = new MessageRequest(); @@ -170,7 +170,7 @@ public class ChuangLanSmsSendManagerImpl implements SmsSendManager { batchMessage.setFailCount(response.getFailNum()); batchMessage.setSubmitFailNum(response.getFailNum()); batchMessage.setSubmitSuccessNum(response.getSuccessNum()); - batchMessageDao.updateBatchMessage(batchMessage, requestDto.getBatchNo()); + mnsBatchMessageDao.updateBatchMessage(batchMessage, requestDto.getBatchNo()); } /** @@ -187,10 +187,10 @@ public class ChuangLanSmsSendManagerImpl implements SmsSendManager { batchMessage.setChannelReturnCode(response.getCode()); batchMessage.setChannelErrorMsg(response.getErrorMsg()); batchMessage.setChannelMsgId(response.getMsgId()); - batchMessageDao.updateBatchMessage(batchMessage, requestDto.getBatchNo()); + mnsBatchMessageDao.updateBatchMessage(batchMessage, requestDto.getBatchNo()); // 更新 message 表 - messageDao.updateAllBatchMessageFail(response.getErrorMsg(), requestDto.getBatchNo()); + mnsMessageDao.updateAllBatchMessageFail(response.getErrorMsg(), requestDto.getBatchNo()); // 事务提交后操作 doAfterCommit(requestDto, response, null); @@ -210,10 +210,10 @@ public class ChuangLanSmsSendManagerImpl implements SmsSendManager { batchMessage.setFailCount(batchSize); batchMessage.setSubmitFailNum(batchSize); batchMessage.setChannelErrorMsg(e.getMessage()); - batchMessageDao.updateBatchMessage(batchMessage, requestDto.getBatchNo()); + mnsBatchMessageDao.updateBatchMessage(batchMessage, requestDto.getBatchNo()); // 更新 message 表 - messageDao.updateAllBatchMessageFail(e.getMessage(), requestDto.getBatchNo()); + mnsMessageDao.updateAllBatchMessageFail(e.getMessage(), requestDto.getBatchNo()); // 事务提交后操作 doAfterCommit(requestDto, null, e); diff --git a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageChannelRouteImpl.java b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageChannelRouteImpl.java index 36954d16..74ea38a8 100644 --- a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageChannelRouteImpl.java +++ b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageChannelRouteImpl.java @@ -29,12 +29,12 @@ import java.util.Optional; @Service("messageChannelRoute") public class MessageChannelRouteImpl implements MessageChannelRouter { - @Resource(name = "messageChannelDao") - private MNSMessageChannelDao messageChannelDao; + @Resource + private MNSMessageChannelDao mnsMessageChannelDao; @Override public MNSMessageChannel route(String condition) { - List messageChannels = messageChannelDao.queryAvailable(); + List messageChannels = mnsMessageChannelDao.queryAvailable(); BizException.error(CollectionUtils.isNotEmpty(messageChannels), ReturnCodeEnum.MESSAGE_CHANNEL_NOT_VALID); Optional messageChannelOptional = messageChannels.stream() diff --git a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageManagerImpl.java b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageManagerImpl.java index 05f6bedd..5064dae7 100644 --- a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageManagerImpl.java +++ b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageManagerImpl.java @@ -30,11 +30,11 @@ import java.util.Objects; @Service("messageManager") public class MessageManagerImpl implements MessageManager { - @Resource(name = "messageDao") - private MNSMessageDao messageDao; + @Resource + private MNSMessageDao mnsMessageDao; - @Resource(name = "messageRedoDao") - private MNSMessageRedoDao messageRedoDao; + @Resource + private MNSMessageRedoDao mnsMessageRedoDao; @Resource(name = "transactionTemplate") private TransactionTemplate transactionTemplate; @@ -43,7 +43,7 @@ public class MessageManagerImpl implements MessageManager { public Page queryPageByMessageQueryRequestDto(MessageQueryRequestDto requestDto) { MessageQuery query = new MessageQuery(); BeanUtils.copyProperties(requestDto, query); - IPage messagePage = messageDao.queryByPage(query); + IPage messagePage = mnsMessageDao.queryByPage(query); if (messagePage == null) { return null; } @@ -57,17 +57,17 @@ public class MessageManagerImpl implements MessageManager { @Override public boolean saveMessage(MNSMessage message) { - return messageDao.save(message); + return mnsMessageDao.save(message); } @Override public boolean saveMessageRedo(MNSMessageRedo messageRedo) { - return messageRedoDao.save(messageRedo); + return mnsMessageRedoDao.save(messageRedo); } @Override public boolean updateToProcessing(String bizId, String requestId, Long id) { - return messageDao.lambdaUpdate() + return mnsMessageDao.lambdaUpdate() .set(StringUtils.isNoneBlank(bizId), MNSMessage::getChannelBizId, bizId) .set(StringUtils.isNoneBlank(requestId), MNSMessage::getChannelRequestId, requestId) .set(MNSMessage::getStatus, MessageStatusEnum.PROCESSING.getCode()) @@ -79,7 +79,7 @@ public class MessageManagerImpl implements MessageManager { @Override public boolean updateToFail(Long id) { - return messageDao.lambdaUpdate() + return mnsMessageDao.lambdaUpdate() .set(MNSMessage::getStatus, MessageStatusEnum.FAIL.getCode()) .set(MNSMessage::getUpdateAt, new Date()) .eq(MNSMessage::getId, id) @@ -90,14 +90,14 @@ public class MessageManagerImpl implements MessageManager { @Override public boolean updateToException(MNSMessageRedo messageRedo, Long id) { return transactionTemplate.execute(status -> { - messageDao.channelException(id); - return messageRedoDao.save(messageRedo); + mnsMessageDao.channelException(id); + return mnsMessageRedoDao.save(messageRedo); }); } @Override public boolean updateExceptionToQueryStatus(String targetStatus, Long id) { - return messageDao.lambdaUpdate().eq(MNSMessage::getId, id) + return mnsMessageDao.lambdaUpdate().eq(MNSMessage::getId, id) .eq(MNSMessage::getStatus, MessageStatusEnum.EXCEPTION.getCode()) .set(MNSMessage::getStatus, targetStatus) .update(); @@ -107,7 +107,7 @@ public class MessageManagerImpl implements MessageManager { @Override public MNSMessage queryMessageByMessageOrderNoAndPhoneNumber(String messageOrderNo, String channelBizId, String phoneNumber) { - return messageDao.lambdaQuery() + return mnsMessageDao.lambdaQuery() .eq(Objects.nonNull(messageOrderNo), MNSMessage::getMessageOrderNo, messageOrderNo) .eq(Objects.nonNull(channelBizId), MNSMessage::getChannelBizId, channelBizId) .eq(MNSMessage::getTargetAddress, phoneNumber) @@ -117,7 +117,7 @@ public class MessageManagerImpl implements MessageManager { @Override public boolean updateProcessingMessageStatusById(Long id, String status) { - return messageDao + return mnsMessageDao .lambdaUpdate() .eq(MNSMessage::getId, id) .eq(MNSMessage::getIsDelete, 0) @@ -128,7 +128,7 @@ public class MessageManagerImpl implements MessageManager { @Override public boolean updateMessageStatusByMessageOrderNo(String messageOrderNo, String status) { - return messageDao + return mnsMessageDao .lambdaUpdate() .eq(MNSMessage::getMessageOrderNo, messageOrderNo) .eq(MNSMessage::getIsDelete, 0) @@ -138,7 +138,7 @@ public class MessageManagerImpl implements MessageManager { @Override public boolean updateToSuccess(String bizId, String requestId, Long id) { - return messageDao.lambdaUpdate() + return mnsMessageDao.lambdaUpdate() .set(StringUtils.isNoneBlank(bizId), MNSMessage::getChannelBizId, bizId) .set(StringUtils.isNoneBlank(requestId), MNSMessage::getChannelRequestId, requestId) .set(MNSMessage::getStatus, MessageStatusEnum.SUCCESS.getCode()) diff --git a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageRedoMangerImpl.java b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageRedoMangerImpl.java index fc267a30..babccc1f 100644 --- a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageRedoMangerImpl.java +++ b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageRedoMangerImpl.java @@ -27,11 +27,11 @@ import java.util.Date; @Service("messageRedoManger") public class MessageRedoMangerImpl implements MessageRedoManger { - @Resource(name = "messageDao") - private MNSMessageDao messageDao; + @Resource + private MNSMessageDao mnsMessageDao; @Resource - private MNSMessageRedoDao messageRedoDao; + private MNSMessageRedoDao mnsMessageRedoDao; @Resource(name = "transactionTemplate") private TransactionTemplate transactionTemplate; @@ -40,7 +40,7 @@ public class MessageRedoMangerImpl implements MessageRedoManger { public Page queryPageByMessageRedoQueryRequestDto(MessageRedoQueryRequestDto requestDto) { MessageRedoQuery query = new MessageRedoQuery(); BeanUtils.copyProperties(requestDto, query); - IPage messagePage = messageRedoDao.queryByPage(query); + IPage messagePage = mnsMessageRedoDao.queryByPage(query); if (messagePage == null) { return null; } @@ -54,7 +54,7 @@ public class MessageRedoMangerImpl implements MessageRedoManger { @Override public MNSMessageRedo queryMessageRedoByRedoOrderNoAndPhoneNumber(String redoOrderNo, String bizId, String phoneNumber) { - return messageRedoDao.lambdaQuery() + return mnsMessageRedoDao.lambdaQuery() .eq(!StringUtils.isEmpty(redoOrderNo), MNSMessageRedo::getRedoOrderNo,redoOrderNo) .eq(!StringUtils.isEmpty(bizId), MNSMessageRedo::getChannelBizId,bizId) .eq(MNSMessageRedo::getTargetAddress,phoneNumber) @@ -64,7 +64,7 @@ public class MessageRedoMangerImpl implements MessageRedoManger { @Override public boolean updateMessageRedoStatusById(Long id, String oldStatus, String newStatus) { - messageRedoDao.lambdaUpdate() + mnsMessageRedoDao.lambdaUpdate() .set(MNSMessageRedo::getStatus,newStatus) .eq(MNSMessageRedo::getStatus,oldStatus) .eq(MNSMessageRedo::getId,id) @@ -97,7 +97,7 @@ public class MessageRedoMangerImpl implements MessageRedoManger { public boolean lockMessage(MessageContext context, Long id) { Integer retryCount = context.getRetryCount() + 1; context.setRetryCount(retryCount); - return messageRedoDao.lambdaUpdate() + return mnsMessageRedoDao.lambdaUpdate() .set(MNSMessageRedo::getRetryCount, retryCount) .set(MNSMessageRedo::getRetryingFlag, RetryingFlagEnum.N.name()) .eq(MNSMessageRedo::getId, id).update(); @@ -105,7 +105,7 @@ public class MessageRedoMangerImpl implements MessageRedoManger { @Override public boolean updateRetry(Date retryAt, Long id) { - return messageRedoDao.lambdaUpdate() + return mnsMessageRedoDao.lambdaUpdate() .set(MNSMessageRedo::getRetryAt, retryAt) .set(MNSMessageRedo::getRetryingFlag, RetryingFlagEnum.Y.name()) .eq(MNSMessageRedo::getId, id) @@ -115,14 +115,14 @@ public class MessageRedoMangerImpl implements MessageRedoManger { @Override public boolean updateExceptionToFail(Long id, String messageOrderNo) { return transactionTemplate.execute(status -> { - messageRedoDao.updateExceptionToFail(id); - return messageDao.updateExceptionToFail(messageOrderNo); + mnsMessageRedoDao.updateExceptionToFail(id); + return mnsMessageDao.updateExceptionToFail(messageOrderNo); }); } @Override public boolean updateMessageRedoChannelById(Long id, String bizId,String redoMessageNo) { - return messageRedoDao.lambdaUpdate() + return mnsMessageRedoDao.lambdaUpdate() .set(MNSMessageRedo::getChannelBizId, bizId) .set(MNSMessageRedo::getRedoOrderNo,redoMessageNo) .eq(MNSMessageRedo::getId, id) diff --git a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageRequestLogManagerImpl.java b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageRequestLogManagerImpl.java index 6a1ad516..b720d88d 100644 --- a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageRequestLogManagerImpl.java +++ b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageRequestLogManagerImpl.java @@ -17,18 +17,18 @@ import javax.annotation.Resource; @Service("messageRequestLogManager") public class MessageRequestLogManagerImpl implements MessageRequestLogManager { - @Resource(name = "messageRequestLogDao") - private MNSMessageRequestLogDao messageRequestLogDao; + @Resource + private MNSMessageRequestLogDao mnsMessageRequestLogDao; @Override public Long saveRequestLog(MNSMessageRequestLog requestLog) { - messageRequestLogDao.save(requestLog); + mnsMessageRequestLogDao.save(requestLog); return requestLog.getId(); } @Override public boolean updateRequestLog(String responseBody, Long id) { - return messageRequestLogDao.lambdaUpdate() + return mnsMessageRequestLogDao.lambdaUpdate() .set(MNSMessageRequestLog::getResponseBody, responseBody) .eq(MNSMessageRequestLog::getId, id) .update(); diff --git a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageTemplateManagerImpl.java b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageTemplateManagerImpl.java index 31805f2f..d8883158 100644 --- a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageTemplateManagerImpl.java +++ b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageTemplateManagerImpl.java @@ -25,18 +25,18 @@ import java.util.List; @Service("messageTemplateManager") public class MessageTemplateManagerImpl implements MessageTemplateManager { - @Resource(name = "messageTemplateDao") - private MNSMessageTemplateDao messageTemplateDao; + @Resource + private MNSMessageTemplateDao mnsMessageTemplateDao; - @Resource(name = "channelMessageTemplateDao") - private MNSChannelMessageTemplateDao channelMessageTemplateDao; + @Resource + private MNSChannelMessageTemplateDao mnsChannelMessageTemplateDao; @Resource(name = "messageTemplateParamManager") private MessageTemplateParamManager messageTemplateParamManager; @Override public MNSMessageTemplate queryAndCheckInnerTemplate(String innerTemplateNo) { - MNSMessageTemplate messageTemplate = messageTemplateDao.queryByTemplateNo(innerTemplateNo); + MNSMessageTemplate messageTemplate = mnsMessageTemplateDao.queryByTemplateNo(innerTemplateNo); BizException.error(messageTemplate != null, ReturnCodeEnum.MESSAGE_TEMPLATE_NOT_EXIST); BizException .error(AvailableStatusEnum.AVAILABLE.getStatus().equals(messageTemplate.getStatus()), @@ -46,7 +46,7 @@ public class MessageTemplateManagerImpl implements MessageTemplateManager { @Override public MNSChannelMessageTemplate queryChannelTemplate(String innerTemplateNo, String channelCode) { - MNSChannelMessageTemplate channelMessageTemplate = channelMessageTemplateDao + MNSChannelMessageTemplate channelMessageTemplate = mnsChannelMessageTemplateDao .queryByTemplateNo(innerTemplateNo, channelCode); BizException.error(channelMessageTemplate != null, ReturnCodeEnum.MESSAGE_TEMPLATE_NOT_EXIST); BizException diff --git a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageTemplateParamManagerImpl.java b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageTemplateParamManagerImpl.java index 84003f6f..66463c0f 100644 --- a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageTemplateParamManagerImpl.java +++ b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/MessageTemplateParamManagerImpl.java @@ -32,15 +32,15 @@ import static cn.axzo.msg.center.notices.common.constans.CacheConstants.*; @Service("messageTemplateParamManager") public class MessageTemplateParamManagerImpl implements MessageTemplateParamManager { - @Resource(name = "messageTemplateParamDao") - private MNSMessageTemplateParamDao messageTemplateParamDao; + @Resource + private MNSMessageTemplateParamDao mnsMessageTemplateParamDao; @Resource(name = "stringRedisTemplate") private StringRedisTemplate stringRedisTemplate; @PostConstruct public void init() { - List templateParams = messageTemplateParamDao.getAllMessageTemplateParams(); + List templateParams = mnsMessageTemplateParamDao.getAllMessageTemplateParams(); if(CollectionUtils.isEmpty(templateParams)) { log.info("MessageTemplateParamManager.init message template params size is zero"); @@ -82,7 +82,7 @@ public class MessageTemplateParamManagerImpl implements MessageTemplateParamMana } // 查询数据库信息 - List result = messageTemplateParamDao.getByTemplateNo(templateCode); + List result = mnsMessageTemplateParamDao.getByTemplateNo(templateCode); if(result == null) { // 防止缓存恶意穿透 stringRedisTemplate.opsForValue().set(cacheKey, REDIS_NULL_VALUE, NULL_VALUE_CACHE_SECONDS, TimeUnit.SECONDS); diff --git a/msg-notices/msg-notices-service-api/pom.xml b/msg-notices/msg-notices-service-api/pom.xml index 69bacdc0..be60a3e9 100644 --- a/msg-notices/msg-notices-service-api/pom.xml +++ b/msg-notices/msg-notices-service-api/pom.xml @@ -24,13 +24,11 @@ cn.axzo.msg.notices.manager.api msg-notices-manager-api 1.0.0-SNAPSHOT - compile cn.axzo.msg.notices.common msg-notices-common 1.0.0-SNAPSHOT - compile \ No newline at end of file diff --git a/msg-notices/msg-notices-service/pom.xml b/msg-notices/msg-notices-service/pom.xml index 12893a0c..a6e76294 100644 --- a/msg-notices/msg-notices-service/pom.xml +++ b/msg-notices/msg-notices-service/pom.xml @@ -28,43 +28,26 @@ cn.axzo.msg.notices.service.api msg-notices-service-api 1.0.0-SNAPSHOT - compile - - - cn.axzo.msg.notices.dao - msg-notices-dao - 1.0.0-SNAPSHOT - compile cn.axzo.msg.notices.manager.api msg-notices-manager-api 1.0.0-SNAPSHOT - compile cn.axzo.msg.notices.integration msg-notices-integration 1.0.0-SNAPSHOT - compile cn.axzo.msg.notices.manager msg-notices-manager 1.0.0-SNAPSHOT - compile cn.axzo.msg.center msg-center-dal 1.0.0-SNAPSHOT - compile - - - cn.axzo.msg.center - msg-center-dal - 1.0.0-SNAPSHOT - compile diff --git a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/MessageCallbackServiceImpl.java b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/MessageCallbackServiceImpl.java index ea6bcf5d..64f7acc2 100644 --- a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/MessageCallbackServiceImpl.java +++ b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/MessageCallbackServiceImpl.java @@ -46,14 +46,14 @@ public class MessageCallbackServiceImpl implements MessageCallbackService { @Resource(name = "messageRedoManger") private MessageRedoManger messageRedoManger; - @Resource(name = "messageDao") - private MNSMessageDao messageDao; + @Resource + private MNSMessageDao mnsMessageDao; - @Resource(name = "messageChannelLogDao") - private MNSMessageChannelLogDao messageChannelLogDao; + @Resource + private MNSMessageChannelLogDao mnsMessageChannelLogDao; - @Resource(name = "batchMessageDao") - private MNSBatchMessageDao batchMessageDao; + @Resource + private MNSBatchMessageDao mnsBatchMessageDao; @Resource(name = "transactionTemplate") private TransactionTemplate transactionTemplate; @@ -108,7 +108,7 @@ public class MessageCallbackServiceImpl implements MessageCallbackService { try { if(MessageSendTypeEnum.SINGLE.getCode().equals(request.getUid())) { transactionTemplate.executeWithoutResult(status -> { - MNSMessage message = messageDao + MNSMessage message = mnsMessageDao .getByChannelMsgId(request.getMsgid(), request.getMobile()); if (Objects.isNull(message)) { log.info("创蓝短信回调 MessageCallbackServiceImpl.chuangLanCallbackHandle message is null"); @@ -118,14 +118,14 @@ public class MessageCallbackServiceImpl implements MessageCallbackService { if (Objects.equals(request.getStatus(), ChuangLanConstants.MESSAGE_CALLBACK_SUCCESS_STATUS)) { messageStatus = MessageStatusEnum.SUCCESS.getCode(); } - messageDao + mnsMessageDao .updateStatusAndRemarkById(message.getId(), messageStatus, request.getStatusDesc()); - messageChannelLogDao.updateCallbackDate(JSON.toJSONString(request), message.getMessageOrderNo()); + mnsMessageChannelLogDao.updateCallbackDate(JSON.toJSONString(request), message.getMessageOrderNo()); }); } else { transactionTemplate.executeWithoutResult(status -> { - MNSBatchMessage batchMessage = batchMessageDao.getByChannelMsgIdAndLock(request.getMsgid()); + MNSBatchMessage batchMessage = mnsBatchMessageDao.getByChannelMsgIdAndLock(request.getMsgid()); if (Objects.isNull(batchMessage)) { log.info("MessageCallbackServiceImpl.chuangLanCallbackHandle batchMessage is null"); return; @@ -133,7 +133,7 @@ public class MessageCallbackServiceImpl implements MessageCallbackService { log.info("MessageCallbackServiceImpl.chuangLanCallbackHandle batchMessage is {}", JSON.toJSONString(batchMessage)); //回调成功处理 - MNSMessage message = messageDao + MNSMessage message = mnsMessageDao .getByBatchNoAndPhone(batchMessage.getBatchNo(), request.getMobile()); if (Objects.isNull(message)) { log.info("创蓝短信回调 MessageCallbackServiceImpl.chuangLanCallbackHandle message is null"); @@ -229,11 +229,11 @@ public class MessageCallbackServiceImpl implements MessageCallbackService { //处理BatchMessage状态 Integer batchMessageStatus = handBatchMessageStatus(batchMessage, failCount,successCount); - boolean updateRes = messageDao + boolean updateRes = mnsMessageDao .updateStatusAndRemarkById(message.getId(), messageStatus, request.getStatusDesc()); //更新BachMessage if (updateRes) { - batchMessageDao + mnsBatchMessageDao .updateBachMessageInfoById(batchMessage.getId(), batchMessageStatus, successCount, failCount); } diff --git a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/MessageServiceImpl.java b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/MessageServiceImpl.java index 90c40fb8..9ece1564 100644 --- a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/MessageServiceImpl.java +++ b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/MessageServiceImpl.java @@ -56,8 +56,8 @@ import java.util.stream.Collectors; @RefreshScope public class MessageServiceImpl implements MessageService, EnvironmentAware { - @Resource(name = "mnsMessageAppDao") - private MNSMessageAppDao messageAppDao; + @Resource + private MNSMessageAppDao mnsMessageAppDao; @Resource(name = "messageTemplateManager") private MessageTemplateManager messageTemplateManager; @@ -338,7 +338,7 @@ public class MessageServiceImpl implements MessageService, EnvironmentAware { * @param appCode */ private void checkAppCode(String appCode) { - MNSMessageApp app = messageAppDao.queryByAppCode(appCode); + MNSMessageApp app = mnsMessageAppDao.queryByAppCode(appCode); if (app == null) { throw new BizException(ReturnCodeEnum.INVALID_PARAMETER,"调用失败, appNo校验失败"); } diff --git a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/PlatServiceImpl.java b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/PlatServiceImpl.java index 8f4d44cb..0ae2b8e9 100644 --- a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/PlatServiceImpl.java +++ b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/PlatServiceImpl.java @@ -30,13 +30,13 @@ import java.util.stream.Collectors; public class PlatServiceImpl implements PlatService { @Resource - private MNSChannelMessageTemplateMapper channelMessageTemplateMapper; + private MNSChannelMessageTemplateMapper mnsChannelMessageTemplateMapper; @Resource - private MNSMessageTemplateMapper messageTemplateMapper; + private MNSMessageTemplateMapper mnsMessageTemplateMapper; @Resource - private MNSMessageAppMapper messageAppMapper; + private MNSMessageAppMapper mnsMessageAppMapper; @Override @Transactional(rollbackFor = Exception.class) @@ -58,7 +58,7 @@ public class PlatServiceImpl implements PlatService { private void insertMessageApp(String serviceName) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(MNSMessageApp::getAppCode, serviceName); - List messageApps = messageAppMapper.selectList(query); + List messageApps = mnsMessageAppMapper.selectList(query); if (CollectionUtils.isNotEmpty(messageApps)) { return; } @@ -66,7 +66,7 @@ public class PlatServiceImpl implements PlatService { messageApp.setAppCode(serviceName); messageApp.setAppName(serviceName); messageApp.setStatus(1); - messageAppMapper.insert(messageApp); + mnsMessageAppMapper.insert(messageApp); } /** @@ -99,7 +99,7 @@ public class PlatServiceImpl implements PlatService { queryWrapper.eq(MNSChannelMessageTemplate::getChannelCode, ChannelHandlerEnum.ALI_YUN.getCode()); queryWrapper.eq(MNSChannelMessageTemplate::getTemplateNo, request.getTemplateAliNo()); queryWrapper.or().eq(MNSChannelMessageTemplate::getInnerTemplateNo, request.getTemplateNo()); - List list = channelMessageTemplateMapper.selectList(queryWrapper); + List list = mnsChannelMessageTemplateMapper.selectList(queryWrapper); if(CollectionUtils.isNotEmpty(list)){ MNSChannelMessageTemplate channelMessageTemplate = list.get(0); String templateNo = channelMessageTemplate.getTemplateNo(); @@ -122,7 +122,7 @@ public class PlatServiceImpl implements PlatService { messageTemplate.setHasParam(1); messageTemplate.setReason(request.getTitle()); messageTemplate.setRemark("短信模板统一入库-plat" + (StringUtils.isBlank(request.getRemark()) ? "" : ": " + request.getRemark())); - messageTemplateMapper.insert(messageTemplate); + mnsMessageTemplateMapper.insert(messageTemplate); } @@ -142,7 +142,7 @@ public class PlatServiceImpl implements PlatService { channelMessageTemplate.setHasParam(1); channelMessageTemplate.setRemark("短信模板统一入库-plat" + (StringUtils.isBlank(request.getRemark()) ? "" : ": " + request.getRemark())); channelMessageTemplate.setReason(request.getTitle()); - channelMessageTemplateMapper.insert(channelMessageTemplate); + mnsChannelMessageTemplateMapper.insert(channelMessageTemplate); } @@ -151,7 +151,7 @@ public class PlatServiceImpl implements PlatService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(MNSChannelMessageTemplate::getInnerTemplateNo, templateNo); queryWrapper.eq(MNSChannelMessageTemplate::getChannelCode, ChannelHandlerEnum.ALI_YUN.getCode()); - MNSChannelMessageTemplate channelMessageTemplate = channelMessageTemplateMapper.selectOne(queryWrapper); + MNSChannelMessageTemplate channelMessageTemplate = mnsChannelMessageTemplateMapper.selectOne(queryWrapper); return channelMessageTemplate == null ? null : QueryTemplateResponseDto.builder() .id(channelMessageTemplate.getId()) .messageTemplateStatus(channelMessageTemplate.getStatus()) @@ -181,7 +181,7 @@ public class PlatServiceImpl implements PlatService { page.setCurrent(request.getPageNum()); page.setSize(request.getPageSize()); - com.baomidou.mybatisplus.extension.plugins.pagination.Page messagePage = channelMessageTemplateMapper.selectPage(page, queryWrapper); + com.baomidou.mybatisplus.extension.plugins.pagination.Page messagePage = mnsChannelMessageTemplateMapper.selectPage(page, queryWrapper); Page result = new Page<>(); result.setPageNum(messagePage.getCurrent()); @@ -208,8 +208,8 @@ public class PlatServiceImpl implements PlatService { if(StringUtils.isBlank(templateNo)){ throw new BizException(ReturnCodeEnum.FAIL,"短信模板编码不能为空"); } - messageTemplateMapper.deleteByTemplateNo(templateNo); + mnsMessageTemplateMapper.deleteByTemplateNo(templateNo); - channelMessageTemplateMapper.deleteByTemplateNo(templateNo); + mnsChannelMessageTemplateMapper.deleteByTemplateNo(templateNo); } } diff --git a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/TaskServiceImpl.java b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/TaskServiceImpl.java index a2ec6313..4a5e78f0 100644 --- a/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/TaskServiceImpl.java +++ b/msg-notices/msg-notices-service/src/main/java/cn/axzo/msg/center/notices/service/TaskServiceImpl.java @@ -67,8 +67,8 @@ public class TaskServiceImpl implements TaskService { @Resource(name = "batchMessageManger") private BatchMessageManger batchMessageManger; - @Resource(name = "channelMessageTemplateDao") - private MNSChannelMessageTemplateDao channelMessageTemplateDao; + @Resource + private MNSChannelMessageTemplateDao mnsChannelMessageTemplateDao; @Value("${realtime.batch.message.threshold.minutes:10}") private Integer thresholdMinutes; @@ -114,7 +114,7 @@ public class TaskServiceImpl implements TaskService { .notifyRule(redoMessage.getNotifyRule()).build(); messageRedoManger.lockMessage(context, redoMessage.getId()); - MNSChannelMessageTemplate channelMessageTemplate = channelMessageTemplateDao + MNSChannelMessageTemplate channelMessageTemplate = mnsChannelMessageTemplateDao .queryByTemplateNo(redoMessage.getTemplateNo(), redoMessage.getChannelCode()); if (Objects.isNull(channelMessageTemplate)){ LogUtil.error("短信重试渠道模板不存在--{}",JSON.toJSONString(redoMessage)); diff --git a/msg-notices/pom.xml b/msg-notices/pom.xml index da8f3e3e..c8c4a53f 100644 --- a/msg-notices/pom.xml +++ b/msg-notices/pom.xml @@ -15,7 +15,6 @@ msg-notices-client msg-notices-common - msg-notices-dao msg-notices-http-api msg-notices-integration msg-notices-manager diff --git a/start/pom.xml b/start/pom.xml index ab0d20e3..850f076c 100644 --- a/start/pom.xml +++ b/start/pom.xml @@ -31,6 +31,16 @@ cn.axzo.msgcenter wx-notices + + cn.axzo.msg.center + msg-center-dal + 1.0.0-SNAPSHOT + + + cn.axzo.msg.notices.service + msg-notices-service + 1.0.0-SNAPSHOT + org.springframework.boot spring-boot-starter-undertow diff --git a/start/src/main/java/cn/axzo/msg/center/MsgCenterApplication.java b/start/src/main/java/cn/axzo/msg/center/MsgCenterApplication.java index 6fd4fecc..b52e47c5 100644 --- a/start/src/main/java/cn/axzo/msg/center/MsgCenterApplication.java +++ b/start/src/main/java/cn/axzo/msg/center/MsgCenterApplication.java @@ -5,8 +5,10 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.Environment; +import org.springframework.scheduling.annotation.EnableAsync; /** * @author cn @@ -15,8 +17,10 @@ import org.springframework.core.env.Environment; * @date 2023/5/30 11:01 */ @Slf4j -@MapperScan(value = "cn.axzo.msg.center.dal.mapper") -@SpringBootApplication(scanBasePackages = {"cn.axzo.msg.center"}) +@MapperScan(value = "cn.axzo.msg.center.dal") +@SpringBootApplication(scanBasePackages = {"cn.axzo.msg"}) +@EnableFeignClients(basePackages = "cn.axzo.log") +@EnableAsync public class MsgCenterApplication { public static void main(String[] args) { ConfigurableApplicationContext run = SpringApplication.run(MsgCenterApplication.class, args);