重新分层，重构短信和站内信

inside-notices/pom.xml

@@ -90,6 +90,72 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.center.domain</groupId>
+            <artifactId>msg-center-domain</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.center.domain</groupId>
+            <artifactId>msg-center-domain</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.center</groupId>
+            <artifactId>msg-center-dal</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.center</groupId>
+            <artifactId>msg-center-dal</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.center</groupId>
+            <artifactId>msg-center-dal</artifactId>
+            <version>Unknown</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.center</groupId>
+            <artifactId>msg-center-dal</artifactId>
+            <version>Unknown</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.center</groupId>
+            <artifactId>msg-center-dal</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.center</groupId>
+            <artifactId>msg-center-dal</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.center</groupId>
+            <artifactId>msg-center-dal</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.center</groupId>
+            <artifactId>msg-center-dal</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.center</groupId>
+            <artifactId>msg-center-dal</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/event/AgencyChangeEvent.java

@@ -1,6 +1,6 @@
 package cn.axzo.msg.center.inside.notices.event;
 
-import cn.axzo.msg.center.inside.notices.enums.AgencyOperationEnum;
+import cn.axzo.msg.center.domain.enums.AgencyOperationEnum;
 import org.springframework.context.ApplicationEvent;
 
 /**

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/persistence/BaseDataEntity.java

@@ -1,12 +0,0 @@
-package cn.axzo.msg.center.inside.notices.persistence;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-/**
- * Entity 支持类
- * @author Smile
- * @date 2019/3/26 17:33
- */
-public abstract class BaseDataEntity<T extends Model<T>> extends BaseEntity<T>{
-
-}

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageCoreService.java

@@ -3,8 +3,8 @@ package cn.axzo.msg.center.inside.notices.service;
 
 
 import cn.axzo.msg.center.common.page.PageResult;
-import cn.axzo.msg.center.inside.notices.model.request.CmsMsgQueryReq;
+import cn.axzo.msg.center.domain.request.CmsMsgQueryReq;
-import cn.axzo.msg.center.inside.notices.model.request.MessageNewRes;
+import cn.axzo.msg.center.domain.request.MessageNewRes;
 import cn.axzo.msg.center.inside.notices.model.response.MessageTotalRes;
 
 import java.util.List;

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageModuleService.java

@@ -1,11 +1,11 @@
 package cn.axzo.msg.center.inside.notices.service;
 
-import cn.axzo.msg.center.inside.notices.entity.MessageModule;
+import cn.axzo.msg.center.domain.dto.CreateModuleDTO;
-import cn.axzo.msg.center.inside.notices.enums.UserTypeEnum;
+import cn.axzo.msg.center.domain.dto.MsgModuleDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.CreateModuleDTO;
+import cn.axzo.msg.center.domain.dto.SearchModuleDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.MsgModuleDTO;
+import cn.axzo.msg.center.domain.dto.UpdateModuleDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.SearchModuleDTO;
+import cn.axzo.msg.center.domain.entity.MessageModule;
-import cn.axzo.msg.center.inside.notices.service.dto.UpdateModuleDTO;
+import cn.axzo.msg.center.domain.enums.UserTypeEnum;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageRecordService.java

@@ -1,10 +1,10 @@
 package cn.axzo.msg.center.inside.notices.service;
 
 
-import cn.axzo.msg.center.inside.notices.entity.MessageRecord;
+import cn.axzo.msg.center.domain.entity.MessageRecord;
-import cn.axzo.msg.center.inside.notices.enums.UserTypeEnum;
+import cn.axzo.msg.center.domain.enums.UserTypeEnum;
-import cn.axzo.msg.center.inside.notices.model.request.CmsMsgQueryReq;
+import cn.axzo.msg.center.domain.request.CmsMsgQueryReq;
-import cn.axzo.msg.center.inside.notices.model.request.MessageNewRes;
+import cn.axzo.msg.center.domain.request.MessageNewRes;
 import cn.axzo.msg.center.inside.notices.model.response.MessageTotalRes;
 import cn.axzo.msg.center.api.enums.MsgStateEnum;
 import cn.axzo.msg.center.api.request.CmsReadMsgReq;

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageRelationService.java

@@ -1,9 +1,9 @@
 package cn.axzo.msg.center.inside.notices.service;
 
-import cn.axzo.msg.center.inside.notices.entity.MessageRelation;
+import cn.axzo.msg.center.domain.dto.CreateTemplateDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.CreateTemplateDTO;
+import cn.axzo.msg.center.domain.dto.SearchTemplateDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.SearchTemplateDTO;
+import cn.axzo.msg.center.domain.dto.UpdateTemplateDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.UpdateTemplateDTO;
+import cn.axzo.msg.center.domain.entity.MessageRelation;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.time.LocalDateTime;

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageRouterService.java

@@ -2,9 +2,8 @@ package cn.axzo.msg.center.inside.notices.service;
 
 
 
-import cn.axzo.msg.center.inside.notices.entity.MessageRouter;
+import cn.axzo.msg.center.domain.dto.TemplateRouterDTO;
-import cn.axzo.msg.center.inside.notices.model.dto.TemplateRouterDTO;
+import cn.axzo.msg.center.domain.entity.MessageRouter;
-import cn.axzo.msg.center.inside.notices.service.dto.SyncRelationDataDTO;
 
 import java.util.List;
 import java.util.Set;

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageTemplateService.java

@@ -1,8 +1,8 @@
 package cn.axzo.msg.center.inside.notices.service;
 
-import cn.axzo.msg.center.inside.notices.entity.MessageTemplate;
+import cn.axzo.msg.center.domain.dto.SearchTemplateDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.SearchTemplateDTO;
+import cn.axzo.msg.center.domain.dto.SyncTemplateDataDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.SyncTemplateDataDTO;
+import cn.axzo.msg.center.domain.entity.MessageTemplate;
 
 import java.time.LocalDateTime;
 import java.util.List;

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageCoreServiceImpl.java

@@ -6,18 +6,17 @@ import cn.axzo.msg.center.common.enums.SystemTypeEnum;
 import cn.axzo.msg.center.common.exception.ServiceException;
 import cn.axzo.msg.center.common.page.PageResult;
 import cn.axzo.msg.center.common.utils.PlaceholderResolver;
-import cn.axzo.msg.center.inside.notices.entity.MessageModule;
+import cn.axzo.msg.center.domain.dto.MsgModuleDTO;
-import cn.axzo.msg.center.inside.notices.entity.MessageRelation;
+import cn.axzo.msg.center.domain.entity.MessageModule;
-import cn.axzo.msg.center.inside.notices.entity.MessageRouter;
+import cn.axzo.msg.center.domain.entity.MessageRelation;
-import cn.axzo.msg.center.inside.notices.enums.ModuleBizTypeEnum;
+import cn.axzo.msg.center.domain.entity.MessageRouter;
-import cn.axzo.msg.center.inside.notices.enums.MsgRouteTypeEnum;
+import cn.axzo.msg.center.domain.enums.MsgRouteTypeEnum;
-import cn.axzo.msg.center.inside.notices.enums.NativeTypeEnum;
+import cn.axzo.msg.center.domain.enums.NativeTypeEnum;
-import cn.axzo.msg.center.inside.notices.enums.UserTypeEnum;
+import cn.axzo.msg.center.domain.enums.UserTypeEnum;
-import cn.axzo.msg.center.inside.notices.model.request.CmsMsgQueryReq;
+import cn.axzo.msg.center.domain.request.CmsMsgQueryReq;
-import cn.axzo.msg.center.inside.notices.model.request.MessageNewRes;
+import cn.axzo.msg.center.domain.request.MessageNewRes;
 import cn.axzo.msg.center.inside.notices.model.response.MessageTotalRes;
 import cn.axzo.msg.center.inside.notices.service.*;
