📦 添加模块和依赖

auth-common/src/main/java/com/auth/common/event/package-info.java

@@ -0,0 +1 @@
+package com.auth.common.event;

auth-common/src/main/java/com/auth/common/model/bo/package-info.java

@@ -1 +0,0 @@
-package com.auth.common.model.bo;

auth-common/src/main/java/com/auth/common/model/dto/package-info.java

@@ -1 +0,0 @@
-package com.auth.common.model.dto;

auth-common/src/main/java/com/auth/common/model/entity/package-info.java

@@ -1 +0,0 @@
-package com.auth.common.model.entity;

auth-common/src/main/java/com/auth/common/model/vo/package-info.java

@@ -1 +0,0 @@
-package com.auth.common.model.vo;

auth-dao/dao-base/pom.xml

@@ -21,6 +21,10 @@
     </properties>
 
     <dependencies>
-
+        <dependency>
+            <groupId>com.auth</groupId>
+            <artifactId>model-base</artifactId>
+            <version>0.0.1</version>
+        </dependency>
     </dependencies>
 </project>

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/DeptEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/DictEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/EmailConfigEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/EmailTemplateEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/FileEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/LoginLogEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/MenuEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/MenuRoleEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/OperationLogEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/PermissionEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RoleDataScopeEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RoleEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RolePermissionEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserDeptEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserRoleEntity.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.entity.base;
+package com.auth.dao.base.entity.base;
 
 import com.auth.common.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;

auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/package-info.java

