refactor所有的entity

pom.xml

@@ -33,10 +33,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-starter-log4j2</artifactId>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -71,6 +67,11 @@
 
         <!--其他依赖-->
         <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.7</version>
+        </dependency>
+        <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>${fastjson.version}</version>

src/main/java/com/stylefeng/guns/common/constant/factory/ConstantFactory.java

@@ -6,13 +6,13 @@ import com.stylefeng.guns.common.constant.cache.CacheKey;
 import com.stylefeng.guns.common.constant.state.ManagerStatus;
 import com.stylefeng.guns.common.constant.state.MenuStatus;
 import com.stylefeng.guns.common.constant.state.Sex;
+import com.stylefeng.guns.common.persistence.dao.*;
+import com.stylefeng.guns.common.persistence.model.*;
 import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.support.StrKit;
 import com.stylefeng.guns.core.util.Convert;
 import com.stylefeng.guns.core.util.SpringContextHolder;
 import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.persistence.dao.*;
-import com.stylefeng.guns.persistence.model.*;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;

src/main/java/com/stylefeng/guns/persistence/dao/DeptMapper.java → src/main/java/com/stylefeng/guns/common/persistence/dao/DeptMapper.java

-package com.stylefeng.guns.persistence.dao;
+package com.stylefeng.guns.common.persistence.dao;
 