-import cn.axzo.msg.center.inside.notices.service.dto.MsgModuleDTO;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -32,7 +31,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static cn.axzo.framework.auth.domain.TerminalInfo.NT_CM_APP_GENERAL;
-import static cn.axzo.msg.center.inside.notices.enums.MsgRouteTypeEnum.WECHAT_MINI_PROGRAM;
+import static cn.axzo.msg.center.domain.enums.MsgRouteTypeEnum.WECHAT_MINI_PROGRAM;
 
 /**
  * @author : liuchuntao

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageModuleServiceImpl.java

@@ -1,16 +1,16 @@
 package cn.axzo.msg.center.inside.notices.service.impl;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
-import cn.axzo.msg.center.inside.notices.dao.MessageModuleDao;
+import cn.axzo.msg.center.dal.MessageModuleDao;
-import cn.axzo.msg.center.inside.notices.entity.MessageModule;
+import cn.axzo.msg.center.domain.dto.CreateModuleDTO;
-import cn.axzo.msg.center.inside.notices.enums.ModuleBizTypeEnum;
+import cn.axzo.msg.center.domain.dto.MsgModuleDTO;
-import cn.axzo.msg.center.inside.notices.enums.UserTypeEnum;
+import cn.axzo.msg.center.domain.dto.SearchModuleDTO;
-import cn.axzo.msg.center.inside.notices.persistence.BaseEntity;
+import cn.axzo.msg.center.domain.dto.UpdateModuleDTO;
+import cn.axzo.msg.center.domain.entity.MessageModule;
+import cn.axzo.msg.center.domain.enums.ModuleBizTypeEnum;
+import cn.axzo.msg.center.domain.enums.UserTypeEnum;
+import cn.axzo.msg.center.domain.persistence.BaseEntity;
 import cn.axzo.msg.center.inside.notices.service.MessageModuleService;
-import cn.axzo.msg.center.inside.notices.service.dto.CreateModuleDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.MsgModuleDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.SearchModuleDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.UpdateModuleDTO;
 import cn.axzo.msg.center.api.enums.ReceiveTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java

@@ -15,18 +15,18 @@ import cn.axzo.msg.center.common.page.PageResult;
 import cn.axzo.msg.center.common.utils.BeanConvertUtils;
 import cn.axzo.msg.center.common.utils.PlaceholderResolver;
 import cn.axzo.msg.center.common.utils.SpringUtils;
-import cn.axzo.msg.center.inside.notices.dao.*;
+import cn.axzo.msg.center.dal.*;
-import cn.axzo.msg.center.inside.notices.entity.*;
+import cn.axzo.msg.center.domain.dto.MsgStatisticsDTO;
-import cn.axzo.msg.center.inside.notices.enums.ModuleBizTypeEnum;
+import cn.axzo.msg.center.domain.entity.*;
-import cn.axzo.msg.center.inside.notices.enums.MsgRouteTypeEnum;
+import cn.axzo.msg.center.domain.enums.ModuleBizTypeEnum;
-import cn.axzo.msg.center.inside.notices.enums.NativeTypeEnum;
+import cn.axzo.msg.center.domain.enums.MsgRouteTypeEnum;
-import cn.axzo.msg.center.inside.notices.enums.UserTypeEnum;
+import cn.axzo.msg.center.domain.enums.NativeTypeEnum;
+import cn.axzo.msg.center.domain.enums.UserTypeEnum;
+import cn.axzo.msg.center.domain.request.CmsMsgQueryReq;
+import cn.axzo.msg.center.domain.request.MessageNewRes;
 import cn.axzo.msg.center.inside.notices.event.SendMessageEvent;
-import cn.axzo.msg.center.inside.notices.model.request.CmsMsgQueryReq;
-import cn.axzo.msg.center.inside.notices.model.request.MessageNewRes;
 import cn.axzo.msg.center.inside.notices.model.response.MessageTotalRes;
 import cn.axzo.msg.center.inside.notices.service.MessageRecordService;
-import cn.axzo.msg.center.inside.notices.service.dto.MsgStatisticsDTO;
 import cn.azxo.framework.common.utils.LogUtil;
 import cn.azxo.framework.common.utils.LogUtil.ErrorLevel;
 import cn.azxo.framework.common.utils.LogUtil.ErrorType;
@@ -49,7 +49,7 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static cn.axzo.msg.center.inside.notices.enums.MsgRouteTypeEnum.WECHAT_MINI_PROGRAM;
+import static cn.axzo.msg.center.domain.enums.MsgRouteTypeEnum.WECHAT_MINI_PROGRAM;
 
 
 /**

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRelationServiceImpl.java

@@ -1,19 +1,18 @@
 package cn.axzo.msg.center.inside.notices.service.impl;
 
 import cn.axzo.msg.center.common.enums.TableIsDeleteEnum;
-import cn.axzo.msg.center.inside.notices.dao.MessageRelationDao;
+import cn.axzo.msg.center.dal.MessageRelationDao;
-import cn.axzo.msg.center.inside.notices.entity.MessageRelation;
+import cn.axzo.msg.center.domain.dto.CreateTemplateDTO;
-import cn.axzo.msg.center.inside.notices.entity.MessageRouter;
+import cn.axzo.msg.center.domain.dto.SearchTemplateDTO;
-import cn.axzo.msg.center.inside.notices.entity.MessageTemplate;
+import cn.axzo.msg.center.domain.dto.UpdateTemplateDTO;
-import cn.axzo.msg.center.inside.notices.enums.MsgRouteTypeEnum;
+import cn.axzo.msg.center.domain.entity.MessageRelation;
-import cn.axzo.msg.center.inside.notices.persistence.BaseEntity;
+import cn.axzo.msg.center.domain.entity.MessageRouter;
+import cn.axzo.msg.center.domain.entity.MessageTemplate;
+import cn.axzo.msg.center.domain.enums.MsgRouteTypeEnum;
+import cn.axzo.msg.center.domain.persistence.BaseEntity;
 import cn.axzo.msg.center.inside.notices.service.MessageRelationService;
 import cn.axzo.msg.center.inside.notices.service.MessageRouterService;
 import cn.axzo.msg.center.inside.notices.service.MessageTemplateService;
-import cn.axzo.msg.center.inside.notices.service.dto.CreateTemplateDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.SearchTemplateDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.SyncRelationDataDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.UpdateTemplateDTO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRouterServiceImpl.java

@@ -1,14 +1,11 @@
 package cn.axzo.msg.center.inside.notices.service.impl;
 
 import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
-import cn.axzo.msg.center.inside.notices.dao.MessageRouterDao;
+import cn.axzo.msg.center.dal.MessageRouterDao;
-import cn.axzo.msg.center.inside.notices.entity.MessageRouter;
+import cn.axzo.msg.center.domain.dto.TemplateRouterDTO;
-import cn.axzo.msg.center.inside.notices.enums.MsgRouteTypeEnum;
+import cn.axzo.msg.center.domain.entity.MessageRouter;
-import cn.axzo.msg.center.inside.notices.model.dto.SyncRouterDataDTO;
+import cn.axzo.msg.center.domain.enums.MsgRouteTypeEnum;
-import cn.axzo.msg.center.inside.notices.model.dto.TemplateRouterDTO;
 import cn.axzo.msg.center.inside.notices.service.MessageRouterService;
-import cn.axzo.msg.center.inside.notices.service.dto.SyncRelationDataDTO;
-import cn.hutool.core.collection.CollectionUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageServiceApiImpl.java

@@ -10,9 +10,9 @@ import cn.axzo.msg.center.api.request.MsgReturnParamRes;
 import cn.axzo.msg.center.api.response.Relation;
 import cn.axzo.msg.center.api.response.Template;
 import cn.axzo.msg.center.common.utils.CustomBeanUtils;
+import cn.axzo.msg.center.domain.entity.MessageRelation;
+import cn.axzo.msg.center.domain.entity.MessageTemplate;
 import cn.axzo.msg.center.inside.notices.annotation.RepeatSubCheck;
-import cn.axzo.msg.center.inside.notices.entity.MessageRelation;
-import cn.axzo.msg.center.inside.notices.entity.MessageTemplate;
 import cn.axzo.msg.center.inside.notices.service.MessageRecordService;
 import cn.axzo.msg.center.inside.notices.service.MessageRelationService;
 import cn.axzo.msg.center.inside.notices.service.MessageTemplateService;

inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageTemplateServiceImpl.java

@@ -2,12 +2,12 @@ package cn.axzo.msg.center.inside.notices.service.impl;
 
 
 import cn.axzo.msg.center.common.enums.TableIsDeleteEnum;
-import cn.axzo.msg.center.inside.notices.dao.MessageTemplateDao;
+import cn.axzo.msg.center.dal.MessageTemplateDao;
-import cn.axzo.msg.center.inside.notices.entity.MessageTemplate;
+import cn.axzo.msg.center.domain.dto.SearchTemplateDTO;
-import cn.axzo.msg.center.inside.notices.persistence.BaseEntity;
+import cn.axzo.msg.center.domain.dto.SyncTemplateDataDTO;
+import cn.axzo.msg.center.domain.entity.MessageTemplate;
+import cn.axzo.msg.center.domain.persistence.BaseEntity;
 import cn.axzo.msg.center.inside.notices.service.MessageTemplateService;
-import cn.axzo.msg.center.inside.notices.service.dto.SearchTemplateDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.SyncTemplateDataDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

inside-notices/src/main/resources/bootstrap.yml

@@ -1,36 +0,0 @@
-server:
-  port: 10098
-spring:
-  application:
-    name: athena
-  cloud:
-    nacos:
-      config:
-        server-addr: ${NACOS_HOST:dev-nacos.axzo.cn}:${NACOS_PORT:80}
-        file-extension: yaml
-        namespace: ${NACOS_NAMESPACE_ID:eb401d2d-8f5e-4902-8fd0-148e941ba044}
-  profiles:
-    active: ${NACOS_PROFILES_ACTIVE:dev}
-  main:
-    allow-bean-definition-overriding: true
-
-logging:
-  level:
-    com.alibaba.nacos.client.config.impl: warn
-
-upush:
-  cmp:
-    android:
-      appkey: 5f0efc7d9540fd07a29fa773
-      secret: v1tj0g4daoiye3blmopylynyuut1c6od
-    ios:
-      appkey: 5f12986b9540fd066f2cc9d0
-      secret: ayerhhzwgyhdbif2bqkkisc4blglqabc
-  cm:
-    android:
-      appkey: 5d52212d3fc195cf1e00028a
-      secret: iwvf8uylq13ogl7kappnh2oxpi993xzq
-    ios:
-      appkey: 5d526f050cafb212260001d3
-      secret: xva7umrgqexsrj5s77odedthpqfo8tkm
-  profile: dev

msg-center-dal/pom.xml

@@ -2,16 +2,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
+    <!--<parent>
-        <artifactId>msg-notices</artifactId>
+        <artifactId>msg-center</artifactId>
         <groupId>cn.axzo.msgcenter</groupId>
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
-    </parent>
+    </parent>-->
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>cn.axzo.msg.notices.dao</groupId>
+    <groupId>cn.axzo.msg.center</groupId>
-    <artifactId>msg-notices-dao</artifactId>
+    <artifactId>msg-center-dal</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -20,39 +21,46 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>cn.axzo.msg.notices.common</groupId>
-            <artifactId>msg-notices-common</artifactId>
-            <version>${revision}</version>
-        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.27</version>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
+            <version>3.4.5</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
+            <version>2.4.13</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
+            <version>2.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.4.1</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>cn.axzo.trade</groupId>
             <artifactId>trade-data-security-base</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>cn.axzo.msg.center.domain</groupId>
+            <artifactId>msg-center-domain</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/CodeGenerator.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.notices.dao;
+package cn.axzo.msg.center.dal;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.IdType;

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSBatchMessageDao.java

@@ -1,8 +1,8 @@
-package cn.axzo.msg.center.notices.dao.repository;
+package cn.axzo.msg.center.dal;
 
-import cn.axzo.msg.center.notices.dao.domain.BatchMessageQuery;
+import cn.axzo.msg.center.domain.dto.BatchMessageStatisticsResponseDto;
-import cn.axzo.msg.center.notices.dao.domain.BatchMessageStatisticsResponseDto;
+import cn.axzo.msg.center.domain.entity.MNSBatchMessage;
-import cn.axzo.msg.center.notices.dao.entity.BatchMessage;
+import cn.axzo.msg.center.domain.query.BatchMessageQuery;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -14,15 +14,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author szg
  * @since 2021-08-09
  */