@@ -0,0 +1 @@
+package com.auth.dao.base.entity;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DeptMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.DeptDto;
+import com.auth.model.base.dto.DeptDto;
-import com.auth.common.model.entity.base.DeptEntity;
+import com.auth.model.base.vo.DeptVo;
-import com.auth.common.model.vo.base.DeptVo;
+import com.auth.dao.base.entity.base.DeptEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DictMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.DictDto;
+import com.auth.model.base.dto.DictDto;
-import com.auth.common.model.entity.base.DictEntity;
+import com.auth.model.base.vo.DictVo;
-import com.auth.common.model.vo.base.DictVo;
+import com.auth.dao.base.entity.base.DictEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailConfigMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.EmailConfigDto;
+import com.auth.model.base.dto.EmailConfigDto;
-import com.auth.common.model.entity.base.EmailConfigEntity;
+import com.auth.model.base.vo.EmailConfigVo;
-import com.auth.common.model.vo.base.EmailConfigVo;
+import com.auth.dao.base.entity.base.EmailConfigEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailTemplateMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.EmailTemplateDto;
+import com.auth.model.base.dto.EmailTemplateDto;
-import com.auth.common.model.entity.base.EmailTemplateEntity;
+import com.auth.model.base.vo.EmailTemplateVo;
-import com.auth.common.model.vo.base.EmailTemplateVo;
+import com.auth.dao.base.entity.base.EmailTemplateEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/FileMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.FileDto;
+import com.auth.model.base.dto.FileDto;
-import com.auth.common.model.entity.base.FileEntity;
+import com.auth.model.base.vo.FileVo;
-import com.auth.common.model.vo.base.FileVo;
+import com.auth.dao.base.entity.base.FileEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/LoginLogMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.LoginLogDto;
+import com.auth.model.base.dto.LoginLogDto;
-import com.auth.common.model.entity.base.LoginLogEntity;
+import com.auth.model.base.vo.LoginLogVo;
-import com.auth.common.model.vo.base.LoginLogVo;
+import com.auth.dao.base.entity.base.LoginLogEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.MenuDto;
+import com.auth.model.base.dto.MenuDto;
-import com.auth.common.model.entity.base.MenuEntity;
+import com.auth.model.base.vo.MenuVo;
-import com.auth.common.model.vo.base.MenuVo;
+import com.auth.dao.base.entity.base.MenuEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuRoleMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.MenuRoleDto;
+import com.auth.model.base.dto.MenuRoleDto;
-import com.auth.common.model.entity.base.MenuRoleEntity;
+import com.auth.model.base.vo.MenuRoleVo;
-import com.auth.common.model.vo.base.MenuRoleVo;
+import com.auth.dao.base.entity.base.MenuRoleEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/OperationLogMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.OperationLogDto;
+import com.auth.model.base.dto.OperationLogDto;
-import com.auth.common.model.entity.base.OperationLogEntity;
+import com.auth.model.base.vo.OperationLogVo;
-import com.auth.common.model.vo.base.OperationLogVo;
+import com.auth.dao.base.entity.base.OperationLogEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/PermissionMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.PermissionDto;
+import com.auth.model.base.dto.PermissionDto;
-import com.auth.common.model.entity.base.PermissionEntity;
+import com.auth.model.base.vo.PermissionVo;
-import com.auth.common.model.vo.base.PermissionVo;
+import com.auth.dao.base.entity.base.PermissionEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleDataScopeMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.RoleDataScopeDto;
+import com.auth.model.base.dto.RoleDataScopeDto;
-import com.auth.common.model.entity.base.RoleDataScopeEntity;
+import com.auth.model.base.vo.RoleDataScopeVo;
-import com.auth.common.model.vo.base.RoleDataScopeVo;
+import com.auth.dao.base.entity.base.RoleDataScopeEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.RoleDto;
+import com.auth.model.base.dto.RoleDto;
-import com.auth.common.model.entity.base.RoleEntity;
+import com.auth.model.base.vo.RoleVo;
-import com.auth.common.model.vo.base.RoleVo;
+import com.auth.dao.base.entity.base.RoleEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RolePermissionMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.RolePermissionDto;
+import com.auth.model.base.dto.RolePermissionDto;
-import com.auth.common.model.entity.base.RolePermissionEntity;
+import com.auth.model.base.vo.RolePermissionVo;
-import com.auth.common.model.vo.base.RolePermissionVo;
+import com.auth.dao.base.entity.base.RolePermissionEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserDeptMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.UserDeptDto;
+import com.auth.model.base.dto.UserDeptDto;
-import com.auth.common.model.entity.base.UserDeptEntity;
+import com.auth.model.base.vo.UserDeptVo;
-import com.auth.common.model.vo.base.UserDeptVo;
+import com.auth.dao.base.entity.base.UserDeptEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserMapper.java

@@ -1,10 +1,10 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.UserDto;
+import com.auth.model.base.dto.UserDto;
-import com.auth.common.model.entity.base.PermissionEntity;
+import com.auth.model.base.vo.UserVo;
-import com.auth.common.model.entity.base.RoleEntity;
+import com.auth.dao.base.entity.base.PermissionEntity;
-import com.auth.common.model.entity.base.UserEntity;
+import com.auth.dao.base.entity.base.RoleEntity;
-import com.auth.common.model.vo.base.UserVo;
+import com.auth.dao.base.entity.base.UserEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserRoleMapper.java

@@ -1,8 +1,8 @@
 package com.auth.dao.base.mapper.v1;
 
-import com.auth.common.model.dto.base.UserRoleDto;
+import com.auth.model.base.dto.UserRoleDto;
-import com.auth.common.model.entity.base.UserRoleEntity;
+import com.auth.model.base.vo.UserRoleVo;
-import com.auth.common.model.vo.base.UserRoleVo;
+import com.auth.dao.base.entity.base.UserRoleEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

auth-dao/dao-base/src/main/resources/mapper/v1/DeptMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.DeptMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.DeptEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.DeptEntity">
         <id column="id" property="id"/>
         <id column="parent_id" property="parentId"/>
         <id column="manager" property="manager"/>
