diff --git a/auth-common/src/main/java/com/auth/common/event/package-info.java b/auth-common/src/main/java/com/auth/common/event/package-info.java new file mode 100644 index 0000000..ab160ee --- /dev/null +++ b/auth-common/src/main/java/com/auth/common/event/package-info.java @@ -0,0 +1 @@ +package com.auth.common.event; \ No newline at end of file diff --git a/auth-common/src/main/java/com/auth/common/model/bo/package-info.java b/auth-common/src/main/java/com/auth/common/model/bo/package-info.java deleted file mode 100644 index a3a62f0..0000000 --- a/auth-common/src/main/java/com/auth/common/model/bo/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.auth.common.model.bo; \ No newline at end of file diff --git a/auth-common/src/main/java/com/auth/common/model/dto/package-info.java b/auth-common/src/main/java/com/auth/common/model/dto/package-info.java deleted file mode 100644 index 37db3e2..0000000 --- a/auth-common/src/main/java/com/auth/common/model/dto/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.auth.common.model.dto; \ No newline at end of file diff --git a/auth-common/src/main/java/com/auth/common/model/entity/package-info.java b/auth-common/src/main/java/com/auth/common/model/entity/package-info.java deleted file mode 100644 index 4609b49..0000000 --- a/auth-common/src/main/java/com/auth/common/model/entity/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.auth.common.model.entity; \ No newline at end of file diff --git a/auth-common/src/main/java/com/auth/common/model/vo/package-info.java b/auth-common/src/main/java/com/auth/common/model/vo/package-info.java deleted file mode 100644 index 1fe4934..0000000 --- a/auth-common/src/main/java/com/auth/common/model/vo/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.auth.common.model.vo; \ No newline at end of file diff --git a/auth-dao/dao-base/pom.xml b/auth-dao/dao-base/pom.xml index da38d51..07272cc 100644 --- a/auth-dao/dao-base/pom.xml +++ b/auth-dao/dao-base/pom.xml @@ -21,6 +21,10 @@ - + + com.auth + model-base + 0.0.1 + diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/DeptEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/DeptEntity.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/entity/base/DeptEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/DeptEntity.java index 497d93d..7ae9d24 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/DeptEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/DictEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/DictEntity.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/entity/base/DictEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/DictEntity.java index 8390f00..28bbaba 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/DictEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/EmailConfigEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/EmailConfigEntity.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/entity/base/EmailConfigEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/EmailConfigEntity.java index db52e0f..537e632 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/EmailConfigEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/EmailTemplateEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/EmailTemplateEntity.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/entity/base/EmailTemplateEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/EmailTemplateEntity.java index 3478771..50db007 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/EmailTemplateEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/FileEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/FileEntity.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/entity/base/FileEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/FileEntity.java index f5a6ec1..42889e2 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/FileEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/LoginLogEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/LoginLogEntity.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/entity/base/LoginLogEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/LoginLogEntity.java index 3504768..3f89594 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/LoginLogEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/MenuEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/MenuEntity.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/entity/base/MenuEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/MenuEntity.java index 2eb8a39..a7cf0be 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/MenuEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/MenuRoleEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/MenuRoleEntity.java similarity index 93% rename from auth-common/src/main/java/com/auth/common/model/entity/base/MenuRoleEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/MenuRoleEntity.java index 3619a87..7555820 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/MenuRoleEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/OperationLogEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/OperationLogEntity.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/entity/base/OperationLogEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/OperationLogEntity.java index 2aaeecf..e8fab0c 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/OperationLogEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/PermissionEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/PermissionEntity.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/entity/base/PermissionEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/PermissionEntity.java index c4899ad..0454603 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/PermissionEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/RoleDataScopeEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RoleDataScopeEntity.java similarity index 93% rename from auth-common/src/main/java/com/auth/common/model/entity/base/RoleDataScopeEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RoleDataScopeEntity.java index c4e70c7..886708d 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/RoleDataScopeEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/RoleEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RoleEntity.java similarity index 96% rename from auth-common/src/main/java/com/auth/common/model/entity/base/RoleEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RoleEntity.java index b78cc01..b26dc9f 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/RoleEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/RolePermissionEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RolePermissionEntity.java similarity index 95% rename from auth-common/src/main/java/com/auth/common/model/entity/base/RolePermissionEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RolePermissionEntity.java index 8f25a01..e2e0635 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/RolePermissionEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/UserDeptEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserDeptEntity.java similarity index 95% rename from auth-common/src/main/java/com/auth/common/model/entity/base/UserDeptEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserDeptEntity.java index dcede50..fe8f8da 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/UserDeptEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/UserEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserEntity.java similarity index 98% rename from auth-common/src/main/java/com/auth/common/model/entity/base/UserEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserEntity.java index c5bb5f2..cd7d893 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/UserEntity.java +++ b/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; diff --git a/auth-common/src/main/java/com/auth/common/model/entity/base/UserRoleEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserRoleEntity.java similarity index 94% rename from auth-common/src/main/java/com/auth/common/model/entity/base/UserRoleEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserRoleEntity.java index 02cad5f..34d6147 100644 --- a/auth-common/src/main/java/com/auth/common/model/entity/base/UserRoleEntity.java +++ b/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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/package-info.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/package-info.java new file mode 100644 index 0000000..05e96e0 --- /dev/null +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/package-info.java @@ -0,0 +1 @@ +package com.auth.dao.base.entity; \ No newline at end of file diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DeptMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DeptMapper.java index 48fd8c7..e8f82bd 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DeptMapper.java +++ b/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.common.model.entity.base.DeptEntity; -import com.auth.common.model.vo.base.DeptVo; +import com.auth.model.base.dto.base.DeptDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DictMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DictMapper.java index f00f5b1..c0232f8 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/DictMapper.java +++ b/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.common.model.entity.base.DictEntity; -import com.auth.common.model.vo.base.DictVo; +import com.auth.model.base.dto.base.DictDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailConfigMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailConfigMapper.java index b74d75a..7de12ec 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailConfigMapper.java +++ b/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.common.model.entity.base.EmailConfigEntity; -import com.auth.common.model.vo.base.EmailConfigVo; +import com.auth.model.base.dto.base.EmailConfigDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailTemplateMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailTemplateMapper.java index 3671f21..2da34eb 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/EmailTemplateMapper.java +++ b/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.common.model.entity.base.EmailTemplateEntity; -import com.auth.common.model.vo.base.EmailTemplateVo; +import com.auth.model.base.dto.base.EmailTemplateDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/FileMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/FileMapper.java index e80a2e9..9e8c243 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/FileMapper.java +++ b/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.common.model.entity.base.FileEntity; -import com.auth.common.model.vo.base.FileVo; +import com.auth.model.base.dto.base.FileDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/LoginLogMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/LoginLogMapper.java index 78e4ea8..7dc1828 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/LoginLogMapper.java +++ b/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.common.model.entity.base.LoginLogEntity; -import com.auth.common.model.vo.base.LoginLogVo; +import com.auth.model.base.dto.base.LoginLogDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuMapper.java index 494918e..1b470d4 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuMapper.java +++ b/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.common.model.entity.base.MenuEntity; -import com.auth.common.model.vo.base.MenuVo; +import com.auth.model.base.dto.base.MenuDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuRoleMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuRoleMapper.java index e3c7fa7..06a655d 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/MenuRoleMapper.java +++ b/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.common.model.entity.base.MenuRoleEntity; -import com.auth.common.model.vo.base.MenuRoleVo; +import com.auth.model.base.dto.base.MenuRoleDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/OperationLogMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/OperationLogMapper.java index 101e756..a3fb767 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/OperationLogMapper.java +++ b/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.common.model.entity.base.OperationLogEntity; -import com.auth.common.model.vo.base.OperationLogVo; +import com.auth.model.base.dto.base.OperationLogDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/PermissionMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/PermissionMapper.java index d68f42b..75bf68d 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/PermissionMapper.java +++ b/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.common.model.entity.base.PermissionEntity; -import com.auth.common.model.vo.base.PermissionVo; +import com.auth.model.base.dto.base.PermissionDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleDataScopeMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleDataScopeMapper.java index ab96da9..0cd67a8 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleDataScopeMapper.java +++ b/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.common.model.entity.base.RoleDataScopeEntity; -import com.auth.common.model.vo.base.RoleDataScopeVo; +import com.auth.model.base.dto.base.RoleDataScopeDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleMapper.java index c80437e..43f8bb6 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RoleMapper.java +++ b/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.common.model.entity.base.RoleEntity; -import com.auth.common.model.vo.base.RoleVo; +import com.auth.model.base.dto.base.RoleDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RolePermissionMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RolePermissionMapper.java index 79adb63..e6a8c26 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/RolePermissionMapper.java +++ b/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.common.model.entity.base.RolePermissionEntity; -import com.auth.common.model.vo.base.RolePermissionVo; +import com.auth.model.base.dto.base.RolePermissionDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserDeptMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserDeptMapper.java index fdfb7e3..bc413ac 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserDeptMapper.java +++ b/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.common.model.entity.base.UserDeptEntity; -import com.auth.common.model.vo.base.UserDeptVo; +import com.auth.model.base.dto.base.UserDeptDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserMapper.java index 9acaa91..6416c7a 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserMapper.java +++ b/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.common.model.entity.base.PermissionEntity; -import com.auth.common.model.entity.base.RoleEntity; -import com.auth.common.model.entity.base.UserEntity; -import com.auth.common.model.vo.base.UserVo; +import com.auth.model.base.dto.base.UserDto; +import com.auth.model.base.vo.base.UserVo; +import com.auth.dao.base.entity.base.PermissionEntity; +import com.auth.dao.base.entity.base.RoleEntity; +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; diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserRoleMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserRoleMapper.java index bb5e49b..0903e84 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/UserRoleMapper.java +++ b/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.common.model.entity.base.UserRoleEntity; -import com.auth.common.model.vo.base.UserRoleVo; +import com.auth.model.base.dto.base.UserRoleDto; +import com.auth.model.base.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; diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/DeptMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/DeptMapper.xml index 59d9486..b0813b1 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/DeptMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/DeptMapper.xml @@ -3,7 +3,7 @@ - + @@ -32,7 +32,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/DictMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/DictMapper.xml index 6f7bc98..0a4a06d 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/DictMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/DictMapper.xml @@ -3,7 +3,7 @@ - + @@ -31,7 +31,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/EmailConfigMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/EmailConfigMapper.xml index 525cf11..b542388 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/EmailConfigMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/EmailConfigMapper.xml @@ -3,7 +3,7 @@ - + @@ -32,7 +32,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/EmailTemplateMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/EmailTemplateMapper.xml index 56da768..058610b 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/EmailTemplateMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/EmailTemplateMapper.xml @@ -3,7 +3,7 @@ - + @@ -34,7 +34,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/FileMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/FileMapper.xml index c74faca..132e5c6 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/FileMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/FileMapper.xml @@ -3,7 +3,7 @@ - + @@ -35,7 +35,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/LoginLogMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/LoginLogMapper.xml index d0fed50..5ef0b09 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/LoginLogMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/LoginLogMapper.xml @@ -3,7 +3,7 @@ - + @@ -30,7 +30,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/MenuMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/MenuMapper.xml index 7cafa3d..a1f492d 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/MenuMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/MenuMapper.xml @@ -3,7 +3,7 @@ - + @@ -37,7 +37,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/MenuRoleMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/MenuRoleMapper.xml index dd90fa8..693e65d 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/MenuRoleMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/MenuRoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -19,7 +19,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/OperationLogMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/OperationLogMapper.xml index 0678c08..9423d68 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/OperationLogMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/OperationLogMapper.xml @@ -3,7 +3,7 @@ - + @@ -34,7 +34,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/PermissionMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/PermissionMapper.xml index 6775c96..2291ddb 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/PermissionMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/PermissionMapper.xml @@ -3,7 +3,7 @@ - + @@ -36,7 +36,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/RoleDataScopeMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/RoleDataScopeMapper.xml index 68d9efd..f573bb8 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/RoleDataScopeMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/RoleDataScopeMapper.xml @@ -3,7 +3,7 @@ - + @@ -19,7 +19,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/RoleMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/RoleMapper.xml index 48e39fb..2a2faab 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/RoleMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/RoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -28,7 +28,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/RolePermissionMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/RolePermissionMapper.xml index a8b138a..b4b26bf 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/RolePermissionMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/RolePermissionMapper.xml @@ -3,7 +3,7 @@ - + @@ -22,7 +22,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/UserDeptMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/UserDeptMapper.xml index a7b5469..5cc37ae 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/UserDeptMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/UserDeptMapper.xml @@ -3,7 +3,7 @@ - + @@ -24,7 +24,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/UserMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/UserMapper.xml index aef3e4f..b4ade7b 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/UserMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/UserMapper.xml @@ -3,7 +3,7 @@ - + @@ -41,7 +41,7 @@ - select base.*, create_user.username as create_username, @@ -118,7 +118,7 @@ - select from sys_user @@ -126,7 +126,7 @@ - SELECT tr.* FROM t_user_role tur JOIN t_role tr ON tur.role_id = tr.id @@ -138,7 +138,7 @@ - SELECT DISTINCT p.* FROM sys_permission p JOIN sys_role_permission rp ON p.id = rp.permission_id diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/UserRoleMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/UserRoleMapper.xml index ba778c7..9bfa504 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/UserRoleMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/UserRoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select base.*, create_user.username as create_username, diff --git a/auth-dao/pom.xml b/auth-dao/pom.xml index 8f4687a..17c0253 100644 --- a/auth-dao/pom.xml +++ b/auth-dao/pom.xml @@ -25,10 +25,6 @@ - - com.auth - auth-common - 0.0.1 - + diff --git a/auth-model/model-base/pom.xml b/auth-model/model-base/pom.xml new file mode 100644 index 0000000..582363c --- /dev/null +++ b/auth-model/model-base/pom.xml @@ -0,0 +1,25 @@ + + 4.0.0 + + com.auth + auth-model + 0.0.1 + + + model-base + jar + + model-base + + + UTF-8 + 17 + 17 + 17 + + + + + + diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/bo/package-info.java b/auth-model/model-base/src/main/java/com/auth/model/base/bo/package-info.java new file mode 100644 index 0000000..fa3c9be --- /dev/null +++ b/auth-model/model-base/src/main/java/com/auth/model/base/bo/package-info.java @@ -0,0 +1 @@ +package com.auth.model.base.bo; \ No newline at end of file diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/DeptDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/DeptDto.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/dto/base/DeptDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/DeptDto.java index 640e5b0..00953ba 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/DeptDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/DeptDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/DictDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/DictDto.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/dto/base/DictDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/DictDto.java index 9001f82..f68baf3 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/DictDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/DictDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/EmailConfigDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/EmailConfigDto.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/dto/base/EmailConfigDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/EmailConfigDto.java index d6542f1..f3a3eb7 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/EmailConfigDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/EmailConfigDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/EmailTemplateDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/EmailTemplateDto.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/dto/base/EmailTemplateDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/EmailTemplateDto.java index fc05554..36868ff 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/EmailTemplateDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/EmailTemplateDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/FileDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/FileDto.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/dto/base/FileDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/FileDto.java index 3c86288..15a87cf 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/FileDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/FileDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/LoginLogDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/LoginLogDto.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/dto/base/LoginLogDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/LoginLogDto.java index 4c8a1d9..de30722 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/LoginLogDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/LoginLogDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/MenuDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/MenuDto.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/dto/base/MenuDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/MenuDto.java index 597d521..230186c 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/MenuDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/MenuDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/MenuRoleDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/MenuRoleDto.java similarity index 92% rename from auth-common/src/main/java/com/auth/common/model/dto/base/MenuRoleDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/MenuRoleDto.java index 24ab031..6aa3ee3 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/MenuRoleDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/MenuRoleDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/OperationLogDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/OperationLogDto.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/dto/base/OperationLogDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/OperationLogDto.java index f3413bb..6419938 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/OperationLogDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/OperationLogDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/PermissionDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/PermissionDto.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/dto/base/PermissionDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/PermissionDto.java index 60028f8..5f00a9b 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/PermissionDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/PermissionDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/RoleDataScopeDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RoleDataScopeDto.java similarity index 92% rename from auth-common/src/main/java/com/auth/common/model/dto/base/RoleDataScopeDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RoleDataScopeDto.java index dd715bb..88d6cb4 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/RoleDataScopeDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RoleDataScopeDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/RoleDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RoleDto.java similarity index 96% rename from auth-common/src/main/java/com/auth/common/model/dto/base/RoleDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RoleDto.java index 8819798..08658aa 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/RoleDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RoleDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/RolePermissionDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RolePermissionDto.java similarity index 94% rename from auth-common/src/main/java/com/auth/common/model/dto/base/RolePermissionDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RolePermissionDto.java index 4e061a6..2f01bcf 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/RolePermissionDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/RolePermissionDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/UserDeptDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserDeptDto.java similarity index 95% rename from auth-common/src/main/java/com/auth/common/model/dto/base/UserDeptDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserDeptDto.java index 77846cd..b910734 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/UserDeptDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserDeptDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/UserDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserDto.java similarity index 98% rename from auth-common/src/main/java/com/auth/common/model/dto/base/UserDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserDto.java index 1f8d111..b3e5f7d 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/UserDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/dto/base/UserRoleDto.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserRoleDto.java similarity index 94% rename from auth-common/src/main/java/com/auth/common/model/dto/base/UserRoleDto.java rename to auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserRoleDto.java index 5899b0e..3cc2484 100644 --- a/auth-common/src/main/java/com/auth/common/model/dto/base/UserRoleDto.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/base/UserRoleDto.java @@ -1,4 +1,4 @@ -package com.auth.common.model.dto.base; +package com.auth.model.base.dto.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/dto/package-info.java b/auth-model/model-base/src/main/java/com/auth/model/base/dto/package-info.java new file mode 100644 index 0000000..dca6749 --- /dev/null +++ b/auth-model/model-base/src/main/java/com/auth/model/base/dto/package-info.java @@ -0,0 +1 @@ +package com.auth.model.base.dto; \ No newline at end of file diff --git a/auth-common/src/main/java/com/auth/common/model/value/package-info.java b/auth-model/model-base/src/main/java/com/auth/model/base/value/package-info.java similarity index 88% rename from auth-common/src/main/java/com/auth/common/model/value/package-info.java rename to auth-model/model-base/src/main/java/com/auth/model/base/value/package-info.java index dfa3647..32a0049 100644 --- a/auth-common/src/main/java/com/auth/common/model/value/package-info.java +++ b/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; \ No newline at end of file +package com.auth.model.base.value; \ No newline at end of file diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/DeptVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/DeptVo.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/vo/base/DeptVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/DeptVo.java index 649edf8..0379264 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/DeptVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/DeptVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/DictVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/DictVo.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/vo/base/DictVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/DictVo.java index 62537ce..e75b97d 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/DictVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/DictVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/EmailConfigVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/EmailConfigVo.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/vo/base/EmailConfigVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/EmailConfigVo.java index e4188e2..857e451 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/EmailConfigVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/EmailConfigVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/EmailTemplateVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/EmailTemplateVo.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/vo/base/EmailTemplateVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/EmailTemplateVo.java index 2da29f1..1a79af8 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/EmailTemplateVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/EmailTemplateVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/FileVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/FileVo.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/vo/base/FileVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/FileVo.java index 3bc099f..8507aef 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/FileVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/FileVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/LoginLogVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/LoginLogVo.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/vo/base/LoginLogVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/LoginLogVo.java index ecaa908..88998a8 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/LoginLogVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/LoginLogVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/MenuRoleVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/MenuRoleVo.java similarity index 92% rename from auth-common/src/main/java/com/auth/common/model/vo/base/MenuRoleVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/MenuRoleVo.java index 8b3ce0a..a79851f 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/MenuRoleVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/MenuRoleVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/MenuVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/MenuVo.java similarity index 98% rename from auth-common/src/main/java/com/auth/common/model/vo/base/MenuVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/MenuVo.java index 2e6d1ed..4b29773 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/MenuVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/MenuVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/OperationLogVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/OperationLogVo.java similarity index 97% rename from auth-common/src/main/java/com/auth/common/model/vo/base/OperationLogVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/OperationLogVo.java index 86d0369..30d69dd 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/OperationLogVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/OperationLogVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/PermissionVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/PermissionVo.java similarity index 98% rename from auth-common/src/main/java/com/auth/common/model/vo/base/PermissionVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/PermissionVo.java index ec843e8..217dca9 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/PermissionVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/PermissionVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/RoleDataScopeVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RoleDataScopeVo.java similarity index 92% rename from auth-common/src/main/java/com/auth/common/model/vo/base/RoleDataScopeVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RoleDataScopeVo.java index 20df0b7..c078d36 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/RoleDataScopeVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RoleDataScopeVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/RolePermissionVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RolePermissionVo.java similarity index 94% rename from auth-common/src/main/java/com/auth/common/model/vo/base/RolePermissionVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RolePermissionVo.java index ff6604b..de834b2 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/RolePermissionVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RolePermissionVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/RoleVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RoleVo.java similarity index 96% rename from auth-common/src/main/java/com/auth/common/model/vo/base/RoleVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RoleVo.java index b475f94..4dcce6b 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/RoleVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/RoleVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/UserDeptVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserDeptVo.java similarity index 95% rename from auth-common/src/main/java/com/auth/common/model/vo/base/UserDeptVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserDeptVo.java index 6b18474..35c60ca 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/UserDeptVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserDeptVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/UserRoleVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserRoleVo.java similarity index 94% rename from auth-common/src/main/java/com/auth/common/model/vo/base/UserRoleVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserRoleVo.java index c2ec2b0..cc6b3b0 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/UserRoleVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserRoleVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-common/src/main/java/com/auth/common/model/vo/base/UserVo.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserVo.java similarity index 98% rename from auth-common/src/main/java/com/auth/common/model/vo/base/UserVo.java rename to auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserVo.java index 3ac76f3..bc83b45 100644 --- a/auth-common/src/main/java/com/auth/common/model/vo/base/UserVo.java +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/base/UserVo.java @@ -1,4 +1,4 @@ -package com.auth.common.model.vo.base; +package com.auth.model.base.vo.base; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-model/model-base/src/main/java/com/auth/model/base/vo/package-info.java b/auth-model/model-base/src/main/java/com/auth/model/base/vo/package-info.java new file mode 100644 index 0000000..684bcd3 --- /dev/null +++ b/auth-model/model-base/src/main/java/com/auth/model/base/vo/package-info.java @@ -0,0 +1 @@ +package com.auth.model.base.vo; \ No newline at end of file diff --git a/auth-model/pom.xml b/auth-model/pom.xml new file mode 100644 index 0000000..d69f06a --- /dev/null +++ b/auth-model/pom.xml @@ -0,0 +1,32 @@ + + 4.0.0 + + com.auth + auth-server + 0.0.1 + + + auth-model + pom + auth-model + + + model-base + + + + UTF-8 + 17 + 17 + 17 + + + + + com.auth + auth-common + 0.0.1 + + + diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/filter/JwtAuthenticationFilter.java b/auth-module/module-security/src/main/java/com/auth/module/security/filter/JwtAuthenticationFilter.java index 057ba8f..3efbd4c 100644 --- a/auth-module/module-security/src/main/java/com/auth/module/security/filter/JwtAuthenticationFilter.java +++ b/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); - Long userId = jwtTokenService.getUserIdFromToken(jwtToken); + String username = jwtTokenProvider.getUsernameFromToken(jwtToken); + Long userId = jwtTokenProvider.getUserIdFromToken(jwtToken); // 当前用户名存在，并且 Security上下文为空，设置认证相关信息 if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) { diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/handler/JwtTokenLogoutHandler.java b/auth-module/module-security/src/main/java/com/auth/module/security/handler/JwtTokenLogoutHandler.java index d6f3894..854fd37 100644 --- a/auth-module/module-security/src/main/java/com/auth/module/security/handler/JwtTokenLogoutHandler.java +++ b/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); } diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/service/JwtTokenService.java b/auth-module/module-security/src/main/java/com/auth/module/security/provider/JwtTokenProvider.java similarity index 97% rename from auth-module/module-security/src/main/java/com/auth/module/security/service/JwtTokenService.java rename to auth-module/module-security/src/main/java/com/auth/module/security/provider/JwtTokenProvider.java index c550577..87d4442 100644 --- a/auth-module/module-security/src/main/java/com/auth/module/security/service/JwtTokenService.java +++ b/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; diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/service/DbUserDetailService.java b/auth-module/module-security/src/main/java/com/auth/module/security/service/DbUserDetailService.java index 4bb89a0..3a96d2c 100644 --- a/auth-module/module-security/src/main/java/com/auth/module/security/service/DbUserDetailService.java +++ b/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.common.model.entity.base.RoleEntity; -import com.auth.common.model.entity.base.UserEntity; +import com.auth.dao.base.entity.base.PermissionEntity; +import com.auth.dao.base.entity.base.RoleEntity; +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; diff --git a/auth-services/pom.xml b/auth-services/pom.xml index 7ca63cc..e14aea7 100644 --- a/auth-services/pom.xml +++ b/auth-services/pom.xml @@ -25,11 +25,6 @@ - - com.auth - auth-common - 0.0.1 - com.auth module-security diff --git a/auth-services/service-base/pom.xml b/auth-services/service-base/pom.xml index de07b43..2cd2d71 100644 --- a/auth-services/service-base/pom.xml +++ b/auth-services/service-base/pom.xml @@ -21,12 +21,6 @@ - - com.auth - dao-base - 0.0.1 - - org.springframework.boot spring-boot-devtools diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DeptController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DeptController.java index 7f8d80b..2e766e7 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DeptController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DeptController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.DeptDto; -import com.auth.common.model.entity.base.DeptEntity; -import com.auth.common.model.vo.base.DeptVo; +import com.auth.model.base.dto.base.DeptDto; +import com.auth.model.base.vo.base.DeptVo; +import com.auth.dao.base.entity.base.DeptEntity; import com.auth.service.base.v1.service.DeptService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DictController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DictController.java index 958e569..3f4027f 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DictController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/DictController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.DictDto; -import com.auth.common.model.entity.base.DictEntity; -import com.auth.common.model.vo.base.DictVo; +import com.auth.model.base.dto.base.DictDto; +import com.auth.model.base.vo.base.DictVo; +import com.auth.dao.base.entity.base.DictEntity; import com.auth.service.base.v1.service.DictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailConfigController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailConfigController.java index adc1fc9..c3418ea 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailConfigController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailConfigController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.EmailConfigDto; -import com.auth.common.model.entity.base.EmailConfigEntity; -import com.auth.common.model.vo.base.EmailConfigVo; +import com.auth.model.base.dto.base.EmailConfigDto; +import com.auth.model.base.vo.base.EmailConfigVo; +import com.auth.dao.base.entity.base.EmailConfigEntity; import com.auth.service.base.v1.service.EmailConfigService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailTemplateController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailTemplateController.java index 94338e9..d9be5b1 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailTemplateController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/EmailTemplateController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.EmailTemplateDto; -import com.auth.common.model.entity.base.EmailTemplateEntity; -import com.auth.common.model.vo.base.EmailTemplateVo; +import com.auth.model.base.dto.base.EmailTemplateDto; +import com.auth.model.base.vo.base.EmailTemplateVo; +import com.auth.dao.base.entity.base.EmailTemplateEntity; import com.auth.service.base.v1.service.EmailTemplateService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/FileController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/FileController.java index e9972ee..747ac57 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/FileController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/FileController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.FileDto; -import com.auth.common.model.entity.base.FileEntity; -import com.auth.common.model.vo.base.FileVo; +import com.auth.model.base.dto.base.FileDto; +import com.auth.model.base.vo.base.FileVo; +import com.auth.dao.base.entity.base.FileEntity; import com.auth.service.base.v1.service.FileService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/LoginLogController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/LoginLogController.java index a3f1b42..cc49c92 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/LoginLogController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/LoginLogController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.LoginLogDto; -import com.auth.common.model.entity.base.LoginLogEntity; -import com.auth.common.model.vo.base.LoginLogVo; +import com.auth.model.base.dto.base.LoginLogDto; +import com.auth.model.base.vo.base.LoginLogVo; +import com.auth.dao.base.entity.base.LoginLogEntity; import com.auth.service.base.v1.service.LoginLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuController.java index dcd4f5f..6dc81aa 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.MenuDto; -import com.auth.common.model.entity.base.MenuEntity; -import com.auth.common.model.vo.base.MenuVo; +import com.auth.model.base.dto.base.MenuDto; +import com.auth.model.base.vo.base.MenuVo; +import com.auth.dao.base.entity.base.MenuEntity; import com.auth.service.base.v1.service.MenuService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuRoleController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuRoleController.java index 974f8a5..f3c0db1 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuRoleController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/MenuRoleController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.MenuRoleDto; -import com.auth.common.model.entity.base.MenuRoleEntity; -import com.auth.common.model.vo.base.MenuRoleVo; +import com.auth.model.base.dto.base.MenuRoleDto; +import com.auth.model.base.vo.base.MenuRoleVo; +import com.auth.dao.base.entity.base.MenuRoleEntity; import com.auth.service.base.v1.service.MenuRoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/OperationLogController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/OperationLogController.java index bcd2f50..e57f20c 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/OperationLogController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/OperationLogController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.OperationLogDto; -import com.auth.common.model.entity.base.OperationLogEntity; -import com.auth.common.model.vo.base.OperationLogVo; +import com.auth.model.base.dto.base.OperationLogDto; +import com.auth.model.base.vo.base.OperationLogVo; +import com.auth.dao.base.entity.base.OperationLogEntity; import com.auth.service.base.v1.service.OperationLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/PermissionController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/PermissionController.java index bedce86..e090078 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/PermissionController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/PermissionController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.PermissionDto; -import com.auth.common.model.entity.base.PermissionEntity; -import com.auth.common.model.vo.base.PermissionVo; +import com.auth.model.base.dto.base.PermissionDto; +import com.auth.model.base.vo.base.PermissionVo; +import com.auth.dao.base.entity.base.PermissionEntity; import com.auth.service.base.v1.service.PermissionService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleController.java index 31de45f..8524b29 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.RoleDto; -import com.auth.common.model.entity.base.RoleEntity; -import com.auth.common.model.vo.base.RoleVo; +import com.auth.model.base.dto.base.RoleDto; +import com.auth.model.base.vo.base.RoleVo; +import com.auth.dao.base.entity.base.RoleEntity; import com.auth.service.base.v1.service.RoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleDataScopeController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleDataScopeController.java index 752211a..d625725 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleDataScopeController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RoleDataScopeController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.RoleDataScopeDto; -import com.auth.common.model.entity.base.RoleDataScopeEntity; -import com.auth.common.model.vo.base.RoleDataScopeVo; +import com.auth.model.base.dto.base.RoleDataScopeDto; +import com.auth.model.base.vo.base.RoleDataScopeVo; +import com.auth.dao.base.entity.base.RoleDataScopeEntity; import com.auth.service.base.v1.service.RoleDataScopeService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RolePermissionController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RolePermissionController.java index e65bc77..cdc445e 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RolePermissionController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/RolePermissionController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.RolePermissionDto; -import com.auth.common.model.entity.base.RolePermissionEntity; -import com.auth.common.model.vo.base.RolePermissionVo; +import com.auth.model.base.dto.base.RolePermissionDto; +import com.auth.model.base.vo.base.RolePermissionVo; +import com.auth.dao.base.entity.base.RolePermissionEntity; import com.auth.service.base.v1.service.RolePermissionService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserController.java index 36a6169..43a8f19 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.UserDto; -import com.auth.common.model.entity.base.UserEntity; -import com.auth.common.model.vo.base.UserVo; +import com.auth.model.base.dto.base.UserDto; +import com.auth.model.base.vo.base.UserVo; +import com.auth.dao.base.entity.base.UserEntity; import com.auth.service.base.v1.service.UserService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserDeptController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserDeptController.java index 31202c3..428b340 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserDeptController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserDeptController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.UserDeptDto; -import com.auth.common.model.entity.base.UserDeptEntity; -import com.auth.common.model.vo.base.UserDeptVo; +import com.auth.model.base.dto.base.UserDeptDto; +import com.auth.model.base.vo.base.UserDeptVo; +import com.auth.dao.base.entity.base.UserDeptEntity; import com.auth.service.base.v1.service.UserDeptService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserRoleController.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserRoleController.java index 6fe02a7..db923d7 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserRoleController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/controller/UserRoleController.java @@ -3,9 +3,9 @@ package com.auth.service.base.v1.controller; import com.auth.common.model.common.result.PageResult; import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; -import com.auth.common.model.dto.base.UserRoleDto; -import com.auth.common.model.entity.base.UserRoleEntity; -import com.auth.common.model.vo.base.UserRoleVo; +import com.auth.model.base.dto.base.UserRoleDto; +import com.auth.model.base.vo.base.UserRoleVo; +import com.auth.dao.base.entity.base.UserRoleEntity; import com.auth.service.base.v1.service.UserRoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DeptService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DeptService.java index 7b116c1..8ef2f93 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DeptService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DeptService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.DeptDto; -import com.auth.common.model.entity.base.DeptEntity; -import com.auth.common.model.vo.base.DeptVo; +import com.auth.model.base.dto.base.DeptDto; +import com.auth.model.base.vo.base.DeptVo; +import com.auth.dao.base.entity.base.DeptEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DictService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DictService.java index 28efd39..85e3475 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DictService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/DictService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.DictDto; -import com.auth.common.model.entity.base.DictEntity; -import com.auth.common.model.vo.base.DictVo; +import com.auth.model.base.dto.base.DictDto; +import com.auth.model.base.vo.base.DictVo; +import com.auth.dao.base.entity.base.DictEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailConfigService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailConfigService.java index e2d1fa4..4be9cb8 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailConfigService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailConfigService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.EmailConfigDto; -import com.auth.common.model.entity.base.EmailConfigEntity; -import com.auth.common.model.vo.base.EmailConfigVo; +import com.auth.model.base.dto.base.EmailConfigDto; +import com.auth.model.base.vo.base.EmailConfigVo; +import com.auth.dao.base.entity.base.EmailConfigEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailTemplateService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailTemplateService.java index 2cf76ac..da58021 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailTemplateService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/EmailTemplateService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.EmailTemplateDto; -import com.auth.common.model.entity.base.EmailTemplateEntity; -import com.auth.common.model.vo.base.EmailTemplateVo; +import com.auth.model.base.dto.base.EmailTemplateDto; +import com.auth.model.base.vo.base.EmailTemplateVo; +import com.auth.dao.base.entity.base.EmailTemplateEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/FileService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/FileService.java index dd1fc68..3842fc8 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/FileService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/FileService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.FileDto; -import com.auth.common.model.entity.base.FileEntity; -import com.auth.common.model.vo.base.FileVo; +import com.auth.model.base.dto.base.FileDto; +import com.auth.model.base.vo.base.FileVo; +import com.auth.dao.base.entity.base.FileEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/LoginLogService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/LoginLogService.java index 4948e8e..c8c9253 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/LoginLogService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/LoginLogService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.LoginLogDto; -import com.auth.common.model.entity.base.LoginLogEntity; -import com.auth.common.model.vo.base.LoginLogVo; +import com.auth.model.base.dto.base.LoginLogDto; +import com.auth.model.base.vo.base.LoginLogVo; +import com.auth.dao.base.entity.base.LoginLogEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuRoleService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuRoleService.java index 9eaa2f6..b00bbf0 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuRoleService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuRoleService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.MenuRoleDto; -import com.auth.common.model.entity.base.MenuRoleEntity; -import com.auth.common.model.vo.base.MenuRoleVo; +import com.auth.model.base.dto.base.MenuRoleDto; +import com.auth.model.base.vo.base.MenuRoleVo; +import com.auth.dao.base.entity.base.MenuRoleEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuService.java index 287df75..0c61089 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/MenuService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.MenuDto; -import com.auth.common.model.entity.base.MenuEntity; -import com.auth.common.model.vo.base.MenuVo; +import com.auth.model.base.dto.base.MenuDto; +import com.auth.model.base.vo.base.MenuVo; +import com.auth.dao.base.entity.base.MenuEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/OperationLogService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/OperationLogService.java index 543d079..8485ae0 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/OperationLogService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/OperationLogService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.OperationLogDto; -import com.auth.common.model.entity.base.OperationLogEntity; -import com.auth.common.model.vo.base.OperationLogVo; +import com.auth.model.base.dto.base.OperationLogDto; +import com.auth.model.base.vo.base.OperationLogVo; +import com.auth.dao.base.entity.base.OperationLogEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/PermissionService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/PermissionService.java index d39fc2e..8b5ddb8 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/PermissionService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/PermissionService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.PermissionDto; -import com.auth.common.model.entity.base.PermissionEntity; -import com.auth.common.model.vo.base.PermissionVo; +import com.auth.model.base.dto.base.PermissionDto; +import com.auth.model.base.vo.base.PermissionVo; +import com.auth.dao.base.entity.base.PermissionEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleDataScopeService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleDataScopeService.java index 05a8a04..4b5dc51 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleDataScopeService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleDataScopeService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.RoleDataScopeDto; -import com.auth.common.model.entity.base.RoleDataScopeEntity; -import com.auth.common.model.vo.base.RoleDataScopeVo; +import com.auth.model.base.dto.base.RoleDataScopeDto; +import com.auth.model.base.vo.base.RoleDataScopeVo; +import com.auth.dao.base.entity.base.RoleDataScopeEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RolePermissionService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RolePermissionService.java index e3c670e..ebfc0d1 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RolePermissionService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RolePermissionService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.RolePermissionDto; -import com.auth.common.model.entity.base.RolePermissionEntity; -import com.auth.common.model.vo.base.RolePermissionVo; +import com.auth.model.base.dto.base.RolePermissionDto; +import com.auth.model.base.vo.base.RolePermissionVo; +import com.auth.dao.base.entity.base.RolePermissionEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleService.java index 1bc5d6d..99b9868 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/RoleService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.RoleDto; -import com.auth.common.model.entity.base.RoleEntity; -import com.auth.common.model.vo.base.RoleVo; +import com.auth.model.base.dto.base.RoleDto; +import com.auth.model.base.vo.base.RoleVo; +import com.auth.dao.base.entity.base.RoleEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserDeptService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserDeptService.java index 36c077d..5b0cba9 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserDeptService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserDeptService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.UserDeptDto; -import com.auth.common.model.entity.base.UserDeptEntity; -import com.auth.common.model.vo.base.UserDeptVo; +import com.auth.model.base.dto.base.UserDeptDto; +import com.auth.model.base.vo.base.UserDeptVo; +import com.auth.dao.base.entity.base.UserDeptEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserRoleService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserRoleService.java index 9282b30..24f2003 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserRoleService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserRoleService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.UserRoleDto; -import com.auth.common.model.entity.base.UserRoleEntity; -import com.auth.common.model.vo.base.UserRoleVo; +import com.auth.model.base.dto.base.UserRoleDto; +import com.auth.model.base.vo.base.UserRoleVo; +import com.auth.dao.base.entity.base.UserRoleEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserService.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserService.java index 167cf3e..03fec87 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/UserService.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.UserDto; -import com.auth.common.model.entity.base.UserEntity; -import com.auth.common.model.vo.base.UserVo; +import com.auth.model.base.dto.base.UserDto; +import com.auth.model.base.vo.base.UserVo; +import com.auth.dao.base.entity.base.UserEntity; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DeptServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DeptServiceImpl.java index 2aba97f..7c521d5 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DeptServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DeptServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.DeptDto; -import com.auth.common.model.entity.base.DeptEntity; -import com.auth.common.model.vo.base.DeptVo; +import com.auth.model.base.dto.base.DeptDto; +import com.auth.model.base.vo.base.DeptVo; +import com.auth.dao.base.entity.base.DeptEntity; import com.auth.dao.base.mapper.v1.DeptMapper; import com.auth.service.base.v1.service.DeptService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DictServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DictServiceImpl.java index 3478370..09991cc 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DictServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/DictServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.DictDto; -import com.auth.common.model.entity.base.DictEntity; -import com.auth.common.model.vo.base.DictVo; +import com.auth.model.base.dto.base.DictDto; +import com.auth.model.base.vo.base.DictVo; +import com.auth.dao.base.entity.base.DictEntity; import com.auth.dao.base.mapper.v1.DictMapper; import com.auth.service.base.v1.service.DictService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailConfigServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailConfigServiceImpl.java index b087561..d1ba17a 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailConfigServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailConfigServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.EmailConfigDto; -import com.auth.common.model.entity.base.EmailConfigEntity; -import com.auth.common.model.vo.base.EmailConfigVo; +import com.auth.model.base.dto.base.EmailConfigDto; +import com.auth.model.base.vo.base.EmailConfigVo; +import com.auth.dao.base.entity.base.EmailConfigEntity; import com.auth.dao.base.mapper.v1.EmailConfigMapper; import com.auth.service.base.v1.service.EmailConfigService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailTemplateServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailTemplateServiceImpl.java index ba213c2..6c4928c 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailTemplateServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/EmailTemplateServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.EmailTemplateDto; -import com.auth.common.model.entity.base.EmailTemplateEntity; -import com.auth.common.model.vo.base.EmailTemplateVo; +import com.auth.model.base.dto.base.EmailTemplateDto; +import com.auth.model.base.vo.base.EmailTemplateVo; +import com.auth.dao.base.entity.base.EmailTemplateEntity; import com.auth.dao.base.mapper.v1.EmailTemplateMapper; import com.auth.service.base.v1.service.EmailTemplateService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/FileServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/FileServiceImpl.java index 88e43dc..41dd353 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/FileServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/FileServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.FileDto; -import com.auth.common.model.entity.base.FileEntity; -import com.auth.common.model.vo.base.FileVo; +import com.auth.model.base.dto.base.FileDto; +import com.auth.model.base.vo.base.FileVo; +import com.auth.dao.base.entity.base.FileEntity; import com.auth.dao.base.mapper.v1.FileMapper; import com.auth.service.base.v1.service.FileService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/LoginLogServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/LoginLogServiceImpl.java index 2ba1ecc..d4ea8ce 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/LoginLogServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/LoginLogServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.LoginLogDto; -import com.auth.common.model.entity.base.LoginLogEntity; -import com.auth.common.model.vo.base.LoginLogVo; +import com.auth.model.base.dto.base.LoginLogDto; +import com.auth.model.base.vo.base.LoginLogVo; +import com.auth.dao.base.entity.base.LoginLogEntity; import com.auth.dao.base.mapper.v1.LoginLogMapper; import com.auth.service.base.v1.service.LoginLogService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuRoleServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuRoleServiceImpl.java index 7e634ab..69eafc2 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuRoleServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuRoleServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.MenuRoleDto; -import com.auth.common.model.entity.base.MenuRoleEntity; -import com.auth.common.model.vo.base.MenuRoleVo; +import com.auth.model.base.dto.base.MenuRoleDto; +import com.auth.model.base.vo.base.MenuRoleVo; +import com.auth.dao.base.entity.base.MenuRoleEntity; import com.auth.dao.base.mapper.v1.MenuRoleMapper; import com.auth.service.base.v1.service.MenuRoleService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuServiceImpl.java index 94cfcfb..74d0298 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/MenuServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.MenuDto; -import com.auth.common.model.entity.base.MenuEntity; -import com.auth.common.model.vo.base.MenuVo; +import com.auth.model.base.dto.base.MenuDto; +import com.auth.model.base.vo.base.MenuVo; +import com.auth.dao.base.entity.base.MenuEntity; import com.auth.dao.base.mapper.v1.MenuMapper; import com.auth.service.base.v1.service.MenuService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/OperationLogServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/OperationLogServiceImpl.java index 8a2153d..4f55973 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/OperationLogServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/OperationLogServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.OperationLogDto; -import com.auth.common.model.entity.base.OperationLogEntity; -import com.auth.common.model.vo.base.OperationLogVo; +import com.auth.model.base.dto.base.OperationLogDto; +import com.auth.model.base.vo.base.OperationLogVo; +import com.auth.dao.base.entity.base.OperationLogEntity; import com.auth.dao.base.mapper.v1.OperationLogMapper; import com.auth.service.base.v1.service.OperationLogService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/PermissionServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/PermissionServiceImpl.java index 15e862b..2f66aaf 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/PermissionServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/PermissionServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.PermissionDto; -import com.auth.common.model.entity.base.PermissionEntity; -import com.auth.common.model.vo.base.PermissionVo; +import com.auth.model.base.dto.base.PermissionDto; +import com.auth.model.base.vo.base.PermissionVo; +import com.auth.dao.base.entity.base.PermissionEntity; import com.auth.dao.base.mapper.v1.PermissionMapper; import com.auth.service.base.v1.service.PermissionService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleDataScopeServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleDataScopeServiceImpl.java index 7a15a5a..88fa839 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleDataScopeServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleDataScopeServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.RoleDataScopeDto; -import com.auth.common.model.entity.base.RoleDataScopeEntity; -import com.auth.common.model.vo.base.RoleDataScopeVo; +import com.auth.model.base.dto.base.RoleDataScopeDto; +import com.auth.model.base.vo.base.RoleDataScopeVo; +import com.auth.dao.base.entity.base.RoleDataScopeEntity; import com.auth.dao.base.mapper.v1.RoleDataScopeMapper; import com.auth.service.base.v1.service.RoleDataScopeService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RolePermissionServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RolePermissionServiceImpl.java index 8f28ea9..385e3d5 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RolePermissionServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RolePermissionServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.RolePermissionDto; -import com.auth.common.model.entity.base.RolePermissionEntity; -import com.auth.common.model.vo.base.RolePermissionVo; +import com.auth.model.base.dto.base.RolePermissionDto; +import com.auth.model.base.vo.base.RolePermissionVo; +import com.auth.dao.base.entity.base.RolePermissionEntity; import com.auth.dao.base.mapper.v1.RolePermissionMapper; import com.auth.service.base.v1.service.RolePermissionService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleServiceImpl.java index e7406e4..8fe332f 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/RoleServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.RoleDto; -import com.auth.common.model.entity.base.RoleEntity; -import com.auth.common.model.vo.base.RoleVo; +import com.auth.model.base.dto.base.RoleDto; +import com.auth.model.base.vo.base.RoleVo; +import com.auth.dao.base.entity.base.RoleEntity; import com.auth.dao.base.mapper.v1.RoleMapper; import com.auth.service.base.v1.service.RoleService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserDeptServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserDeptServiceImpl.java index 8224bf6..cf0c160 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserDeptServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserDeptServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.UserDeptDto; -import com.auth.common.model.entity.base.UserDeptEntity; -import com.auth.common.model.vo.base.UserDeptVo; +import com.auth.model.base.dto.base.UserDeptDto; +import com.auth.model.base.vo.base.UserDeptVo; +import com.auth.dao.base.entity.base.UserDeptEntity; import com.auth.dao.base.mapper.v1.UserDeptMapper; import com.auth.service.base.v1.service.UserDeptService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserRoleServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserRoleServiceImpl.java index 08ca9ab..f4fee6d 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserRoleServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserRoleServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.UserRoleDto; -import com.auth.common.model.entity.base.UserRoleEntity; -import com.auth.common.model.vo.base.UserRoleVo; +import com.auth.model.base.dto.base.UserRoleDto; +import com.auth.model.base.vo.base.UserRoleVo; +import com.auth.dao.base.entity.base.UserRoleEntity; import com.auth.dao.base.mapper.v1.UserRoleMapper; import com.auth.service.base.v1.service.UserRoleService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserServiceImpl.java index 56e4ce8..6e3466c 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/v1/service/impl/UserServiceImpl.java @@ -1,9 +1,9 @@ package com.auth.service.base.v1.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.common.model.dto.base.UserDto; -import com.auth.common.model.entity.base.UserEntity; -import com.auth.common.model.vo.base.UserVo; +import com.auth.model.base.dto.base.UserDto; +import com.auth.model.base.vo.base.UserVo; +import com.auth.dao.base.entity.base.UserEntity; import com.auth.dao.base.mapper.v1.UserMapper; import com.auth.service.base.v1.service.UserService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/pom.xml b/pom.xml index 1b326bf..f39fd0a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,14 +13,17 @@ auth-server 0.0.1 pom - auth-admin + auth-server auth-admin auth-common + auth-dao auth-module auth-services auth-dao + auth-model + auth-model/model-base