-import com.stylefeng.guns.persistence.model.Dept;
+import com.stylefeng.guns.common.persistence.model.Dept;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public interface DeptMapper extends BaseMapper<Dept> {
 

src/main/java/com/stylefeng/guns/persistence/dao/DictMapper.java → src/main/java/com/stylefeng/guns/common/persistence/dao/DictMapper.java

-package com.stylefeng.guns.persistence.dao;
+package com.stylefeng.guns.common.persistence.dao;
 
-import com.stylefeng.guns.persistence.model.Dict;
+import com.stylefeng.guns.common.persistence.model.Dict;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public interface DictMapper extends BaseMapper<Dict> {
 

src/main/java/com/stylefeng/guns/persistence/dao/LoginLogMapper.java → src/main/java/com/stylefeng/guns/common/persistence/dao/LoginLogMapper.java

-package com.stylefeng.guns.persistence.dao;
+package com.stylefeng.guns.common.persistence.dao;
 
-import com.stylefeng.guns.persistence.model.LoginLog;
+import com.stylefeng.guns.common.persistence.model.LoginLog;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public interface LoginLogMapper extends BaseMapper<LoginLog> {
 

src/main/java/com/stylefeng/guns/persistence/dao/MenuMapper.java → src/main/java/com/stylefeng/guns/common/persistence/dao/MenuMapper.java

-package com.stylefeng.guns.persistence.dao;
+package com.stylefeng.guns.common.persistence.dao;
 
-import com.stylefeng.guns.persistence.model.Menu;
+import com.stylefeng.guns.common.persistence.model.Menu;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public interface MenuMapper extends BaseMapper<Menu> {
 

src/main/java/com/stylefeng/guns/persistence/dao/NoticeMapper.java → src/main/java/com/stylefeng/guns/common/persistence/dao/NoticeMapper.java

-package com.stylefeng.guns.persistence.dao;
+package com.stylefeng.guns.common.persistence.dao;
 
-import com.stylefeng.guns.persistence.model.Notice;
+import com.stylefeng.guns.common.persistence.model.Notice;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public interface NoticeMapper extends BaseMapper<Notice> {
 

src/main/java/com/stylefeng/guns/persistence/dao/OperationLogMapper.java → src/main/java/com/stylefeng/guns/common/persistence/dao/OperationLogMapper.java

-package com.stylefeng.guns.persistence.dao;
+package com.stylefeng.guns.common.persistence.dao;
 
-import com.stylefeng.guns.persistence.model.OperationLog;
+import com.stylefeng.guns.common.persistence.model.OperationLog;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public interface OperationLogMapper extends BaseMapper<OperationLog> {
 

src/main/java/com/stylefeng/guns/persistence/dao/RelationMapper.java → src/main/java/com/stylefeng/guns/common/persistence/dao/RelationMapper.java

-package com.stylefeng.guns.persistence.dao;
+package com.stylefeng.guns.common.persistence.dao;
 
-import com.stylefeng.guns.persistence.model.Relation;
+import com.stylefeng.guns.common.persistence.model.Relation;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public interface RelationMapper extends BaseMapper<Relation> {
 

src/main/java/com/stylefeng/guns/persistence/dao/RoleMapper.java → src/main/java/com/stylefeng/guns/common/persistence/dao/RoleMapper.java

-package com.stylefeng.guns.persistence.dao;
+package com.stylefeng.guns.common.persistence.dao;
 
-import com.stylefeng.guns.persistence.model.Role;
+import com.stylefeng.guns.common.persistence.model.Role;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public interface RoleMapper extends BaseMapper<Role> {
 

src/main/java/com/stylefeng/guns/persistence/dao/UserMapper.java → src/main/java/com/stylefeng/guns/common/persistence/dao/UserMapper.java

-package com.stylefeng.guns.persistence.dao;
+package com.stylefeng.guns.common.persistence.dao;
 
-import com.stylefeng.guns.persistence.model.User;
+import com.stylefeng.guns.common.persistence.model.User;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public interface UserMapper extends BaseMapper<User> {
 

src/main/java/com/stylefeng/guns/persistence/dao/mapping/DeptMapper.xml → src/main/java/com/stylefeng/guns/common/persistence/dao/mapping/DeptMapper.xml

 <?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="com.stylefeng.guns.persistence.dao.DeptMapper">
+<mapper namespace="com.stylefeng.guns.common.persistence.dao.DeptMapper">
 
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.persistence.model.Dept">
+	<resultMap id="BaseResultMap" type="com.stylefeng.guns.common.persistence.model.Dept">
 		<id column="id" property="id" />
 		<result column="num" property="num" />
 		<result column="pid" property="pid" />

src/main/java/com/stylefeng/guns/persistence/dao/mapping/DictMapper.xml → src/main/java/com/stylefeng/guns/common/persistence/dao/mapping/DictMapper.xml

 <?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="com.stylefeng.guns.persistence.dao.DictMapper">
+<mapper namespace="com.stylefeng.guns.common.persistence.dao.DictMapper">
 
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.persistence.model.Dict">
+	<resultMap id="BaseResultMap" type="com.stylefeng.guns.common.persistence.model.Dict">
 		<id column="id" property="id" />
 		<result column="num" property="num" />
 		<result column="pid" property="pid" />

src/main/java/com/stylefeng/guns/persistence/dao/mapping/LoginLogMapper.xml → src/main/java/com/stylefeng/guns/common/persistence/dao/mapping/LoginLogMapper.xml

 <?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="com.stylefeng.guns.persistence.dao.LoginLogMapper">
+<mapper namespace="com.stylefeng.guns.common.persistence.dao.LoginLogMapper">
 
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.persistence.model.LoginLog">
+	<resultMap id="BaseResultMap" type="com.stylefeng.guns.common.persistence.model.LoginLog">
 		<id column="id" property="id" />
 		<result column="logname" property="logname" />
 		<result column="userid" property="userid" />

src/main/java/com/stylefeng/guns/persistence/dao/mapping/MenuMapper.xml → src/main/java/com/stylefeng/guns/common/persistence/dao/mapping/MenuMapper.xml

 <?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="com.stylefeng.guns.persistence.dao.MenuMapper">
+<mapper namespace="com.stylefeng.guns.common.persistence.dao.MenuMapper">
 
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.persistence.model.Menu">
+	<resultMap id="BaseResultMap" type="com.stylefeng.guns.common.persistence.model.Menu">
 		<id column="id" property="id" />
 		<result column="code" property="code" />
 		<result column="pcode" property="pcode" />

src/main/java/com/stylefeng/guns/persistence/dao/mapping/NoticeMapper.xml → src/main/java/com/stylefeng/guns/common/persistence/dao/mapping/NoticeMapper.xml

 <?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="com.stylefeng.guns.persistence.dao.NoticeMapper">
+<mapper namespace="com.stylefeng.guns.common.persistence.dao.NoticeMapper">
 
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.persistence.model.Notice">
+	<resultMap id="BaseResultMap" type="com.stylefeng.guns.common.persistence.model.Notice">
 		<id column="id" property="id" />
 		<result column="title" property="title" />
 		<result column="type" property="type" />

src/main/java/com/stylefeng/guns/persistence/dao/mapping/OperationLogMapper.xml → src/main/java/com/stylefeng/guns/common/persistence/dao/mapping/OperationLogMapper.xml

 <?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="com.stylefeng.guns.persistence.dao.OperationLogMapper">
+<mapper namespace="com.stylefeng.guns.common.persistence.dao.OperationLogMapper">
 
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.persistence.model.OperationLog">
+	<resultMap id="BaseResultMap" type="com.stylefeng.guns.common.persistence.model.OperationLog">
 		<id column="id" property="id" />
 		<result column="logtype" property="logtype" />
 		<result column="logname" property="logname" />

src/main/java/com/stylefeng/guns/persistence/dao/mapping/RelationMapper.xml → src/main/java/com/stylefeng/guns/common/persistence/dao/mapping/RelationMapper.xml

 <?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="com.stylefeng.guns.persistence.dao.RelationMapper">
+<mapper namespace="com.stylefeng.guns.common.persistence.dao.RelationMapper">
 
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.persistence.model.Relation">
+	<resultMap id="BaseResultMap" type="com.stylefeng.guns.common.persistence.model.Relation">
 		<id column="id" property="id" />
 		<result column="menuid" property="menuid" />
 		<result column="roleid" property="roleid" />

src/main/java/com/stylefeng/guns/persistence/dao/mapping/RoleMapper.xml → src/main/java/com/stylefeng/guns/common/persistence/dao/mapping/RoleMapper.xml

 <?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="com.stylefeng.guns.persistence.dao.RoleMapper">
+<mapper namespace="com.stylefeng.guns.common.persistence.dao.RoleMapper">
 
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.persistence.model.Role">
+	<resultMap id="BaseResultMap" type="com.stylefeng.guns.common.persistence.model.Role">
 		<id column="id" property="id" />
 		<result column="num" property="num" />
 		<result column="pid" property="pid" />

src/main/java/com/stylefeng/guns/persistence/dao/mapping/UserMapper.xml → src/main/java/com/stylefeng/guns/common/persistence/dao/mapping/UserMapper.xml

 <?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="com.stylefeng.guns.persistence.dao.UserMapper">
+<mapper namespace="com.stylefeng.guns.common.persistence.dao.UserMapper">
 
 	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.stylefeng.guns.persistence.model.User">
+	<resultMap id="BaseResultMap" type="com.stylefeng.guns.common.persistence.model.User">
 		<id column="id" property="id" />
 		<result column="avatar" property="avatar" />
 		<result column="account" property="account" />

src/main/java/com/stylefeng/guns/persistence/model/Dept.java → src/main/java/com/stylefeng/guns/common/persistence/model/Dept.java

-package com.stylefeng.guns.persistence.model;
+package com.stylefeng.guns.common.persistence.model;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public class Dept extends Model<Dept> {
 

src/main/java/com/stylefeng/guns/persistence/model/Dict.java → src/main/java/com/stylefeng/guns/common/persistence/model/Dict.java

-package com.stylefeng.guns.persistence.model;
+package com.stylefeng.guns.common.persistence.model;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public class Dict extends Model<Dict> {
 

src/main/java/com/stylefeng/guns/persistence/model/LoginLog.java → src/main/java/com/stylefeng/guns/common/persistence/model/LoginLog.java

-package com.stylefeng.guns.persistence.model;
+package com.stylefeng.guns.common.persistence.model;
 
-import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
 import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -14,7 +13,7 @@ import java.util.Date;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 @TableName("login_log")
 public class LoginLog extends Model<LoginLog> {

src/main/java/com/stylefeng/guns/persistence/model/Menu.java → src/main/java/com/stylefeng/guns/common/persistence/model/Menu.java

-package com.stylefeng.guns.persistence.model;
+package com.stylefeng.guns.common.persistence.model;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public class Menu extends Model<Menu> {
 

src/main/java/com/stylefeng/guns/persistence/model/Notice.java → src/main/java/com/stylefeng/guns/common/persistence/model/Notice.java

-package com.stylefeng.guns.persistence.model;
+package com.stylefeng.guns.common.persistence.model;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import java.util.Date;
@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public class Notice extends Model<Notice> {
 

src/main/java/com/stylefeng/guns/persistence/model/OperationLog.java → src/main/java/com/stylefeng/guns/common/persistence/model/OperationLog.java

-package com.stylefeng.guns.persistence.model;
+package com.stylefeng.guns.common.persistence.model;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import java.util.Date;
@@ -13,7 +13,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 @TableName("operation_log")
 public class OperationLog extends Model<OperationLog> {

src/main/java/com/stylefeng/guns/persistence/model/Relation.java → src/main/java/com/stylefeng/guns/common/persistence/model/Relation.java

-package com.stylefeng.guns.persistence.model;
+package com.stylefeng.guns.common.persistence.model;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public class Relation extends Model<Relation> {
 

src/main/java/com/stylefeng/guns/persistence/model/Role.java → src/main/java/com/stylefeng/guns/common/persistence/model/Role.java

-package com.stylefeng.guns.persistence.model;
+package com.stylefeng.guns.common.persistence.model;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -11,7 +11,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public class Role extends Model<Role> {
 

src/main/java/com/stylefeng/guns/persistence/model/User.java → src/main/java/com/stylefeng/guns/common/persistence/model/User.java

-package com.stylefeng.guns.persistence.model;
+package com.stylefeng.guns.common.persistence.model;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import java.util.Date;
@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author stylefeng
- * @since 2017-05-16
+ * @since 2017-05-21
  */
 public class User extends Model<User> {
 

src/main/java/com/stylefeng/guns/config/MybatisPlusConfig.java

@@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration;
  * @Date 2017/5/20 21:58
  */
 @Configuration
-@MapperScan(basePackages = {"com.stylefeng.guns.modular.*.dao", "com.stylefeng.guns.persistence.dao"})
+@MapperScan(basePackages = {"com.stylefeng.guns.modular.*.dao", "com.stylefeng.guns.common.persistence.dao"})
 public class MybatisPlusConfig {
 
     @Autowired

src/main/java/com/stylefeng/guns/core/log/factory/LogFactory.java

@@ -2,8 +2,8 @@ package com.stylefeng.guns.core.log.factory;
 
 import com.stylefeng.guns.common.constant.state.LogSucceed;
 import com.stylefeng.guns.common.constant.state.LogType;
-import com.stylefeng.guns.persistence.model.LoginLog;
-import com.stylefeng.guns.persistence.model.OperationLog;
+import com.stylefeng.guns.common.persistence.model.LoginLog;
+import com.stylefeng.guns.common.persistence.model.OperationLog;
 
 import java.util.Date;
 

src/main/java/com/stylefeng/guns/core/log/factory/LogTaskFactory.java

@@ -5,10 +5,10 @@ import com.stylefeng.guns.common.constant.state.LogType;
 import com.stylefeng.guns.core.db.Db;
 import com.stylefeng.guns.core.log.LogManager;
 import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.persistence.dao.LoginLogMapper;
-import com.stylefeng.guns.persistence.dao.OperationLogMapper;
-import com.stylefeng.guns.persistence.model.LoginLog;
-import com.stylefeng.guns.persistence.model.OperationLog;
+import com.stylefeng.guns.common.persistence.dao.LoginLogMapper;
+import com.stylefeng.guns.common.persistence.dao.OperationLogMapper;
+import com.stylefeng.guns.common.persistence.model.LoginLog;
+import com.stylefeng.guns.common.persistence.model.OperationLog;
 import org.apache.log4j.Logger;
 
 import java.util.TimerTask;

src/main/java/com/stylefeng/guns/core/shiro/ShiroDbRealm.java

@@ -3,7 +3,7 @@ package com.stylefeng.guns.core.shiro;
 import com.stylefeng.guns.core.shiro.factory.IShiro;
 import com.stylefeng.guns.core.shiro.factory.ShiroFactroy;
 import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.persistence.model.User;
+import com.stylefeng.guns.common.persistence.model.User;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.authc.credential.CredentialsMatcher;
 import org.apache.shiro.authc.credential.HashedCredentialsMatcher;

src/main/java/com/stylefeng/guns/core/shiro/factory/IShiro.java

 package com.stylefeng.guns.core.shiro.factory;
 
 import com.stylefeng.guns.core.shiro.ShiroUser;
-import com.stylefeng.guns.persistence.model.User;
+import com.stylefeng.guns.common.persistence.model.User;
 import org.apache.shiro.authc.SimpleAuthenticationInfo;
 
 import java.util.List;

src/main/java/com/stylefeng/guns/core/shiro/factory/ShiroFactroy.java

@@ -7,7 +7,7 @@ import com.stylefeng.guns.core.util.Convert;
 import com.stylefeng.guns.core.util.SpringContextHolder;
 import com.stylefeng.guns.modular.system.dao.MenuDao;
 import com.stylefeng.guns.modular.system.dao.UserMgrDao;
-import com.stylefeng.guns.persistence.model.User;
+import com.stylefeng.guns.common.persistence.model.User;
 import org.apache.shiro.authc.CredentialsException;
 import org.apache.shiro.authc.LockedAccountException;
 import org.apache.shiro.authc.SimpleAuthenticationInfo;

src/main/java/com/stylefeng/guns/modular/system/controller/BlackboardController.java

@@ -2,14 +2,14 @@ package com.stylefeng.guns.modular.system.controller;
 
 import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.modular.system.dao.NoticeDao;
-import com.stylefeng.guns.persistence.dao.NoticeMapper;
-import com.stylefeng.guns.persistence.dao.UserMapper;
+import com.stylefeng.guns.common.persistence.dao.NoticeMapper;
+import com.stylefeng.guns.common.persistence.dao.UserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.stylefeng.guns.persistence.model.User;
+import com.stylefeng.guns.common.persistence.model.User;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/stylefeng/guns/modular/system/controller/DeptController.java

@@ -13,8 +13,8 @@ import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.DeptDao;
 import com.stylefeng.guns.modular.system.warpper.DeptWarpper;
-import com.stylefeng.guns.persistence.dao.DeptMapper;
-import com.stylefeng.guns.persistence.model.Dept;
+import com.stylefeng.guns.common.persistence.dao.DeptMapper;
+import com.stylefeng.guns.common.persistence.model.Dept;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;

src/main/java/com/stylefeng/guns/modular/system/controller/DictController.java

@@ -13,8 +13,8 @@ import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.DictDao;
 import com.stylefeng.guns.modular.system.service.IDictService;
 import com.stylefeng.guns.modular.system.warpper.DictWarpper;
-import com.stylefeng.guns.persistence.dao.DictMapper;
-import com.stylefeng.guns.persistence.model.Dict;
+import com.stylefeng.guns.common.persistence.dao.DictMapper;
+import com.stylefeng.guns.common.persistence.model.Dict;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;

src/main/java/com/stylefeng/guns/modular/system/controller/LogController.java

@@ -11,8 +11,8 @@ import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.core.support.BeanKit;
 import com.stylefeng.guns.modular.system.dao.LogDao;
 import com.stylefeng.guns.modular.system.warpper.LogWarpper;
-import com.stylefeng.guns.persistence.dao.OperationLogMapper;
-import com.stylefeng.guns.persistence.model.OperationLog;
+import com.stylefeng.guns.common.persistence.dao.OperationLogMapper;
+import com.stylefeng.guns.common.persistence.model.OperationLog;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java

@@ -11,8 +11,8 @@ import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.core.shiro.ShiroUser;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.MenuDao;
-import com.stylefeng.guns.persistence.dao.UserMapper;
-import com.stylefeng.guns.persistence.model.User;
+import com.stylefeng.guns.common.persistence.dao.UserMapper;
+import com.stylefeng.guns.common.persistence.model.User;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/stylefeng/guns/modular/system/controller/LoginLogController.java

@@ -7,7 +7,7 @@ import com.stylefeng.guns.common.constant.factory.PageFactory;
 import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.modular.system.dao.LogDao;
 import com.stylefeng.guns.modular.system.warpper.LogWarpper;
-import com.stylefeng.guns.persistence.model.OperationLog;
+import com.stylefeng.guns.common.persistence.model.OperationLog;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;

src/main/java/com/stylefeng/guns/modular/system/controller/MenuController.java

@@ -16,8 +16,8 @@ import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.MenuDao;
 import com.stylefeng.guns.modular.system.service.IMenuService;
 import com.stylefeng.guns.modular.system.warpper.MenuWarpper;
-import com.stylefeng.guns.persistence.dao.MenuMapper;
-import com.stylefeng.guns.persistence.model.Menu;
+import com.stylefeng.guns.common.persistence.dao.MenuMapper;
+import com.stylefeng.guns.common.persistence.model.Menu;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;

src/main/java/com/stylefeng/guns/modular/system/controller/NoticeController.java

@@ -11,8 +11,8 @@ import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.NoticeDao;
 import com.stylefeng.guns.modular.system.warpper.NoticeWrapper;
-import com.stylefeng.guns.persistence.dao.NoticeMapper;
-import com.stylefeng.guns.persistence.model.Notice;
+import com.stylefeng.guns.common.persistence.dao.NoticeMapper;
+import com.stylefeng.guns.common.persistence.model.Notice;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;

src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java

@@ -18,10 +18,10 @@ import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.RoleDao;
 import com.stylefeng.guns.modular.system.service.IRoleService;
 import com.stylefeng.guns.modular.system.warpper.RoleWarpper;
-import com.stylefeng.guns.persistence.dao.RoleMapper;
-import com.stylefeng.guns.persistence.dao.UserMapper;
-import com.stylefeng.guns.persistence.model.Role;
-import com.stylefeng.guns.persistence.model.User;
+import com.stylefeng.guns.common.persistence.dao.RoleMapper;
+import com.stylefeng.guns.common.persistence.dao.UserMapper;
+import com.stylefeng.guns.common.persistence.model.Role;
+import com.stylefeng.guns.common.persistence.model.User;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;

src/main/java/com/stylefeng/guns/modular/system/controller/UserMgrController.java

@@ -20,8 +20,8 @@ import com.stylefeng.guns.modular.system.dao.UserMgrDao;
 import com.stylefeng.guns.modular.system.factory.UserFactory;
 import com.stylefeng.guns.modular.system.transfer.UserDto;
 import com.stylefeng.guns.modular.system.warpper.UserWarpper;
-import com.stylefeng.guns.persistence.dao.UserMapper;
-import com.stylefeng.guns.persistence.model.User;
+import com.stylefeng.guns.common.persistence.dao.UserMapper;
+import com.stylefeng.guns.common.persistence.model.User;
 import org.apache.shiro.authc.AuthenticationException;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

src/main/java/com/stylefeng/guns/modular/system/dao/DictDao.java

 package com.stylefeng.guns.modular.system.dao;
 
-import com.stylefeng.guns.persistence.model.Dict;
+import com.stylefeng.guns.common.persistence.model.Dict;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/dao/LogDao.java

 package com.stylefeng.guns.modular.system.dao;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.persistence.model.OperationLog;
+import com.stylefeng.guns.common.persistence.model.OperationLog;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/com/stylefeng/guns/modular/system/dao/UserMgrDao.java

@@ -5,8 +5,7 @@ import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
-import com.stylefeng.guns.persistence.model.User;
-import org.springframework.cache.annotation.Cacheable;
+import com.stylefeng.guns.common.persistence.model.User;
 
 /**
  * 管理员的dao

src/main/java/com/stylefeng/guns/modular/system/factory/UserFactory.java

 package com.stylefeng.guns.modular.system.factory;
 
 import com.stylefeng.guns.modular.system.transfer.UserDto;
-import com.stylefeng.guns.persistence.model.User;
+import com.stylefeng.guns.common.persistence.model.User;
 import org.springframework.beans.BeanUtils;
 
 /**

src/main/java/com/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java

@@ -6,8 +6,8 @@ import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BussinessException;
 import com.stylefeng.guns.modular.system.dao.DictDao;
 import com.stylefeng.guns.modular.system.service.IDictService;
-import com.stylefeng.guns.persistence.dao.DictMapper;
-import com.stylefeng.guns.persistence.model.Dict;
+import com.stylefeng.guns.common.persistence.dao.DictMapper;
+import com.stylefeng.guns.common.persistence.model.Dict;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java

@@ -2,7 +2,7 @@ package com.stylefeng.guns.modular.system.service.impl;
 
 import com.stylefeng.guns.modular.system.dao.MenuDao;
 import com.stylefeng.guns.modular.system.service.IMenuService;
-import com.stylefeng.guns.persistence.dao.MenuMapper;
+import com.stylefeng.guns.common.persistence.dao.MenuMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java

@@ -3,9 +3,9 @@ package com.stylefeng.guns.modular.system.service.impl;
 import com.stylefeng.guns.core.util.Convert;
 import com.stylefeng.guns.modular.system.dao.RoleDao;
 import com.stylefeng.guns.modular.system.service.IRoleService;
-import com.stylefeng.guns.persistence.dao.RelationMapper;
-import com.stylefeng.guns.persistence.dao.RoleMapper;
-import com.stylefeng.guns.persistence.model.Relation;
+import com.stylefeng.guns.common.persistence.dao.RelationMapper;
+import com.stylefeng.guns.common.persistence.dao.RoleMapper;
+import com.stylefeng.guns.common.persistence.model.Relation;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/stylefeng/guns/modular/system/warpper/DictWarpper.java

@@ -3,7 +3,7 @@ package com.stylefeng.guns.modular.system.warpper;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.warpper.BaseControllerWarpper;
 import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.persistence.model.Dict;
+import com.stylefeng.guns.common.persistence.model.Dict;
 
 import java.util.List;
 import java.util.Map;

src/main/java/generator/MpGenerator.java

@@ -66,9 +66,9 @@ public class MpGenerator {
         // 包配置
         PackageConfig pc = new PackageConfig();
         pc.setParent(null);
-        pc.setEntity("com.stylefeng.guns.persistence.model");
-        pc.setMapper("com.stylefeng.guns.persistence.dao");
-        pc.setXml("com.stylefeng.guns.persistence.dao.mapping");
+        pc.setEntity("com.stylefeng.guns.common.persistence.model");
+        pc.setMapper("com.stylefeng.guns.common.persistence.dao");
+        pc.setXml("com.stylefeng.guns.common.persistence.dao.mapping");
         pc.setService("TTT");       //本项目没用，生成之后删掉
         pc.setServiceImpl("TTT");   //本项目没用，生成之后删掉
         pc.setController("TTT");    //本项目没用，生成之后删掉

src/main/resources/application.yml

@@ -21,7 +21,7 @@ mutipart:
 #mybatis
 mybatis-plus:
   mapper-locations: classpath*:com/stylefeng/guns/**/mapping/*.xml
-  typeAliasesPackage: com.stylefeng.guns.persistence.model
+  typeAliasesPackage: com.stylefeng.guns.common.persistence.model
   global-config:
     id-type: 1  #1:数据库ID自增   2:用户输入id   3:全局唯一id(IdWorker)   4:全局唯一ID(uuid)
     db-column-underline: false