@@ -32,7 +32,7 @@
     </sql>
 
     <!-- 分页查询部门表内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.DeptVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.DeptVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/DictMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.DictMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.DictEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.DictEntity">
         <id column="id" property="id"/>
         <id column="dict_type" property="dictType"/>
         <id column="dict_code" property="dictCode"/>
@@ -31,7 +31,7 @@
     </sql>
 
     <!-- 分页查询系统数据字典内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.DictVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.DictVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/EmailConfigMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.EmailConfigMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.EmailConfigEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.EmailConfigEntity">
         <id column="id" property="id"/>
         <id column="config_name" property="configName"/>
         <id column="email" property="email"/>
@@ -32,7 +32,7 @@
     </sql>
 
     <!-- 分页查询系统邮件服务器配置内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.EmailConfigVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.EmailConfigVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/EmailTemplateMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.EmailTemplateMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.EmailTemplateEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.EmailTemplateEntity">
         <id column="id" property="id"/>
         <id column="template_name" property="templateName"/>
         <id column="email_user" property="emailUser"/>
@@ -34,7 +34,7 @@
     </sql>
 
     <!-- 分页查询邮件模板表内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.EmailTemplateVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.EmailTemplateVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/FileMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.FileMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.FileEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.FileEntity">
         <id column="id" property="id"/>
         <id column="file_uid" property="fileUid"/>
         <id column="original_name" property="originalName"/>
@@ -35,7 +35,7 @@
     </sql>
 
     <!-- 分页查询系统文件存储内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.FileVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.FileVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/LoginLogMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.LoginLogMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.LoginLogEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.LoginLogEntity">
         <id column="id" property="id"/>
         <id column="user_id" property="userId"/>
         <id column="username" property="username"/>
@@ -30,7 +30,7 @@
     </sql>
 
     <!-- 分页查询系统用户登录日志内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.LoginLogVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.LoginLogVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/MenuMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.MenuMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.MenuEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.MenuEntity">
         <id column="id" property="id"/>
         <id column="parent_id" property="parentId"/>
         <id column="menu_path" property="menuPath"/>
@@ -37,7 +37,7 @@
     </sql>
 
     <!-- 分页查询系统菜单权限内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.MenuVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.MenuVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/MenuRoleMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.MenuRoleMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.MenuRoleEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.MenuRoleEntity">
         <id column="id" property="id"/>
         <id column="role_id" property="roleId"/>
         <id column="menu_id" property="menuId"/>
@@ -19,7 +19,7 @@
     </sql>
 
     <!-- 分页查询系统菜单角色关联内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.MenuRoleVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.MenuRoleVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/OperationLogMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.OperationLogMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.OperationLogEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.OperationLogEntity">
         <id column="id" property="id"/>
         <id column="module" property="module"/>
         <id column="operation_type" property="operationType"/>
@@ -34,7 +34,7 @@
     </sql>
 
     <!-- 分页查询系统操作日志内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.OperationLogVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.OperationLogVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/PermissionMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.PermissionMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.PermissionEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.PermissionEntity">
         <id column="id" property="id"/>
         <id column="parent_id" property="parentId"/>
         <id column="power_code" property="powerCode"/>
@@ -36,7 +36,7 @@
     </sql>
 
     <!-- 分页查询系统权限表内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.PermissionVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.PermissionVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/RoleDataScopeMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.RoleDataScopeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.RoleDataScopeEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.RoleDataScopeEntity">
         <id column="id" property="id"/>
         <id column="role_id" property="roleId"/>
         <id column="dept_id" property="deptId"/>
@@ -19,7 +19,7 @@
     </sql>
 
     <!-- 分页查询系统角色数据权限范围内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.RoleDataScopeVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.RoleDataScopeVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/RoleMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.RoleMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.RoleEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.RoleEntity">
         <id column="id" property="id"/>
         <id column="role_code" property="roleCode"/>
         <id column="description" property="description"/>