-public interface BatchMessageDao extends IService<BatchMessage> {
+public interface MNSBatchMessageDao extends IService<MNSBatchMessage> {
 
-  IPage<BatchMessage> queryByPage(BatchMessageQuery query);
+  IPage<MNSBatchMessage> queryByPage(BatchMessageQuery query);
 
-  BatchMessage queryBatchMessage(String batchNo);
+  MNSBatchMessage queryBatchMessage(String batchNo);
 
-  boolean updateBatchMessage(BatchMessage batchMessage, String batchNo);
+  boolean updateBatchMessage(MNSBatchMessage batchMessage, String batchNo);
 
-  BatchMessage getByChannelMsgIdAndLock(String msgId);
+  MNSBatchMessage getByChannelMsgIdAndLock(String msgId);
 
   boolean updateChannelInfo(String channelCode, String templateNo, String batchNo);
 

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSBatchMessageRequestDao.java

@@ -1,7 +1,7 @@
-package cn.axzo.msg.center.notices.dao.repository;
+package cn.axzo.msg.center.dal;
 
-import cn.axzo.msg.center.notices.dao.domain.BatchMessageRequestQuery;
+import cn.axzo.msg.center.domain.entity.MNSBatchMessageRequest;
-import cn.axzo.msg.center.notices.dao.entity.BatchMessageRequest;
+import cn.axzo.msg.center.domain.query.BatchMessageRequestQuery;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,11 +13,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author szg
  * @since 2021-08-09
  */
-public interface BatchMessageRequestDao extends IService<BatchMessageRequest> {
+public interface MNSBatchMessageRequestDao extends IService<MNSBatchMessageRequest> {
 
-  IPage<BatchMessageRequest> queryByPage(BatchMessageRequestQuery query);
+  IPage<MNSBatchMessageRequest> queryByPage(BatchMessageRequestQuery query);
 
-  BatchMessageRequest queryBatchMessage(String appCode, String requestNo);
+  MNSBatchMessageRequest queryBatchMessage(String appCode, String requestNo);
 
   boolean updateStatusById(Long id, Integer status);
 

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSChannelMessageTemplateDao.java

@@ -0,0 +1,20 @@
+package cn.axzo.msg.center.dal;
+
+import cn.axzo.msg.center.domain.entity.MNSChannelMessageTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 渠道消息模板表 服务类
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+public interface MNSChannelMessageTemplateDao extends IService<MNSChannelMessageTemplate> {
+
+  MNSChannelMessageTemplate queryByTemplateNo(String innerTemplateNo, String channelCode);
+
+  MNSChannelMessageTemplate queryByChannelTemplateNo(String channelTemplateNo);
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageAppDao.java

@@ -1,6 +1,6 @@
-package cn.axzo.msg.center.notices.dao.repository;
+package cn.axzo.msg.center.dal;
 
-import cn.axzo.msg.center.notices.dao.entity.MessageApp;
+import cn.axzo.msg.center.domain.entity.MNSMessageApp;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,12 +11,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author zhaoyong
  * @since 2021-05-19
  */
-public interface MessageAppDao extends IService<MessageApp> {
+public interface MNSMessageAppDao extends IService<MNSMessageApp> {
 
   /**
    * 通过appCode获取
    * @param appCode
    * @return
    */
-  MessageApp queryByAppCode(String appCode);
+  MNSMessageApp queryByAppCode(String appCode);
 }

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageChannelDao.java

@@ -1,6 +1,6 @@
-package cn.axzo.msg.center.notices.dao.repository;
+package cn.axzo.msg.center.dal;
 
-import cn.axzo.msg.center.notices.dao.entity.MessageChannel;
+import cn.axzo.msg.center.domain.entity.MNSMessageChannel;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -13,11 +13,11 @@ import java.util.List;
  * @author zhaoyong
  * @since 2021-05-19
  */
-public interface MessageChannelDao extends IService<MessageChannel> {
+public interface MNSMessageChannelDao extends IService<MNSMessageChannel> {
 
   /**
    * 获取可用的渠道
    * @return
    */
-  List<MessageChannel> queryAvailable();
+  List<MNSMessageChannel> queryAvailable();
 }

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageChannelLogDao.java

@@ -1,6 +1,6 @@
-package cn.axzo.msg.center.notices.dao.repository;
+package cn.axzo.msg.center.dal;
 
-import cn.axzo.msg.center.notices.dao.entity.MessageChannelLog;
+import cn.axzo.msg.center.domain.entity.MNSMessageChannelLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author zhaoyong
  * @since 2021-05-19
  */
-public interface MessageChannelLogDao extends IService<MessageChannelLog> {
+public interface MNSMessageChannelLogDao extends IService<MNSMessageChannelLog> {
 
   boolean updateCallbackDate(String toJSONString, String messageOrderNo);
 

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageDao.java

@@ -1,7 +1,7 @@
-package cn.axzo.msg.center.notices.dao.repository;
+package cn.axzo.msg.center.dal;
 
-import cn.axzo.msg.center.notices.dao.domain.MessageQuery;
+import cn.axzo.msg.center.domain.entity.MNSMessage;
-import cn.axzo.msg.center.notices.dao.entity.Message;
+import cn.axzo.msg.center.domain.query.MessageQuery;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,14 +13,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author zhaoyong
  * @since 2021-05-19
  */
-public interface MessageDao extends IService<Message> {
+public interface MNSMessageDao extends IService<MNSMessage> {
 
     /**
      * 分页查询消息
      * @param query
      * @return
      */
-    IPage<Message> queryByPage(MessageQuery query);
+    IPage<MNSMessage> queryByPage(MessageQuery query);
 
     /**
      * 渠道网络异常
@@ -37,7 +37,7 @@ public interface MessageDao extends IService<Message> {
      * @param mobile
      * @return
      */
-    Message getByBatchNoAndPhone(String batchNo, String mobile);
+    MNSMessage getByBatchNoAndPhone(String batchNo, String mobile);
 
     /**
      * 根据渠道响应查询
@@ -45,7 +45,7 @@ public interface MessageDao extends IService<Message> {
      * @param mobile
      * @return
      */
-    Message getByChannelMsgId(String channelMsgId, String mobile);
+    MNSMessage getByChannelMsgId(String channelMsgId, String mobile);
 
     /**
      * 更新批量消息渠道消息

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageRedoDao.java

@@ -0,0 +1,15 @@
+package cn.axzo.msg.center.dal;
+
+
+import cn.axzo.msg.center.domain.entity.MNSMessageRedo;
+import cn.axzo.msg.center.domain.query.MessageRedoQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface MNSMessageRedoDao extends IService<MNSMessageRedo> {
+
+  IPage<MNSMessageRedo> queryByPage(MessageRedoQuery query);
+
+  boolean updateExceptionToFail(Long id);
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageRequestLogDao.java

@@ -0,0 +1,16 @@
+package cn.axzo.msg.center.dal;
+
+import cn.axzo.msg.center.domain.entity.MNSMessageRequestLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 外部系统请求表 服务类
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+public interface MNSMessageRequestLogDao extends IService<MNSMessageRequestLog> {
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageTemplateDao.java

@@ -1,6 +1,6 @@
-package cn.axzo.msg.center.notices.dao.repository;
+package cn.axzo.msg.center.dal;
 
-import cn.axzo.msg.center.notices.dao.entity.MessageTemplate;
+import cn.axzo.msg.center.domain.entity.MNSMessageTemplate;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,12 +11,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author zhaoyong
  * @since 2021-05-19
  */
-public interface MessageTemplateDao extends IService<MessageTemplate> {
+public interface MNSMessageTemplateDao extends IService<MNSMessageTemplate> {
 
   /**
    * 通过模板号查询
    * @param templateNo
    * @return
    */
-  MessageTemplate queryByTemplateNo(String templateNo);
+  MNSMessageTemplate queryByTemplateNo(String templateNo);
 }

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MNSMessageTemplateParamDao.java

@@ -0,0 +1,22 @@
+package cn.axzo.msg.center.dal;
+
+import cn.axzo.msg.center.domain.entity.MNSMessageTemplateParam;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 渠道模板变量序列表 服务类
+ * </p>
+ *
+ * @author szg
+ * @since 2021-08-07
+ */
+public interface MNSMessageTemplateParamDao extends IService<MNSMessageTemplateParam> {
+
+  List<MNSMessageTemplateParam> getByTemplateNo(String templateNo);
+
+  List<MNSMessageTemplateParam> getAllMessageTemplateParams();
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MessageModuleDao.java

@@ -1,11 +1,11 @@
-package cn.axzo.msg.center.inside.notices.dao;
+package cn.axzo.msg.center.dal;
 
-import cn.axzo.msg.center.inside.notices.dao.mapper.MessageModuleMapper;
-import cn.axzo.msg.center.inside.notices.entity.MessageModule;
-import cn.axzo.msg.center.inside.notices.persistence.BaseEntity;
-import cn.axzo.msg.center.inside.notices.service.dto.MsgModuleDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.SyncModuleDataDTO;
 import cn.axzo.msg.center.api.enums.ReceiveTypeEnum;
+import cn.axzo.msg.center.dal.mapper.MessageModuleMapper;
+import cn.axzo.msg.center.domain.dto.MsgModuleDTO;
+import cn.axzo.msg.center.domain.dto.SyncModuleDataDTO;
+import cn.axzo.msg.center.domain.entity.MessageModule;
+import cn.axzo.msg.center.domain.persistence.BaseEntity;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MessageRecordDao.java

@@ -1,19 +1,19 @@
-package cn.axzo.msg.center.inside.notices.dao;
+package cn.axzo.msg.center.dal;
 
 
 
+import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
 import cn.axzo.msg.center.api.enums.MsgStateEnum;
 import cn.axzo.msg.center.api.enums.MsgTypeEnum;
 import cn.axzo.msg.center.api.enums.ReceiveTypeEnum;
 import cn.axzo.msg.center.api.request.CmsReadMsgReq;
-import cn.axzo.msg.center.common.enums.TableIsDeleteEnum;
+import cn.axzo.msg.center.dal.mapper.MessageRecordMapper;
-import cn.axzo.msg.center.inside.notices.dao.mapper.MessageRecordMapper;
+import cn.axzo.msg.center.domain.dto.MsgStatisticsDTO;
-import cn.axzo.msg.center.inside.notices.entity.MessageRecord;
+import cn.axzo.msg.center.domain.entity.MessageRecord;
-import cn.axzo.msg.center.inside.notices.enums.ModuleBizTypeEnum;
+import cn.axzo.msg.center.domain.enums.ModuleBizTypeEnum;
-import cn.axzo.msg.center.inside.notices.model.request.CmsMsgQueryReq;
+import cn.axzo.msg.center.domain.persistence.BaseEntity;
-import cn.axzo.msg.center.inside.notices.model.request.MessageNewRes;
+import cn.axzo.msg.center.domain.request.CmsMsgQueryReq;
-import cn.axzo.msg.center.inside.notices.persistence.BaseEntity;
+import cn.axzo.msg.center.domain.request.MessageNewRes;
-import cn.axzo.msg.center.inside.notices.service.dto.MsgStatisticsDTO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MessageRelationDao.java

@@ -1,9 +1,9 @@
-package cn.axzo.msg.center.inside.notices.dao;
+package cn.axzo.msg.center.dal;
 
 
-import cn.axzo.msg.center.inside.notices.dao.mapper.MessageRelationMapper;
+import cn.axzo.msg.center.dal.mapper.MessageRelationMapper;
-import cn.axzo.msg.center.inside.notices.entity.MessageRelation;
+import cn.axzo.msg.center.domain.dto.SyncRelationDataDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.SyncRelationDataDTO;
+import cn.axzo.msg.center.domain.entity.MessageRelation;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MessageRouterDao.java

@@ -1,12 +1,12 @@
-package cn.axzo.msg.center.inside.notices.dao;
+package cn.axzo.msg.center.dal;
 
 
-import cn.axzo.msg.center.common.enums.TableIsDeleteEnum;
+import cn.axzo.basics.common.constant.enums.TableIsDeleteEnum;
-import cn.axzo.msg.center.inside.notices.dao.mapper.MessageRouterMapper;
+import cn.axzo.msg.center.dal.mapper.MessageRouterMapper;
-import cn.axzo.msg.center.inside.notices.entity.MessageRouter;
+import cn.axzo.msg.center.domain.dto.SyncRouterDataDTO;
-import cn.axzo.msg.center.inside.notices.enums.MsgRouteTypeEnum;
+import cn.axzo.msg.center.domain.entity.MessageRouter;
-import cn.axzo.msg.center.inside.notices.model.dto.SyncRouterDataDTO;
+import cn.axzo.msg.center.domain.enums.MsgRouteTypeEnum;
-import cn.axzo.msg.center.inside.notices.persistence.BaseEntity;
+import cn.axzo.msg.center.domain.persistence.BaseEntity;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MessageTemplateDao.java

@@ -1,9 +1,9 @@
-package cn.axzo.msg.center.inside.notices.dao;
+package cn.axzo.msg.center.dal;
 
 
-import cn.axzo.msg.center.inside.notices.dao.mapper.MessageTemplateMapper;
+import cn.axzo.msg.center.dal.mapper.MessageTemplateMapper;
-import cn.axzo.msg.center.inside.notices.entity.MessageTemplate;
+import cn.axzo.msg.center.domain.dto.SyncTemplateDataDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.SyncTemplateDataDTO;
+import cn.axzo.msg.center.domain.entity.MessageTemplate;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MsgDynamicDao.java

@@ -1,8 +1,8 @@
-package cn.axzo.msg.center.inside.notices.dao;
+package cn.axzo.msg.center.dal;
 
 
-import cn.axzo.msg.center.inside.notices.dao.mapper.MsgDynamicMapper;
+import cn.axzo.msg.center.dal.mapper.MsgDynamicMapper;
-import cn.axzo.msg.center.inside.notices.entity.MsgDynamic;
+import cn.axzo.msg.center.domain.entity.MsgDynamic;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSBatchMessageDaoImpl.java

@@ -0,0 +1,106 @@
+package cn.axzo.msg.center.dal.impl;
+
+import cn.axzo.msg.center.dal.MNSBatchMessageDao;
+import cn.axzo.msg.center.dal.mapper.MNSBatchMessageMapper;
+import cn.axzo.msg.center.domain.dto.BatchMessageStatisticsResponseDto;
+import cn.axzo.msg.center.domain.entity.MNSBatchMessage;
+import cn.axzo.msg.center.domain.query.BatchMessageQuery;
+import cn.axzo.msg.center.notices.common.enums.IsDeletedEnum;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 渠道模板变量序列表 Dao实现类
+ * </p>
+ *
+ * @author szg
+ * @since 2021-08-09
+ */
+@Repository("batchMessageDao")
+public class MNSBatchMessageDaoImpl extends ServiceImpl<MNSBatchMessageMapper, MNSBatchMessage> implements MNSBatchMessageDao {
+
+  @Resource
+  private MNSBatchMessageMapper batchMessageMapper;
+
+  @Override
+  public IPage<MNSBatchMessage> queryByPage(BatchMessageQuery query) {
+
+    return this.page(query.toPage(), new LambdaQueryWrapper<MNSBatchMessage>()
+        .eq(query.getId() != null, MNSBatchMessage::getId, query.getId())
+        .ge(query.getStartCreateTime() != null, MNSBatchMessage::getCreateAt, query.getStartCreateTime())
+        .le(query.getEndCreateTime() != null, MNSBatchMessage::getCreateAt, query.getEndCreateTime())
+        .in(CollectionUtils.isNotEmpty(query.getStatuses()), MNSBatchMessage::getStatus, query.getStatuses())
+        .eq(Objects.nonNull(query.getSendType()),MNSBatchMessage::getSendType,query.getSendType())
+        .eq(MNSBatchMessage::getIsDelete, 0)
+        .orderByDesc(MNSBatchMessage::getCreateAt)
+    );
+  }
+
+  @Override
+  public MNSBatchMessage queryBatchMessage(String batchNo) {
+    return this.lambdaQuery()
+        .eq(MNSBatchMessage::getBatchNo, batchNo)
+        .eq(MNSBatchMessage::getIsDelete, IsDeletedEnum.NO.getCode())
+        .one();
+  }
+
+  @Override
+  public boolean updateBatchMessage(MNSBatchMessage batchMessage, String batchNo) {
+    return this.update(batchMessage, new UpdateWrapper<MNSBatchMessage>()
+        .eq("batch_no", batchNo)
+        .eq("is_delete", IsDeletedEnum.NO.getCode()));
+  }
+
+  @Override
+  public boolean updateChannelInfo(String channelCode, String channelTemplateNo, String batchNo) {
+    return this.lambdaUpdate()
+        .set(MNSBatchMessage::getChannelCode, channelCode)
+        .set(MNSBatchMessage::getChannelTemplateNo, channelTemplateNo)
+        .eq(MNSBatchMessage::getBatchNo, batchNo)
+        .eq(MNSBatchMessage::getIsDelete, IsDeletedEnum.NO.getCode())
+        .update();
+  }
+
+  @Override
+  public BatchMessageStatisticsResponseDto getStatisticsMessageInfo(String appNo,
+                                                                    String requestNo) {
+
+    return batchMessageMapper.getStatisticsMessageInfo(appNo,requestNo);
+  }
+
+  @Override
+  public Boolean updateStatusById(Long id, Integer status) {
+    return lambdaUpdate()
+        .set(MNSBatchMessage::getStatus,status)
+        .eq(MNSBatchMessage::getId,id)
+        .eq(MNSBatchMessage::getIsDelete, IsDeletedEnum.NO.getCode())
+        .update();
+  }
+
+  @Override
+  public Boolean updateBachMessageInfoById(Long id, Integer status,
+      Integer successCount, Integer failCount) {
+    return lambdaUpdate()
+        .set(MNSBatchMessage::getStatus, status)
+        .set(MNSBatchMessage::getSuccessCount,successCount)
+        .set(MNSBatchMessage::getFailCount,failCount)
+        .eq(MNSBatchMessage::getId, id)
+        .eq(MNSBatchMessage::getIsDelete, IsDeletedEnum.NO.getCode())
+        .update();
+  }
+
+  @Override
+  public MNSBatchMessage getByChannelMsgIdAndLock(String msgId) {
+    return batchMessageMapper.getByChannelMsgIdAndLock(msgId);
+
+  }
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSBatchMessageRequestDaoImpl.java

@@ -0,0 +1,81 @@
+package cn.axzo.msg.center.dal.impl;
+
+import cn.axzo.msg.center.dal.MNSBatchMessageRequestDao;
+import cn.axzo.msg.center.dal.mapper.MNSBatchMessageRequestMapper;
+import cn.axzo.msg.center.domain.entity.MNSBatchMessageRequest;
+import cn.axzo.msg.center.domain.query.BatchMessageRequestQuery;
+import cn.axzo.msg.center.notices.common.enums.BatchMessageStatusEnum;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Repository;
+
+import java.util.Objects;
+
+/**
+ * <p>
+ * 渠道模板变量序列表 Dao实现类
+ * </p>
+ *
+ * @author szg
+ * @since 2021-08-09
+ */
+@Repository("batchMessageRequestDao")
+public class MNSBatchMessageRequestDaoImpl extends
+        ServiceImpl<MNSBatchMessageRequestMapper, MNSBatchMessageRequest> implements MNSBatchMessageRequestDao {
+
+  @Override
+  public IPage<MNSBatchMessageRequest> queryByPage(BatchMessageRequestQuery query) {
+
+    return this.page(query.toPage(), new LambdaQueryWrapper<MNSBatchMessageRequest>()
+        .eq(query.getId() != null, MNSBatchMessageRequest::getId, query.getId())
+        .ge(query.getStartCreateTime() != null, MNSBatchMessageRequest::getCreateAt, query.getStartCreateTime())
+        .le(query.getEndCreateTime() != null, MNSBatchMessageRequest::getCreateAt, query.getEndCreateTime())
+        .in(CollectionUtils.isNotEmpty(query.getStatuses()), MNSBatchMessageRequest::getStatus, query.getStatuses())
+        .eq(Objects.nonNull(query.getSendType()),MNSBatchMessageRequest::getSendType,query.getSendType())
+        .eq(MNSBatchMessageRequest::getIsDelete, 0)
+        .orderByDesc(MNSBatchMessageRequest::getCreateAt)
+    );
+
+  }
+
+  @Override
+  public MNSBatchMessageRequest queryBatchMessage(String appCode, String requestNo) {
+    return this.lambdaQuery()
+        .eq(MNSBatchMessageRequest::getAppNo, appCode)
+        .eq(MNSBatchMessageRequest::getRequestNo, requestNo)
+        .one();
+  }
+
+  @Override
+  public boolean updateStatusById(Long id, Integer status) {
+    return lambdaUpdate()
+        .set(MNSBatchMessageRequest::getStatus,status)
+        .eq(MNSBatchMessageRequest::getId,id)
+        .eq(MNSBatchMessageRequest::getIsDelete, 0)
+        .update();
+  }
+
+  @Override
+  public boolean updateBatchMessageRequestInfoById(Long id, Integer status,
+      Integer successCount, Integer failCount) {
+    return lambdaUpdate()
+        .set(MNSBatchMessageRequest::getStatus,status)
+        .set(MNSBatchMessageRequest::getSuccessCount,successCount)
+        .set(MNSBatchMessageRequest::getFailCount,failCount)
+        .eq(MNSBatchMessageRequest::getId,id)
+        .eq(MNSBatchMessageRequest::getIsDelete, 0)
+        .update();
+  }
+
+  @Override
+  public boolean updateRequestSuccess(String remark, Long id) {
+    return lambdaUpdate()
+        .set(MNSBatchMessageRequest::getRemark, remark)
+        .set(MNSBatchMessageRequest::getStatus, BatchMessageStatusEnum.SEND_SUCCESS.getCode())
+        .eq(MNSBatchMessageRequest::getId, id)
+        .update();
+  }
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSChannelMessageTemplateDaoImpl.java

@@ -0,0 +1,34 @@
+package cn.axzo.msg.center.dal.impl;
+
+import cn.axzo.msg.center.dal.MNSChannelMessageTemplateDao;
+import cn.axzo.msg.center.dal.mapper.MNSChannelMessageTemplateMapper;
+import cn.axzo.msg.center.domain.entity.MNSChannelMessageTemplate;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 渠道消息模板表 Dao实现类
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+@Repository("channelMessageTemplateDao")
+public class MNSChannelMessageTemplateDaoImpl extends ServiceImpl<MNSChannelMessageTemplateMapper, MNSChannelMessageTemplate> implements MNSChannelMessageTemplateDao {
+
+  @Override
+  public MNSChannelMessageTemplate queryByTemplateNo(String innerTemplateNo, String channelCode) {
+    return this.lambdaQuery()
+        .eq(MNSChannelMessageTemplate::getInnerTemplateNo, innerTemplateNo)
+        .eq(MNSChannelMessageTemplate::getChannelCode, channelCode)
+        .one();
+  }
+
+  @Override
+  public MNSChannelMessageTemplate queryByChannelTemplateNo(String channelTemplateNo) {
+    return this.lambdaQuery().eq(MNSChannelMessageTemplate::getTemplateNo, channelTemplateNo)
+        .eq(MNSChannelMessageTemplate::getIsDelete, 0)
+        .one();
+  }
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMNSMessageRedoDaoImpl.java

@@ -0,0 +1,41 @@
+package cn.axzo.msg.center.dal.impl;
+
+import cn.axzo.msg.center.dal.MNSMessageRedoDao;
+import cn.axzo.msg.center.dal.mapper.MNSMessageRedoMapper;
+import cn.axzo.msg.center.domain.entity.MNSMessageRedo;
+import cn.axzo.msg.center.domain.query.MessageRedoQuery;
+import cn.axzo.msg.center.notices.common.enums.IsDeletedEnum;
+import cn.axzo.msg.center.notices.common.enums.MessageStatusEnum;
+import cn.axzo.msg.center.notices.common.enums.RetryingFlagEnum;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Repository;
+
+@Repository("messageRedoDao")
+public class MNSMNSMessageRedoDaoImpl extends ServiceImpl<MNSMessageRedoMapper, MNSMessageRedo> implements MNSMessageRedoDao {
+
+  @Override
+  public IPage<MNSMessageRedo> queryByPage(MessageRedoQuery query) {
+    return this.page(query.toPage(), new LambdaQueryWrapper<MNSMessageRedo>()
+        .eq(query.getId() != null, MNSMessageRedo::getId, query.getId())
+        .ge(query.getStartCreateTime() != null, MNSMessageRedo::getCreateAt, query.getStartCreateTime())
+        .le(query.getEndCreateTime() != null, MNSMessageRedo::getCreateAt, query.getEndCreateTime())
+        .in(CollectionUtils.isNotEmpty(query.getStatuses()), MNSMessageRedo::getStatus, query.getStatuses())
+        .eq(StringUtils.isNoneBlank(query.getChannelCode()), MNSMessageRedo::getChannelCode, query.getChannelCode())
+        .eq(MNSMessageRedo::getRetryingFlag, RetryingFlagEnum.Y.name())
+        .eq(MNSMessageRedo::getIsDelete, IsDeletedEnum.NO.getCode())
+        .orderByDesc(MNSMessageRedo::getCreateAt));
+  }
+
+  @Override
+  public boolean updateExceptionToFail(Long id) {
+    return lambdaUpdate()
+        .set(MNSMessageRedo::getStatus, MessageStatusEnum.FAIL.getCode())
+        .eq(MNSMessageRedo::getId, id)
+        .eq(MNSMessageRedo::getStatus, MessageStatusEnum.EXCEPTION.getCode())
+        .update();
+  }
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageAppDaoImpl.java

@@ -0,0 +1,28 @@
+package cn.axzo.msg.center.dal.impl;
+
+
+import cn.axzo.msg.center.dal.MNSMessageAppDao;
+import cn.axzo.msg.center.dal.mapper.MNSMessageAppMapper;
+import cn.axzo.msg.center.domain.entity.MNSMessageApp;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 消息应用表 Dao实现类
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+@Repository("messageAppDao")
+public class MNSMessageAppDaoImpl extends ServiceImpl<MNSMessageAppMapper, MNSMessageApp> implements MNSMessageAppDao {
+
+  @Override
+  public MNSMessageApp queryByAppCode(String appCode) {
+    return this.lambdaQuery()
+        .eq(MNSMessageApp::getAppCode, appCode)
+        .one();
+  }
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageChannelDaoImpl.java

@@ -0,0 +1,29 @@
+package cn.axzo.msg.center.dal.impl;
+
+import cn.axzo.msg.center.dal.MNSMessageChannelDao;
+import cn.axzo.msg.center.dal.mapper.MNSMessageChannelMapper;
+import cn.axzo.msg.center.domain.entity.MNSMessageChannel;
+import cn.axzo.msg.center.notices.common.enums.AvailableStatusEnum;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 消息渠道表 Dao实现类
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+@Repository("messageChannelDao")
+public class MNSMessageChannelDaoImpl extends ServiceImpl<MNSMessageChannelMapper, MNSMessageChannel> implements MNSMessageChannelDao {
+
+  @Override
+  public List<MNSMessageChannel> queryAvailable() {
+    return this.lambdaQuery()
+        .eq(MNSMessageChannel::getStatus, AvailableStatusEnum.AVAILABLE.getStatus())
+        .list();
+  }
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageChannelLogDaoImpl.java

@@ -0,0 +1,30 @@
+package cn.axzo.msg.center.dal.impl;
+
+import cn.axzo.msg.center.dal.MNSMessageChannelLogDao;
+import cn.axzo.msg.center.dal.mapper.MNSMessageChannelLogMapper;
+import cn.axzo.msg.center.domain.entity.MNSMessageChannelLog;
+import cn.axzo.msg.center.notices.common.enums.IsDeletedEnum;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 请求消息渠道日志表 Dao实现类
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+@Repository("messageChannelLogDao")
+public class MNSMessageChannelLogDaoImpl extends ServiceImpl<MNSMessageChannelLogMapper, MNSMessageChannelLog> implements MNSMessageChannelLogDao {
+
+  @Override
+  public boolean updateCallbackDate(String callbackDate, String messageOrderNo) {
+    return this.lambdaUpdate()
+        .set(MNSMessageChannelLog::getCallbackData, callbackDate)
+        .eq(MNSMessageChannelLog::getMessageOrderNo, messageOrderNo)
+        .eq(MNSMessageChannelLog::getIsDelete, IsDeletedEnum.NO.getCode())
+        .update();
+  }
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageDaoImpl.java

@@ -0,0 +1,110 @@
+package cn.axzo.msg.center.dal.impl;
+
+import cn.axzo.msg.center.dal.MNSMessageDao;
+import cn.axzo.msg.center.dal.mapper.MNSMessageMapper;
+import cn.axzo.msg.center.domain.entity.MNSMessage;
+import cn.axzo.msg.center.domain.query.MessageQuery;
+import cn.axzo.msg.center.notices.common.enums.IsDeletedEnum;
+import cn.axzo.msg.center.notices.common.enums.MessageStatusEnum;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 消息记录表 Dao实现类
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+@Repository("messageDao")
+public class MNSMessageDaoImpl extends ServiceImpl<MNSMessageMapper, MNSMessage> implements MNSMessageDao {
+
+    @Override
+    public IPage<MNSMessage> queryByPage(MessageQuery query) {
+        return this.page(query.toPage(), new LambdaQueryWrapper<MNSMessage>()
+                .eq(query.getId() != null, MNSMessage::getId, query.getId())
+                .ge(query.getStartCreateTime() != null, MNSMessage::getCreateAt, query.getStartCreateTime())
+                .le(query.getEndCreateTime() != null, MNSMessage::getCreateAt, query.getEndCreateTime())
+                .in(CollectionUtils.isNotEmpty(query.getStatuses()), MNSMessage::getStatus, query.getStatuses())
+                .eq(StringUtils.isNoneBlank(query.getChannelCode()), MNSMessage::getChannelCode, query.getChannelCode())
+                .eq(MNSMessage::getIsDelete, IsDeletedEnum.NO.getCode())
+                .orderByDesc(MNSMessage::getCreateAt));
+    }
+
+    @Override
+    public boolean channelException(Long id) {
+        return this.lambdaUpdate()
+            .set(MNSMessage::getStatus, MessageStatusEnum.EXCEPTION.getCode())
+            .set(MNSMessage::getUpdateAt, new Date())
+            .eq(MNSMessage::getId, id)
+            .eq(MNSMessage::getStatus, MessageStatusEnum.INIT.getCode())
+            .update();
+    }
+
+    @Override
+    public Boolean updateExceptionToFail(String messageOrderNo) {
+        return lambdaUpdate()
+            .set(MNSMessage::getStatus, MessageStatusEnum.FAIL.getCode())
+            .eq(MNSMessage::getMessageOrderNo, messageOrderNo)
+            .eq(MNSMessage::getStatus, MessageStatusEnum.EXCEPTION.getCode())
+            .update();
+    }
+
+  @Override
+  public MNSMessage getByBatchNoAndPhone(String batchNo, String mobile) {
+    return lambdaQuery()
+        .eq(MNSMessage::getBatchNo,batchNo)
+        .eq(MNSMessage::getTargetAddress,mobile)
+        .eq(MNSMessage::getStatus,MessageStatusEnum.INIT.getCode())
+        .eq(MNSMessage::getIsDelete,0)
+        .one();
+  }
+
+  @Override
+  public MNSMessage getByChannelMsgId(String channelMsgId, String mobile) {
+    return lambdaQuery()
+        .eq(MNSMessage::getTargetAddress,mobile)
+        .eq(MNSMessage::getChannelRequestId, channelMsgId)
+        .eq(MNSMessage::getIsDelete,0)
+        .one();
+  }
+
+  @Override
+  public boolean updateBatchMessageChannelInfo(String channelCode, String channelName, String batchNo) {
+    return lambdaUpdate()
+        .set(MNSMessage::getChannelCode, channelCode)
+        .set(MNSMessage::getChannelName, channelName)
+        .eq(MNSMessage::getBatchNo, batchNo)
+        .eq(MNSMessage::getIsDelete, IsDeletedEnum.NO.getCode())
+        .update();
+  }
+
+  @Override
+  public boolean updateAllBatchMessageFail(String errorMsg, String batchNo) {
+    return lambdaUpdate()
+        .set(MNSMessage::getRemark, errorMsg)
+        .set(MNSMessage::getStatus, MessageStatusEnum.FAIL.getCode())
+        .eq(MNSMessage::getBatchNo, batchNo)
+        .eq(MNSMessage::getIsDelete, IsDeletedEnum.NO.getCode())
+        .update();
+  }
+
+  @Override
+  public boolean updateStatusAndRemarkById(Long id, String status, String remark) {
+
+    return lambdaUpdate()
+        .eq(MNSMessage::getId,id)
+        .set(MNSMessage::getStatus,status)
+        .set(MNSMessage::getUpdateAt, new Date())
+        .set(!StringUtils.isEmpty(remark),MNSMessage::getRemark,remark)
+        .update();
+  }
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageRequestLogDaoImpl.java

@@ -0,0 +1,20 @@
+package cn.axzo.msg.center.dal.impl;
+
+import cn.axzo.msg.center.dal.MNSMessageRequestLogDao;
+import cn.axzo.msg.center.dal.mapper.MNSMessageRequestLogMapper;
+import cn.axzo.msg.center.domain.entity.MNSMessageRequestLog;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 外部系统请求表 Dao实现类
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+@Repository("messageRequestLogDao")
+public class MNSMessageRequestLogDaoImpl extends ServiceImpl<MNSMessageRequestLogMapper, MNSMessageRequestLog> implements MNSMessageRequestLogDao {
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageTemplateDaoImpl.java

@@ -0,0 +1,27 @@
+package cn.axzo.msg.center.dal.impl;
+
+import cn.axzo.msg.center.dal.MNSMessageTemplateDao;
+import cn.axzo.msg.center.dal.mapper.MNSMessageTemplateMapper;
+import cn.axzo.msg.center.domain.entity.MNSMessageTemplate;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 内部消息模板表 Dao实现类
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+@Repository("mnsMessageTemplateDao")
+public class MNSMessageTemplateDaoImpl extends ServiceImpl<MNSMessageTemplateMapper, MNSMessageTemplate> implements MNSMessageTemplateDao {
+
+
+  @Override
+  public MNSMessageTemplate queryByTemplateNo(String templateNo) {
+    return this.lambdaQuery()
+        .eq(MNSMessageTemplate::getTemplateNo, templateNo)
+        .one();
+  }
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/impl/MNSMessageTemplateParamDaoImpl.java

@@ -0,0 +1,39 @@
+package cn.axzo.msg.center.dal.impl;
+
+import cn.axzo.msg.center.dal.MNSMessageTemplateParamDao;
+import cn.axzo.msg.center.dal.mapper.MNSMessageTemplateParamMapper;
+import cn.axzo.msg.center.domain.entity.MNSMessageTemplateParam;
+import cn.axzo.msg.center.notices.common.enums.IsDeletedEnum;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 渠道模板变量序列表 Dao实现类
+ * </p>
+ *
+ * @author szg
+ * @since 2021-08-07
+ */
+@Repository("messageTemplateParamDao")
+public class MNSMessageTemplateParamDaoImpl extends ServiceImpl<MNSMessageTemplateParamMapper, MNSMessageTemplateParam> implements
+        MNSMessageTemplateParamDao {
+
+  @Override
+  public List<MNSMessageTemplateParam> getByTemplateNo(String templateNo) {
+    return this.lambdaQuery().eq(MNSMessageTemplateParam::getTemplateNo, templateNo)
+        .eq(MNSMessageTemplateParam::getIsDelete, IsDeletedEnum.NO.getCode())
+        .orderByAsc(MNSMessageTemplateParam::getParamOrder)
+        .list();
+  }
+
+  @Override
+  public List<MNSMessageTemplateParam> getAllMessageTemplateParams() {
+    return this.lambdaQuery()
+        .eq(MNSMessageTemplateParam::getIsDelete, IsDeletedEnum.NO.getCode())
+        .list();
+  }
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSBatchMessageMapper.java

@@ -0,0 +1,22 @@
+package cn.axzo.msg.center.dal.mapper;
+
+import cn.axzo.msg.center.domain.dto.BatchMessageStatisticsResponseDto;
+import cn.axzo.msg.center.domain.entity.MNSBatchMessage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 渠道模板变量序列表 Mapper 接口
+ * </p>
+ *
+ * @author szg
+ * @since 2021-08-09
+ */
+public interface MNSBatchMessageMapper extends BaseMapper<MNSBatchMessage> {
+
+  BatchMessageStatisticsResponseDto getStatisticsMessageInfo(@Param("appNo") String appNo,
+                                                             @Param("requestNo") String requestNo);
+
+  MNSBatchMessage getByChannelMsgIdAndLock(@Param("msgId") String msgId);
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSBatchMessageRequestMapper.java

@@ -0,0 +1,16 @@
+package cn.axzo.msg.center.dal.mapper;
+
+import cn.axzo.msg.center.domain.entity.MNSBatchMessageRequest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 渠道模板变量序列表 Mapper 接口
+ * </p>
+ *
+ * @author szg
+ * @since 2021-08-09
+ */
+public interface MNSBatchMessageRequestMapper extends BaseMapper<MNSBatchMessageRequest> {
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSChannelMessageTemplateMapper.java

@@ -1,6 +1,6 @@
-package cn.axzo.msg.center.notices.dao.mapper;
+package cn.axzo.msg.center.dal.mapper;
 
-import cn.axzo.msg.center.notices.dao.entity.ChannelMessageTemplate;
+import cn.axzo.msg.center.domain.entity.MNSChannelMessageTemplate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author zhaoyong
  * @since 2021-05-19
  */
-public interface ChannelMessageTemplateMapper extends BaseMapper<ChannelMessageTemplate> {
+public interface MNSChannelMessageTemplateMapper extends BaseMapper<MNSChannelMessageTemplate> {
 
     /**
      * 按照短信编码删除

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageAppMapper.java

@@ -0,0 +1,16 @@
+package cn.axzo.msg.center.dal.mapper;
+
+import cn.axzo.msg.center.domain.entity.MNSMessageApp;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 消息应用表 Mapper 接口
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+public interface MNSMessageAppMapper extends BaseMapper<MNSMessageApp> {
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageChannelLogMapper.java

@@ -0,0 +1,16 @@
+package cn.axzo.msg.center.dal.mapper;
+
+import cn.axzo.msg.center.domain.entity.MNSMessageChannelLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 请求消息渠道日志表 Mapper 接口
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+public interface MNSMessageChannelLogMapper extends BaseMapper<MNSMessageChannelLog> {
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageChannelMapper.java

@@ -0,0 +1,16 @@
+package cn.axzo.msg.center.dal.mapper;
+
+import cn.axzo.msg.center.domain.entity.MNSMessageChannel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 消息渠道表 Mapper 接口
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+public interface MNSMessageChannelMapper extends BaseMapper<MNSMessageChannel> {
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageMapper.java

@@ -0,0 +1,16 @@
+package cn.axzo.msg.center.dal.mapper;
+
+import cn.axzo.msg.center.domain.entity.MNSMessage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 消息记录表 Mapper 接口
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+public interface MNSMessageMapper extends BaseMapper<MNSMessage> {
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageRedoMapper.java

@@ -0,0 +1,8 @@
+package cn.axzo.msg.center.dal.mapper;
+
+import cn.axzo.msg.center.domain.entity.MNSMessageRedo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface MNSMessageRedoMapper extends BaseMapper<MNSMessageRedo> {
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageRequestLogMapper.java

@@ -0,0 +1,16 @@
+package cn.axzo.msg.center.dal.mapper;
+
+import cn.axzo.msg.center.domain.entity.MNSMessageRequestLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 外部系统请求表 Mapper 接口
+ * </p>
+ *
+ * @author zhaoyong
+ * @since 2021-05-19
+ */
+public interface MNSMessageRequestLogMapper extends BaseMapper<MNSMessageRequestLog> {
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageTemplateMapper.java

@@ -1,6 +1,6 @@
-package cn.axzo.msg.center.notices.dao.mapper;
+package cn.axzo.msg.center.dal.mapper;
 
-import cn.axzo.msg.center.notices.dao.entity.MessageTemplate;
+import cn.axzo.msg.center.domain.entity.MNSMessageTemplate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
  * @author zhaoyong
  * @since 2021-05-19
  */
-public interface MessageTemplateMapper extends BaseMapper<MessageTemplate> {
+public interface MNSMessageTemplateMapper extends BaseMapper<MNSMessageTemplate> {
     /**
      * 按照短信编码删除
      */

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MNSMessageTemplateParamMapper.java

@@ -0,0 +1,16 @@
+package cn.axzo.msg.center.dal.mapper;
+
+import cn.axzo.msg.center.domain.entity.MNSMessageTemplateParam;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 渠道模板变量序列表 Mapper 接口
+ * </p>
+ *
+ * @author szg
+ * @since 2021-08-07
+ */
+public interface MNSMessageTemplateParamMapper extends BaseMapper<MNSMessageTemplateParam> {
+
+}

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageModuleMapper.java

@@ -1,8 +1,8 @@
-package cn.axzo.msg.center.inside.notices.dao.mapper;
+package cn.axzo.msg.center.dal.mapper;
 
-import cn.axzo.msg.center.inside.notices.entity.MessageModule;
+import cn.axzo.msg.center.domain.dto.MsgModuleDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.MsgModuleDTO;
+import cn.axzo.msg.center.domain.dto.SyncModuleDataDTO;
-import cn.axzo.msg.center.inside.notices.service.dto.SyncModuleDataDTO;
+import cn.axzo.msg.center.domain.entity.MessageModule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRecordMapper.java

@@ -1,10 +1,10 @@
-package cn.axzo.msg.center.inside.notices.dao.mapper;
+package cn.axzo.msg.center.dal.mapper;
 
 
-import cn.axzo.msg.center.inside.notices.entity.MessageRecord;
+import cn.axzo.msg.center.domain.dto.MsgStatisticsDTO;
-import cn.axzo.msg.center.inside.notices.model.request.CmsMsgQueryReq;
+import cn.axzo.msg.center.domain.entity.MessageRecord;
-import cn.axzo.msg.center.inside.notices.model.request.MessageNewRes;
+import cn.axzo.msg.center.domain.request.CmsMsgQueryReq;
-import cn.axzo.msg.center.inside.notices.service.dto.MsgStatisticsDTO;
+import cn.axzo.msg.center.domain.request.MessageNewRes;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRelationMapper.java

@@ -1,6 +1,6 @@
-package cn.axzo.msg.center.inside.notices.dao.mapper;
+package cn.axzo.msg.center.dal.mapper;
 
-import cn.axzo.msg.center.inside.notices.entity.MessageRelation;
+import cn.axzo.msg.center.domain.entity.MessageRelation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRouterMapper.java

@@ -1,8 +1,8 @@
-package cn.axzo.msg.center.inside.notices.dao.mapper;
+package cn.axzo.msg.center.dal.mapper;
 
 
-import cn.axzo.msg.center.inside.notices.entity.MessageRouter;
+import cn.axzo.msg.center.domain.dto.SyncRouterDataDTO;
-import cn.axzo.msg.center.inside.notices.model.dto.SyncRouterDataDTO;
+import cn.axzo.msg.center.domain.entity.MessageRouter;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageTemplateMapper.java

@@ -1,6 +1,6 @@
-package cn.axzo.msg.center.inside.notices.dao.mapper;
+package cn.axzo.msg.center.dal.mapper;
 
-import cn.axzo.msg.center.inside.notices.entity.MessageTemplate;
+import cn.axzo.msg.center.domain.entity.MessageTemplate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;

msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MsgDynamicMapper.java

@@ -1,6 +1,6 @@
-package cn.axzo.msg.center.inside.notices.dao.mapper;
+package cn.axzo.msg.center.dal.mapper;
 
-import cn.axzo.msg.center.inside.notices.entity.MsgDynamic;
+import cn.axzo.msg.center.domain.entity.MsgDynamic;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

msg-center-dal/src/main/resources/mapper/MNSBatchMessageMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.axzo.msg.center.notices.dao.mapper.BatchMessageMapper">
+<mapper namespace="cn.axzo.mns.dal.mapper.BatchMessageMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.axzo.msg.center.notices.dao.entity.BatchMessage">
+    <resultMap id="BaseResultMap" type="cn.axzo.mns.dal.entity.BatchMessage">
         <id column="id" property="id" />
         <result column="request_no" property="requestNo" />
         <result column="batch_no" property="batchNo" />
@@ -33,22 +33,22 @@
         id, request_no, batch_no, app_no, template_no, channel_template_no, message_order_no, sms_content, batch_size, success_count, fail_count, send_type, status, submit_success_num, submit_fail_num, channel_msg_id, channel_code, channel_return_code, channel_error_msg, create_at, update_at, is_delete
     </sql>
   <select id="getStatisticsMessageInfo"
-    resultType="cn.axzo.msg.center.notices.dao.domain.BatchMessageStatisticsResponseDto">
+    resultType="cn.axzo.mns.dal.domain.BatchMessageStatisticsResponseDto">
 
       select
         sum(fail_count) as failCount,
         sum(success_count) as successCount,
         sum(fail_count) + sum(success_count) as totalCount
-      from mns_batch_message
+      from batch_message
       where app_no = #{appNo}
       and request_no = #{requestNo}
       and is_delete = 0
       group by app_no,request_no
   </select>
 
-  <select id="getByChannelMsgIdAndLock" resultType="cn.axzo.msg.center.notices.dao.entity.BatchMessage">
+  <select id="getByChannelMsgIdAndLock" resultType="cn.axzo.mns.dal.entity.BatchMessage">
       select *
-      from mns_batch_message
+      from batch_message
       where channel_msg_id = #{msgId}
       and is_delete = 0
       for update

msg-center-dal/src/main/resources/mapper/MNSBatchMessageRequestMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.axzo.msg.center.notices.dao.mapper.BatchMessageRequestMapper">
+<mapper namespace="cn.axzo.mns.dal.mapper.BatchMessageRequestMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.axzo.msg.center.notices.dao.entity.BatchMessageRequest">
+    <resultMap id="BaseResultMap" type="cn.axzo.mns.dal.entity.BatchMessageRequest">
         <id column="id" property="id" />
         <result column="app_no" property="appNo" />
         <result column="request_no" property="requestNo" />

msg-center-dal/src/main/resources/mapper/MNSChannelMessageTemplateMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.axzo.msg.center.notices.dao.mapper.ChannelMessageTemplateMapper">
+<mapper namespace="cn.axzo.mns.dal.mapper.ChannelMessageTemplateMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.axzo.msg.center.notices.dao.entity.ChannelMessageTemplate">
+    <resultMap id="BaseResultMap" type="cn.axzo.mns.dal.entity.ChannelMessageTemplate">
         <id column="id" property="id" />
         <result column="inner_template_no" property="innerTemplateNo" />
         <result column="template_no" property="templateNo" />
@@ -28,7 +28,7 @@
         id, inner_template_no, template_no, channel_code, channel_name, title, template_content, type, status, has_param, remark, reason, create_at, update_at, create_by, update_by, is_delete
     </sql>
     <delete id="deleteByTemplateNo">
-        delete from mns_channel_message_template where inner_template_no = #{templateNo}
+        delete from channel_message_template where inner_template_no = #{templateNo}
     </delete>
 
 </mapper>

msg-center-dal/src/main/resources/mapper/MNSMessageAppMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.axzo.msg.center.notices.dao.mapper.MessageAppMapper">
+<mapper namespace="cn.axzo.mns.dal.mapper.MessageAppMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.axzo.msg.center.notices.dao.entity.MessageApp">
+    <resultMap id="BaseResultMap" type="cn.axzo.mns.dal.entity.MessageApp">
         <id column="id" property="id" />
         <result column="app_code" property="appCode" />
         <result column="app_name" property="appName" />

msg-center-dal/src/main/resources/mapper/MNSMessageChannelLogMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.axzo.msg.center.notices.dao.mapper.MessageChannelLogMapper">
+<mapper namespace="cn.axzo.mns.dal.mapper.MessageChannelLogMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.axzo.msg.center.notices.dao.entity.MessageChannelLog">
+    <resultMap id="BaseResultMap" type="cn.axzo.mns.dal.entity.MessageChannelLog">
         <id column="id" property="id" />
         <result column="app_no" property="appNo" />
         <result column="app_request_no" property="appRequestNo" />

msg-center-dal/src/main/resources/mapper/MNSMessageChannelMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.axzo.msg.center.notices.dao.mapper.MessageChannelMapper">
+<mapper namespace="cn.axzo.mns.dal.mapper.MessageChannelMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.axzo.msg.center.notices.dao.entity.MessageChannel">
+    <resultMap id="BaseResultMap" type="cn.axzo.mns.dal.entity.MessageChannel">
         <id column="id" property="id" />
         <result column="channel_code" property="channelCode" />
         <result column="channel_name" property="channelName" />

msg-center-dal/src/main/resources/mapper/MNSMessageMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.axzo.msg.center.notices.dao.mapper.MessageMapper">
+<mapper namespace="cn.axzo.mns.dal.mapper.MessageMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.axzo.msg.center.notices.dao.entity.Message">
+    <resultMap id="BaseResultMap" type="cn.axzo.mns.dal.entity.Message">
         <id column="id" property="id" />
         <result column="app_no" property="appNo" />
         <result column="request_no" property="requestNo" />

msg-center-dal/src/main/resources/mapper/MNSMessageRedoMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.axzo.msg.center.notices.dao.mapper.MessageRedoMapper">
+<mapper namespace="cn.axzo.mns.dal.mapper.MessageRedoMapper">
-  <resultMap id="BaseResultMap" type="cn.axzo.msg.center.notices.dao.entity.MessageRedo">
+  <resultMap id="BaseResultMap" type="cn.axzo.mns.dal.entity.MessageRedo">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="app_no" jdbcType="VARCHAR" property="appNo" />
     <result column="request_no" jdbcType="VARCHAR" property="requestNo" />

msg-center-dal/src/main/resources/mapper/MNSMessageRequestLogMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.axzo.msg.center.notices.dao.mapper.MessageRequestLogMapper">
+<mapper namespace="cn.axzo.mns.dal.mapper.MessageRequestLogMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.axzo.msg.center.notices.dao.entity.MessageRequestLog">
+    <resultMap id="BaseResultMap" type="cn.axzo.mns.dal.entity.MessageRequestLog">
         <id column="id" property="id" />
         <result column="app_no" property="appNo" />
         <result column="request_no" property="requestNo" />

msg-center-dal/src/main/resources/mapper/MNSMessageTemplateMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.axzo.msg.center.notices.dao.mapper.MessageTemplateMapper">
+<mapper namespace="cn.axzo.mns.dal.mapper.MessageTemplateMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.axzo.msg.center.notices.dao.entity.MessageTemplate">
+    <resultMap id="BaseResultMap" type="cn.axzo.mns.dal.entity.MessageTemplate">
         <id column="id" property="id" />
         <result column="template_no" property="templateNo" />
         <result column="title" property="title" />
@@ -24,7 +24,7 @@
         id, template_no, title, template_content, type, status, reason, remark, create_at, update_at, create_by, update_by, is_delete
     </sql>
     <delete id="deleteByTemplateNo">
-        delete from mns_message_template where template_no = #{templateNo}
+        delete from message_template where template_no = #{templateNo}
     </delete>
 
 </mapper>

msg-center-dal/src/main/resources/mapper/MNSMessageTemplateParamMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.axzo.msg.center.notices.dao.mapper.MessageTemplateParamMapper">
+<mapper namespace="cn.axzo.mns.dal.mapper.MessageTemplateParamMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.axzo.msg.center.notices.dao.entity.MessageTemplateParam">
+    <resultMap id="BaseResultMap" type="cn.axzo.mns.dal.entity.MessageTemplateParam">
         <id column="id" property="id" />
         <result column="template_no" property="templateNo" />
         <result column="param_name" property="paramName" />

msg-center-domain/pom.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>msg-center</artifactId>
+        <groupId>cn.axzo.msgcenter</groupId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.axzo.msg.center.domain</groupId>
+    <artifactId>msg-center-domain</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.msgcenter</groupId>
+            <artifactId>msg-center-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.msg.notices.common</groupId>
+            <artifactId>msg-notices-common</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/constant/CommonConstanst.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.constant;
+package cn.axzo.msg.center.domain.constant;
 
 /**
  * @author lzr

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/constant/MessageTypeConstant.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.constant;
+package cn.axzo.msg.center.domain.constant;
 
 /**
  * @author xin.huangxin

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/BatchMessageStatisticsResponseDto.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.notices.dao.domain;
+package cn.axzo.msg.center.domain.dto;
 
 
 import lombok.Data;

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/CreateModuleDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.service.dto;
+package cn.axzo.msg.center.domain.dto;
 
 import lombok.Data;
 

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/CreateTemplateDTO.java

@@ -1,6 +1,5 @@
-package cn.axzo.msg.center.inside.notices.service.dto;
+package cn.axzo.msg.center.domain.dto;
 
-import cn.axzo.msg.center.inside.notices.model.dto.TemplateRouterDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/MsgModuleDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.service.dto;
+package cn.axzo.msg.center.domain.dto;
 
 import lombok.Data;
 

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/MsgStatisticsDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.service.dto;
+package cn.axzo.msg.center.domain.dto;
 
 import lombok.Data;
 

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/SearchModuleDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.service.dto;
+package cn.axzo.msg.center.domain.dto;
 
 import cn.axzo.basics.common.page.PageRequest;
 import lombok.Data;

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/SearchTemplateDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.service.dto;
+package cn.axzo.msg.center.domain.dto;
 
 import cn.axzo.basics.common.page.PageRequest;
 import lombok.Data;

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/SyncModuleDataDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.service.dto;
+package cn.axzo.msg.center.domain.dto;
 
 import lombok.Data;
 

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/SyncRelationDataDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.service.dto;
+package cn.axzo.msg.center.domain.dto;
 
 import lombok.Data;
 

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/SyncRouterDataDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.model.dto;
+package cn.axzo.msg.center.domain.dto;
 
 import lombok.Data;
 

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/SyncTemplateDataDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.service.dto;
+package cn.axzo.msg.center.domain.dto;
 
 import lombok.Data;
 

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/TemplateRouterDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.model.dto;
+package cn.axzo.msg.center.domain.dto;
 
 import lombok.Data;
 

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/UpdateModuleDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.service.dto;
+package cn.axzo.msg.center.domain.dto;
 
 import lombok.Data;
 

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/dto/UpdateTemplateDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.inside.notices.service.dto;
+package cn.axzo.msg.center.domain.dto;
 
 import lombok.Data;
 

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MNSBatchMessage.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.notices.dao.entity;
+package cn.axzo.msg.center.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -24,7 +24,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("mns_batch_message")
-public class BatchMessage extends Model<BatchMessage> {
+public class MNSBatchMessage extends Model<MNSBatchMessage> {
 
     private static final long serialVersionUID=1L;
 

msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/MNSBatchMessageRequest.java

@@ -1,4 +1,4 @@
-package cn.axzo.msg.center.notices.dao.entity;
+package cn.axzo.msg.center.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -24,7 +24,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("mns_batch_message_request")
-public class BatchMessageRequest extends Model<BatchMessageRequest> {
+public class MNSBatchMessageRequest extends Model<MNSBatchMessageRequest> {
 
     private static final long serialVersionUID=1L;