@@ -28,7 +28,7 @@
     </sql>
 
     <!-- 分页查询系统角色表内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.RoleVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.RoleVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/RolePermissionMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.RolePermissionMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.RolePermissionEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.RolePermissionEntity">
         <id column="id" property="id"/>
         <id column="role_id" property="roleId"/>
         <id column="power_id" property="powerId"/>
@@ -22,7 +22,7 @@
     </sql>
 
     <!-- 分页查询系统角色权限表内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.RolePermissionVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.RolePermissionVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/UserDeptMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.UserDeptMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.UserDeptEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.UserDeptEntity">
         <id column="id" property="id"/>
         <id column="user_id" property="userId"/>
         <id column="dept_id" property="deptId"/>
@@ -24,7 +24,7 @@
     </sql>
 
     <!-- 分页查询部门用户关系表内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.UserDeptVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.UserDeptVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/dao-base/src/main/resources/mapper/v1/UserMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.UserMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.UserEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.UserEntity">
         <id column="id" property="id"/>
         <id column="username" property="username"/>
         <id column="nickname" property="nickname"/>
@@ -41,7 +41,7 @@
     </sql>
 
     <!-- 分页查询用户信息内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.UserVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.UserVo">
         select
         base.*,
         create_user.username as create_username,
@@ -118,7 +118,7 @@
     </select>
 
     <!-- 根据用户名查询用户信息 -->
-    <select id="selectByUsername" resultType="com.auth.common.model.entity.base.UserEntity">
+    <select id="selectByUsername" resultType="com.auth.dao.base.entity.base.UserEntity">
         select
         <include refid="Base_Column_List"/>
         from sys_user
@@ -126,7 +126,7 @@
     </select>
 
     <!-- 根据用户id查找该用户的角色内容 -->
-    <select id="selectRolesByUserId" resultType="com.auth.common.model.entity.base.RoleEntity">
+    <select id="selectRolesByUserId" resultType="com.auth.dao.base.entity.base.RoleEntity">
         SELECT tr.*
         FROM t_user_role tur
         JOIN t_role tr ON tur.role_id = tr.id
@@ -138,7 +138,7 @@
     </select>
 
     <!-- 根据用户id查找当前用户的权限 -->
-    <select id="selectPermissionByUserId" resultType="com.auth.common.model.entity.base.PermissionEntity">
+    <select id="selectPermissionByUserId" resultType="com.auth.dao.base.entity.base.PermissionEntity">
         SELECT DISTINCT p.*
         FROM sys_permission p
                  JOIN sys_role_permission rp ON p.id = rp.permission_id

auth-dao/dao-base/src/main/resources/mapper/v1/UserRoleMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.auth.dao.base.mapper.v1.UserRoleMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.auth.common.model.entity.base.UserRoleEntity">
+    <resultMap id="BaseResultMap" type="com.auth.dao.base.entity.base.UserRoleEntity">
         <id column="id" property="id"/>
         <id column="user_id" property="userId"/>
         <id column="role_id" property="roleId"/>
@@ -21,7 +21,7 @@
     </sql>
 
     <!-- 分页查询系统用户角色关系表内容 -->
-    <select id="selectListByPage" resultType="com.auth.common.model.vo.base.UserRoleVo">
+    <select id="selectListByPage" resultType="com.auth.model.base.vo.UserRoleVo">
         select
         base.*,
         create_user.username as create_username,

auth-dao/pom.xml

@@ -25,10 +25,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
+
-            <groupId>com.auth</groupId>
-            <artifactId>auth-common</artifactId>
-            <version>0.0.1</version>
-        </dependency>
     </dependencies>
 </project>

auth-model/model-base/pom.xml

@@ -0,0 +1,25 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.auth</groupId>
+        <artifactId>auth-model</artifactId>
+        <version>0.0.1</version>
+    </parent>
+
+    <artifactId>model-base</artifactId>
+    <packaging>jar</packaging>
+
+    <name>model-base</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>17</java.version>
+    </properties>
+
+    <dependencies>
+
+    </dependencies>
+</project>

auth-model/model-base/src/main/java/com/auth/model/base/bo/package-info.java

@@ -0,0 +1 @@
+package com.auth.model.base.bo;

auth-model/model-base/src/main/java/com/auth/model/base/dto/DeptDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/DictDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/EmailConfigDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/EmailTemplateDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/FileDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/LoginDto.java

@@ -0,0 +1,19 @@
+package com.auth.model.base.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "LoginDto", title = "LoginDto登录参数", description = "登录请求参数")
+public class LoginDto {
+
+    @Schema(name = "type", description = "登录类型")
+    private String type = "default";
+
+    @Schema(name = "username", title = "用户名")
+    private String username;
+
+    @Schema(name = "password", description = "密码")
+    private String password;
+
+}

auth-model/model-base/src/main/java/com/auth/model/base/dto/LoginLogDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/MenuDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/MenuRoleDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/OperationLogDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/PermissionDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/RoleDataScopeDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/RoleDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/RolePermissionDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/UserDeptDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/UserDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/UserRoleDto.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.dto.base;
+package com.auth.model.base.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/dto/package-info.java

@@ -0,0 +1 @@
+package com.auth.model.base.dto;

auth-model/model-base/src/main/java/com/auth/model/base/value/package-info.java

@@ -5,4 +5,4 @@
  * 当这个概念可能被多个实体共享使用时
  * 当这个概念需要保证不变性和线程安全时
  */
-package com.auth.common.model.value;
+package com.auth.model.base.value;

auth-model/model-base/src/main/java/com/auth/model/base/vo/DeptVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/DictVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/EmailConfigVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/EmailTemplateVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/FileVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/LoginLogVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/LoginVo.java

@@ -0,0 +1,35 @@
+package com.auth.model.base.vo;
+
+import com.auth.common.model.common.BaseVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(name = "LoginVo对象", title = "登录成功返回内容", description = "登录成功返回内容")
+public class LoginVo extends BaseVo {
+
+    @Schema(name = "nickname", title = "昵称")
+    private String nickname;
+
+    @Schema(name = "username", title = "用户名")
+    private String username;
+
+    @Schema(name = "email", title = "邮箱")
+    private String email;
+
+    @Schema(name = "token", title = "令牌")
+    private String token;
+
+    @Schema(name = "expires", title = "过期时间")
+    private String expires;
+
+    @Schema(name = "readMeDay", title = "记住我多久")
+    private Long readMeDay;
+
+}

auth-model/model-base/src/main/java/com/auth/model/base/vo/MenuRoleVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/MenuVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/OperationLogVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/PermissionVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/RoleDataScopeVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/RolePermissionVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/RoleVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/UserDeptVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/UserRoleVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/UserVo.java

@@ -1,4 +1,4 @@
-package com.auth.common.model.vo.base;
+package com.auth.model.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

auth-model/model-base/src/main/java/com/auth/model/base/vo/package-info.java

@@ -0,0 +1 @@
+package com.auth.model.base.vo;

auth-model/pom.xml

@@ -0,0 +1,32 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.auth</groupId>
+        <artifactId>auth-server</artifactId>
+        <version>0.0.1</version>
+    </parent>
+
+    <artifactId>auth-model</artifactId>
+    <packaging>pom</packaging>
+    <name>auth-model</name>
+
+    <modules>
+        <module>model-base</module>
+    </modules>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>17</java.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.auth</groupId>
+            <artifactId>auth-common</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+    </dependencies>
+</project>

auth-module/module-security/src/main/java/com/auth/module/security/filter/JwtAuthenticationFilter.java

@@ -6,8 +6,8 @@ import com.auth.common.exception.MyAuthenticationException;
 import com.auth.common.model.common.result.ResultCodeEnum;
 import com.auth.module.security.config.SecurityWebConfiguration;
 import com.auth.module.security.handler.SecurityAuthenticationEntryPoint;
+import com.auth.module.security.provider.JwtTokenProvider;
 import com.auth.module.security.service.DbUserDetailService;
-import com.auth.module.security.service.JwtTokenService;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -31,7 +31,7 @@ import java.io.IOException;
 @RequiredArgsConstructor
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
-    private final JwtTokenService jwtTokenService;
+    private final JwtTokenProvider jwtTokenProvider;
     private final DbUserDetailService userDetailsService;
     private final SecurityAuthenticationEntryPoint securityAuthenticationEntryPoint;
 
@@ -73,7 +73,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
         try {
             // 检查当前Token是否过期
-            if (jwtTokenService.isExpired(jwtToken)) {
+            if (jwtTokenProvider.isExpired(jwtToken)) {
                 // 💡如果过期不需要进行判断和验证，需要直接放行可以像下面这样写
                 // ===================================================
                 // filterChain.doFilter(request, response);
@@ -83,8 +83,8 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
             }
 
             // 解析当前Token中的用户名
-            String username = jwtTokenService.getUsernameFromToken(jwtToken);
+            String username = jwtTokenProvider.getUsernameFromToken(jwtToken);
-            Long userId = jwtTokenService.getUserIdFromToken(jwtToken);
+            Long userId = jwtTokenProvider.getUserIdFromToken(jwtToken);
 
             // 当前用户名存在，并且 Security上下文为空，设置认证相关信息
             if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) {

auth-module/module-security/src/main/java/com/auth/module/security/handler/JwtTokenLogoutHandler.java

@@ -3,7 +3,7 @@ package com.auth.module.security.handler;
 import com.auth.common.model.common.result.Result;
 import com.auth.common.model.common.result.ResultCodeEnum;
 import com.auth.common.utils.ResponseUtil;
-import com.auth.module.security.service.JwtTokenService;
+import com.auth.module.security.provider.JwtTokenProvider;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -21,7 +21,7 @@ import org.springframework.util.StringUtils;
 @RequiredArgsConstructor
 public class JwtTokenLogoutHandler implements LogoutHandler {
 
-    private final JwtTokenService jwtTokenService;
+    private final JwtTokenProvider jwtTokenProvider;
 
     @Override
     public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
@@ -30,7 +30,7 @@ public class JwtTokenLogoutHandler implements LogoutHandler {
 
         if (StringUtils.hasText(authorizationToken)) {
             // 如果当前用户信息存在redis中可以通过这个进行退出
-            String username = jwtTokenService.getUsernameFromToken(authorizationToken);
+            String username = jwtTokenProvider.getUsernameFromToken(authorizationToken);
             log.info("username : {}", username);
         }
 

auth-module/module-security/src/main/java/com/auth/module/security/provider/JwtTokenProvider.java

@@ -1,4 +1,4 @@
-package com.auth.module.security.service;
+package com.auth.module.security.provider;
 
 import com.auth.common.utils.JwtTokenUtil;
 import org.springframework.beans.factory.annotation.Value;
@@ -13,7 +13,7 @@ import java.util.Map;
 
 @Configuration
 @ConfigurationProperties(prefix = "jwt-token")
-public class JwtTokenService {
+public class JwtTokenProvider {
 
     @Value("${jwtToken.secret}")
     public String secret;

auth-module/module-security/src/main/java/com/auth/module/security/service/DbUserDetailService.java

@@ -1,8 +1,8 @@
 package com.auth.module.security.service;
 
-import com.auth.common.model.entity.base.PermissionEntity;
+import com.auth.dao.base.entity.base.PermissionEntity;
-import com.auth.common.model.entity.base.RoleEntity;
+import com.auth.dao.base.entity.base.RoleEntity;
-import com.auth.common.model.entity.base.UserEntity;
+import com.auth.dao.base.entity.base.UserEntity;
 import com.auth.dao.base.mapper.v1.UserMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;