From d062aa1bae1790f4145ffae7ca013f1f708e73d4 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Mon, 21 Jul 2025 08:11:50 +0800 Subject: [PATCH] =?UTF-8?q?:construction:=20=E7=94=A8=E6=88=B7=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/entity/{base => }/AuthLogEntity.java | 2 +- .../base/entity/{base => }/DeptEntity.java | 2 +- .../base/entity/{base => }/DictEntity.java | 2 +- .../entity/{base => }/EmailConfigEntity.java | 2 +- .../{base => }/EmailTemplateEntity.java | 2 +- .../base/entity/{base => }/FileEntity.java | 2 +- .../entity/{base => }/LoginLogEntity.java | 2 +- .../base/entity/{base => }/MenuEntity.java | 2 +- .../entity/{base => }/MenuRoleEntity.java | 2 +- .../entity/{base => }/OperationLogEntity.java | 2 +- .../entity/{base => }/PermissionEntity.java | 2 +- .../{base => }/RoleDataScopeEntity.java | 2 +- .../base/entity/{base => }/RoleEntity.java | 2 +- .../{base => }/RolePermissionEntity.java | 2 +- .../entity/{base => }/UserDeptEntity.java | 2 +- .../base/entity/{base => }/UserEntity.java | 75 ++++-------- .../entity/{base => }/UserRoleEntity.java | 2 +- .../auth/dao/base/entity/package-info.java | 1 - .../dao/base/mapper/v1/AuthLogMapper.java | 2 +- .../auth/dao/base/mapper/v1/DeptMapper.java | 2 +- .../auth/dao/base/mapper/v1/DictMapper.java | 2 +- .../dao/base/mapper/v1/EmailConfigMapper.java | 2 +- .../base/mapper/v1/EmailTemplateMapper.java | 2 +- .../auth/dao/base/mapper/v1/FileMapper.java | 2 +- .../dao/base/mapper/v1/LoginLogMapper.java | 2 +- .../auth/dao/base/mapper/v1/MenuMapper.java | 2 +- .../dao/base/mapper/v1/MenuRoleMapper.java | 2 +- .../base/mapper/v1/OperationLogMapper.java | 2 +- .../dao/base/mapper/v1/PermissionMapper.java | 2 +- .../base/mapper/v1/RoleDataScopeMapper.java | 2 +- .../auth/dao/base/mapper/v1/RoleMapper.java | 2 +- .../base/mapper/v1/RolePermissionMapper.java | 2 +- .../dao/base/mapper/v1/UserDeptMapper.java | 2 +- .../auth/dao/base/mapper/v1/UserMapper.java | 21 +++- .../dao/base/mapper/v1/UserRoleMapper.java | 2 +- .../dao/base/view/UserRolePermission.java | 65 ++++++++++ .../resources/mapper/v1/AuthLogMapper.xml | 2 +- .../main/resources/mapper/v1/DeptMapper.xml | 2 +- .../main/resources/mapper/v1/DictMapper.xml | 2 +- .../resources/mapper/v1/EmailConfigMapper.xml | 2 +- .../mapper/v1/EmailTemplateMapper.xml | 2 +- .../main/resources/mapper/v1/FileMapper.xml | 2 +- .../resources/mapper/v1/LoginLogMapper.xml | 2 +- .../main/resources/mapper/v1/MenuMapper.xml | 2 +- .../resources/mapper/v1/MenuRoleMapper.xml | 2 +- .../mapper/v1/OperationLogMapper.xml | 2 +- .../resources/mapper/v1/PermissionMapper.xml | 2 +- .../mapper/v1/RoleDataScopeMapper.xml | 2 +- .../main/resources/mapper/v1/RoleMapper.xml | 2 +- .../mapper/v1/RolePermissionMapper.xml | 2 +- .../resources/mapper/v1/UserDeptMapper.xml | 2 +- .../main/resources/mapper/v1/UserMapper.xml | 27 +++-- .../resources/mapper/v1/UserRoleMapper.xml | 2 +- .../security/controller/LoginController.java | 31 +++++ .../security/event/AuthenticationEvents.java | 2 +- .../filter/JwtAuthenticationFilter.java | 8 +- .../security/provider/JwtTokenProvider.java | 3 +- .../security/service/DbUserDetailService.java | 64 +--------- .../module/security/service/LoginService.java | 18 +++ .../service/impl/DbUserDetailServiceImpl.java | 114 ++++++++++++++++++ .../InMemoryUserDetailsService.java | 2 +- .../service/impl/LoginServiceImpl.java | 92 ++++++++++++++ .../strategy/DefaultLoginStrategy.java | 46 +++++++ .../service/strategy/LoginContext.java | 51 ++++++++ .../service/strategy/LoginStrategy.java | 27 +++++ auth-services/service-base/pom.xml | 5 + .../base/controller/AuthLogController.java | 2 +- .../base/controller/DeptController.java | 2 +- .../base/controller/DictController.java | 2 +- .../controller/EmailConfigController.java | 2 +- .../controller/EmailTemplateController.java | 2 +- .../base/controller/FileController.java | 2 +- .../base/controller/LoginLogController.java | 2 +- .../base/controller/MenuController.java | 2 +- .../base/controller/MenuRoleController.java | 2 +- .../controller/OperationLogController.java | 2 +- .../base/controller/PermissionController.java | 2 +- .../base/controller/RoleController.java | 2 +- .../controller/RoleDataScopeController.java | 2 +- .../controller/RolePermissionController.java | 2 +- .../base/controller/UserController.java | 2 +- .../base/controller/UserDeptController.java | 2 +- .../base/controller/UserRoleController.java | 2 +- .../service/base/service/AuthLogService.java | 2 +- .../service/base/service/DeptService.java | 2 +- .../service/base/service/DictService.java | 2 +- .../base/service/EmailConfigService.java | 2 +- .../base/service/EmailTemplateService.java | 2 +- .../service/base/service/FileService.java | 2 +- .../service/base/service/LoginLogService.java | 2 +- .../service/base/service/MenuRoleService.java | 2 +- .../service/base/service/MenuService.java | 2 +- .../base/service/OperationLogService.java | 2 +- .../base/service/PermissionService.java | 2 +- .../base/service/RoleDataScopeService.java | 2 +- .../base/service/RolePermissionService.java | 2 +- .../service/base/service/RoleService.java | 2 +- .../service/base/service/UserDeptService.java | 2 +- .../service/base/service/UserRoleService.java | 2 +- .../service/base/service/UserService.java | 2 +- .../base/service/impl/AuthLogServiceImpl.java | 2 +- .../base/service/impl/DeptServiceImpl.java | 2 +- .../base/service/impl/DictServiceImpl.java | 2 +- .../service/impl/EmailConfigServiceImpl.java | 2 +- .../impl/EmailTemplateServiceImpl.java | 2 +- .../base/service/impl/FileServiceImpl.java | 2 +- .../service/impl/LoginLogServiceImpl.java | 2 +- .../service/impl/MenuRoleServiceImpl.java | 2 +- .../base/service/impl/MenuServiceImpl.java | 2 +- .../service/impl/OperationLogServiceImpl.java | 2 +- .../service/impl/PermissionServiceImpl.java | 2 +- .../impl/RoleDataScopeServiceImpl.java | 2 +- .../impl/RolePermissionServiceImpl.java | 2 +- .../base/service/impl/RoleServiceImpl.java | 2 +- .../service/impl/UserDeptServiceImpl.java | 2 +- .../service/impl/UserRoleServiceImpl.java | 2 +- .../base/service/impl/UserServiceImpl.java | 2 +- pom.xml | 6 + 118 files changed, 620 insertions(+), 236 deletions(-) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/AuthLogEntity.java (97%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/DeptEntity.java (97%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/DictEntity.java (97%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/EmailConfigEntity.java (97%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/EmailTemplateEntity.java (97%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/FileEntity.java (98%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/LoginLogEntity.java (97%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/MenuEntity.java (98%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/MenuRoleEntity.java (94%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/OperationLogEntity.java (97%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/PermissionEntity.java (98%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/RoleDataScopeEntity.java (94%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/RoleEntity.java (97%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/RolePermissionEntity.java (95%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/UserDeptEntity.java (95%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/UserEntity.java (51%) rename auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/{base => }/UserRoleEntity.java (95%) delete mode 100644 auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/package-info.java create mode 100644 auth-dao/dao-base/src/main/java/com/auth/dao/base/view/UserRolePermission.java create mode 100644 auth-module/module-security/src/main/java/com/auth/module/security/controller/LoginController.java create mode 100644 auth-module/module-security/src/main/java/com/auth/module/security/service/LoginService.java create mode 100644 auth-module/module-security/src/main/java/com/auth/module/security/service/impl/DbUserDetailServiceImpl.java rename auth-module/module-security/src/main/java/com/auth/module/security/service/{ => impl}/InMemoryUserDetailsService.java (95%) create mode 100644 auth-module/module-security/src/main/java/com/auth/module/security/service/impl/LoginServiceImpl.java create mode 100644 auth-module/module-security/src/main/java/com/auth/module/security/service/strategy/DefaultLoginStrategy.java create mode 100644 auth-module/module-security/src/main/java/com/auth/module/security/service/strategy/LoginContext.java create mode 100644 auth-module/module-security/src/main/java/com/auth/module/security/service/strategy/LoginStrategy.java diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/AuthLogEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/AuthLogEntity.java similarity index 97% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/AuthLogEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/AuthLogEntity.java index 088a055..5d5a377 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/AuthLogEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/AuthLogEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/DeptEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/DeptEntity.java similarity index 97% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/DeptEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/DeptEntity.java index 3562f10..c66ea5e 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/DeptEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/DeptEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/DictEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/DictEntity.java similarity index 97% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/DictEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/DictEntity.java index a1fe45d..c9dc0e6 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/DictEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/DictEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/EmailConfigEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/EmailConfigEntity.java similarity index 97% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/EmailConfigEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/EmailConfigEntity.java index 508b1d8..6e6ee62 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/EmailConfigEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/EmailConfigEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/EmailTemplateEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/EmailTemplateEntity.java similarity index 97% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/EmailTemplateEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/EmailTemplateEntity.java index e84befa..bf2df91 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/EmailTemplateEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/EmailTemplateEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/FileEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/FileEntity.java similarity index 98% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/FileEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/FileEntity.java index 2699df1..7a817d2 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/FileEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/FileEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/LoginLogEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/LoginLogEntity.java similarity index 97% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/LoginLogEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/LoginLogEntity.java index 06b0dba..8c238f4 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/LoginLogEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/LoginLogEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/MenuEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/MenuEntity.java similarity index 98% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/MenuEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/MenuEntity.java index ecaa974..9782041 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/MenuEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/MenuEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/MenuRoleEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/MenuRoleEntity.java similarity index 94% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/MenuRoleEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/MenuRoleEntity.java index a24eda3..018f165 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/MenuRoleEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/MenuRoleEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/OperationLogEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/OperationLogEntity.java similarity index 97% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/OperationLogEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/OperationLogEntity.java index ea9255f..af0f8b6 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/OperationLogEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/OperationLogEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/PermissionEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/PermissionEntity.java similarity index 98% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/PermissionEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/PermissionEntity.java index fdf7d06..8d125f9 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/PermissionEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/PermissionEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/RoleDataScopeEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/RoleDataScopeEntity.java similarity index 94% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RoleDataScopeEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/RoleDataScopeEntity.java index 4ca4113..8325b72 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RoleDataScopeEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/RoleDataScopeEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/RoleEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/RoleEntity.java similarity index 97% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RoleEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/RoleEntity.java index c42a757..c259bd8 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RoleEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/RoleEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/RolePermissionEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/RolePermissionEntity.java similarity index 95% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RolePermissionEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/RolePermissionEntity.java index 2dce505..f0931ff 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/RolePermissionEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/RolePermissionEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/UserDeptEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/UserDeptEntity.java similarity index 95% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserDeptEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/UserDeptEntity.java index 8f5cbb2..1791ebe 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserDeptEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/UserDeptEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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/base/UserEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/UserEntity.java similarity index 51% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/UserEntity.java index 84a6c6e..a7e5a01 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/UserEntity.java @@ -1,33 +1,22 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.auth.common.model.common.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; -import org.springframework.security.core.CredentialsContainer; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; import java.time.LocalDateTime; import java.util.Date; -import java.util.Set; @Getter @Setter @Accessors(chain = true) @TableName("sys_user") @Schema(name = "User-用户信息实体类", title = "用户信息", description = "用户信息的实体类对象") -public class UserEntity implements UserDetails, CredentialsContainer { - - @Schema(name = "id", title = "唯一标识") - @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonFormat(shape = JsonFormat.Shape.STRING) - @JsonSerialize(using = ToStringSerializer.class) - private Long id; +// 💡 根据自己需求看是否需要自定义用户信息 +public class UserEntity extends BaseEntity /* implements UserDetails, CredentialsContainer */ { @Schema(name = "username", title = "用户名") private String username; @@ -47,9 +36,6 @@ public class UserEntity implements UserDetails, CredentialsContainer { @Schema(name = "avatar", title = "头像") private String avatar; - @Schema(name = "sex", title = "0:女 1:男") - private Integer sex; - @Schema(name = "summary", title = "个人描述") private String summary; @@ -60,10 +46,7 @@ public class UserEntity implements UserDetails, CredentialsContainer { private String ipRegion; @Schema(name = "status", title = "1:禁用 0:正常") - private Integer status; - - @Schema(name = "isDeleted", title = "是否删除") - private Integer isDeleted; + private Boolean status; @Schema(name = "salt", title = "密码盐值") private String salt; @@ -92,36 +75,20 @@ public class UserEntity implements UserDetails, CredentialsContainer { @Schema(name = "postId", title = "所属岗位ID") private Long postId; - @Schema(name = "createTime", title = "创建时间") - @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; + @Schema(name = "isDeleted", title = "是否删除") + private Integer isDeleted; - @Schema(name = "updateTime", title = "更新时间") - @TableField(fill = FieldFill.INSERT_UPDATE) - private LocalDateTime updateTime; + // @TableField(exist = false) + // private Set authorities; + // + // @Override + // public void eraseCredentials() { + // this.password = null; + // } + // + // @Override + // public Set getAuthorities() { + // return this.authorities; + // } - @Schema(name = "createUser", title = "创建用户") - @TableField(fill = FieldFill.INSERT) - @JsonFormat(shape = JsonFormat.Shape.STRING) - @JsonSerialize(using = ToStringSerializer.class) - private Long createUser; - - @Schema(name = "updateUser", title = "操作用户") - @TableField(fill = FieldFill.INSERT_UPDATE) - @JsonFormat(shape = JsonFormat.Shape.STRING) - @JsonSerialize(using = ToStringSerializer.class) - private Long updateUser; - - @TableField(exist = false) - private Set authorities; - - @Override - public void eraseCredentials() { - this.password = null; - } - - @Override - public Set getAuthorities() { - return this.authorities; - } -} \ No newline at end of file +} diff --git a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserRoleEntity.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/UserRoleEntity.java similarity index 95% rename from auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserRoleEntity.java rename to auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/UserRoleEntity.java index e2bfeb4..5ee5952 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/base/UserRoleEntity.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/UserRoleEntity.java @@ -1,4 +1,4 @@ -package com.auth.dao.base.entity.base; +package com.auth.dao.base.entity; 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 deleted file mode 100644 index 05e96e0..0000000 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/entity/package-info.java +++ /dev/null @@ -1 +0,0 @@ -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/AuthLogMapper.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/AuthLogMapper.java index ff2a0f1..f7bf508 100644 --- a/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/AuthLogMapper.java +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/mapper/v1/AuthLogMapper.java @@ -1,7 +1,7 @@ package com.auth.dao.base.mapper.v1; -import com.auth.dao.base.entity.base.AuthLogEntity; +import com.auth.dao.base.entity.AuthLogEntity; import com.auth.model.base.dto.AuthLogDto; import com.auth.model.base.vo.AuthLogVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 018f601..1754f0d 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.DeptDto; import com.auth.model.base.vo.DeptVo; -import com.auth.dao.base.entity.base.DeptEntity; +import com.auth.dao.base.entity.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 030258b..bd03e83 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.DictDto; import com.auth.model.base.vo.DictVo; -import com.auth.dao.base.entity.base.DictEntity; +import com.auth.dao.base.entity.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 5e9b8b1..fbc6f2f 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.EmailConfigDto; import com.auth.model.base.vo.EmailConfigVo; -import com.auth.dao.base.entity.base.EmailConfigEntity; +import com.auth.dao.base.entity.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 cdc1409..ea1c635 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.EmailTemplateDto; import com.auth.model.base.vo.EmailTemplateVo; -import com.auth.dao.base.entity.base.EmailTemplateEntity; +import com.auth.dao.base.entity.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 62e6a0f..dfb0c0f 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.FileDto; import com.auth.model.base.vo.FileVo; -import com.auth.dao.base.entity.base.FileEntity; +import com.auth.dao.base.entity.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 a1c311d..5c2f574 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.LoginLogDto; import com.auth.model.base.vo.LoginLogVo; -import com.auth.dao.base.entity.base.LoginLogEntity; +import com.auth.dao.base.entity.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 213b4b9..995b355 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.MenuDto; import com.auth.model.base.vo.MenuVo; -import com.auth.dao.base.entity.base.MenuEntity; +import com.auth.dao.base.entity.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 ad0a884..15ecdcc 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.MenuRoleDto; import com.auth.model.base.vo.MenuRoleVo; -import com.auth.dao.base.entity.base.MenuRoleEntity; +import com.auth.dao.base.entity.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 f7cc62d..1b6b681 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.OperationLogDto; import com.auth.model.base.vo.OperationLogVo; -import com.auth.dao.base.entity.base.OperationLogEntity; +import com.auth.dao.base.entity.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 643363e..e814ef2 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.PermissionDto; import com.auth.model.base.vo.PermissionVo; -import com.auth.dao.base.entity.base.PermissionEntity; +import com.auth.dao.base.entity.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 572e44d..124879a 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.RoleDataScopeDto; import com.auth.model.base.vo.RoleDataScopeVo; -import com.auth.dao.base.entity.base.RoleDataScopeEntity; +import com.auth.dao.base.entity.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 56819d2..bf211a6 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.RoleDto; import com.auth.model.base.vo.RoleVo; -import com.auth.dao.base.entity.base.RoleEntity; +import com.auth.dao.base.entity.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 56a1fdf..0ff0fb3 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.RolePermissionDto; import com.auth.model.base.vo.RolePermissionVo; -import com.auth.dao.base.entity.base.RolePermissionEntity; +import com.auth.dao.base.entity.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 3c1ac0b..62fb4c8 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.UserDeptDto; import com.auth.model.base.vo.UserDeptVo; -import com.auth.dao.base.entity.base.UserDeptEntity; +import com.auth.dao.base.entity.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 2430ef7..f1f803b 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,11 @@ package com.auth.dao.base.mapper.v1; +import com.auth.dao.base.entity.PermissionEntity; +import com.auth.dao.base.entity.RoleEntity; +import com.auth.dao.base.entity.UserEntity; +import com.auth.dao.base.view.UserRolePermission; import com.auth.model.base.dto.UserDto; import com.auth.model.base.vo.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; @@ -34,12 +35,12 @@ public interface UserMapper extends BaseMapper { IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") UserDto dto); /** - * 根据用户名查询用户信息 + * 根据用户id查询用户角色和权限信息 * - * @param username 用户名 + * @param userId 用户Id * @return 用户实体类 */ - UserEntity selectByUsername(String username); + List selectUserRolePermissionByUsername(Long userId); /** * 根据用户id查找该用户的角色内容 @@ -56,4 +57,12 @@ public interface UserMapper extends BaseMapper { * @return 权限列表 */ List selectPermissionByUserId(Long userId); + + /** + * 根据用户名查询用户信息 + * + * @param username 用户名 + * @return 用户实体类 + */ + UserEntity selectByUsername(String username); } 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 9347c55..6414480 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 @@ -2,7 +2,7 @@ package com.auth.dao.base.mapper.v1; import com.auth.model.base.dto.UserRoleDto; import com.auth.model.base.vo.UserRoleVo; -import com.auth.dao.base.entity.base.UserRoleEntity; +import com.auth.dao.base.entity.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/java/com/auth/dao/base/view/UserRolePermission.java b/auth-dao/dao-base/src/main/java/com/auth/dao/base/view/UserRolePermission.java new file mode 100644 index 0000000..bf79698 --- /dev/null +++ b/auth-dao/dao-base/src/main/java/com/auth/dao/base/view/UserRolePermission.java @@ -0,0 +1,65 @@ +package com.auth.dao.base.view; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.util.Date; + +@Getter +@Setter +@Accessors(chain = true) +@TableName("v_user_role_permission") +@Schema(name = "UserRolePermission-用户角色权限信息实体类", title = "用户角色权限信息", description = "用户角色权限信息的实体类对象") +public class UserRolePermission { + + // 用户角色关联信息 + private Long userId; + + // 角色权限关联信息 + private Long roleId; + private Long permissionId; + + // 权限信息 + private String permissionCode; + private String permissionName; + private String permissionType; + private String url; + private String method; + private Integer permissionLevel; + private String permissionPath; + private Integer permissionOrderNum; + private Integer permissionStatus; + private String permissionRemark; + + // 用户信息 + private String username; + private String nickname; + private String email; + private String phone; + private String salt; + private String password; + private String avatar; + private Integer gender; + private Date birthday; + private String introduction; + private String lastLoginIp; + private Date lastLoginTime; + private String lastLoginRegion; + private Integer status; + private Long deptId; + private Long postId; + private Boolean isDeleted; + + // 角色信息 + private String roleCode; + private String roleName; + private String roleType; + private String roleDataScope; + private Integer roleOrderNum; + private Integer roleStatus; + private String roleRemark; + +} diff --git a/auth-dao/dao-base/src/main/resources/mapper/v1/AuthLogMapper.xml b/auth-dao/dao-base/src/main/resources/mapper/v1/AuthLogMapper.xml index d2e9e54..fac246a 100644 --- a/auth-dao/dao-base/src/main/resources/mapper/v1/AuthLogMapper.xml +++ b/auth-dao/dao-base/src/main/resources/mapper/v1/AuthLogMapper.xml @@ -3,7 +3,7 @@ - + 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 944888b..164f470 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 @@ - + 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 bba09d6..82ede7e 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 @@ - + 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 f2b8689..b407e71 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 @@ - + 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 48fc6b9..d74d156 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 @@ - + 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 1f66459..9798359 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 @@ - + 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 3e5a730..9738712 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 @@ - + 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 e9fa6a0..ff0d06c 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 @@ - + 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 db824af..e910fe1 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 @@ - + 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 a654f55..5329c16 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 @@ - + 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 321f8d4..3faf3c5 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 @@ - + 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 27eb591..3479455 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 @@ - + 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 119834b..432e2b0 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 @@ - + 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 a84f366..7c25c2b 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 @@ - + 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 dab730f..566946c 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 @@ - + 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 8e295bb..bcbf97e 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 @@ - + @@ -117,16 +117,17 @@ - - + select * + from v_user_role_permission vurp + where vurp.user_id = #{userId} + and vurp.is_deleteds = 0 + and vurp.status = 0 - SELECT tr.* FROM t_user_role tur JOIN t_role tr ON tur.role_id = tr.id @@ -138,7 +139,7 @@ - SELECT DISTINCT p.* FROM sys_permission p JOIN sys_role_permission rp ON p.id = rp.permission_id @@ -146,4 +147,12 @@ WHERE ur.user_id = #{userId} + + + 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 c8f69d0..b7fea98 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 @@ - + diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/controller/LoginController.java b/auth-module/module-security/src/main/java/com/auth/module/security/controller/LoginController.java new file mode 100644 index 0000000..6fd750f --- /dev/null +++ b/auth-module/module-security/src/main/java/com/auth/module/security/controller/LoginController.java @@ -0,0 +1,31 @@ +package com.auth.module.security.controller; + + +import com.auth.common.model.common.result.Result; +import com.auth.model.base.dto.LoginDto; +import com.auth.model.base.vo.LoginVo; +import com.auth.module.security.service.LoginService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "登录接口") +@RestController +@RequestMapping("/api") +@RequiredArgsConstructor +public class LoginController { + + private final LoginService loginService; + + @Operation(summary = "用户登录", description = "用户登录") + @PostMapping("login") + public Result login(@RequestBody LoginDto loginDto) { + LoginVo vo = loginService.login(loginDto); + return Result.success(vo); + } + +} diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/event/AuthenticationEvents.java b/auth-module/module-security/src/main/java/com/auth/module/security/event/AuthenticationEvents.java index f3f8504..e06ffa6 100644 --- a/auth-module/module-security/src/main/java/com/auth/module/security/event/AuthenticationEvents.java +++ b/auth-module/module-security/src/main/java/com/auth/module/security/event/AuthenticationEvents.java @@ -2,7 +2,7 @@ package com.auth.module.security.event; import com.alibaba.fastjson2.JSON; import com.auth.common.context.BaseContext; -import com.auth.dao.base.entity.base.AuthLogEntity; +import com.auth.dao.base.entity.AuthLogEntity; import com.auth.dao.base.mapper.v1.AuthLogMapper; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; 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 2c5bffd..e004c7f 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 @@ -64,11 +64,9 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { filterChain.doFilter(request, response); } catch (AuthenticSecurityException e) { // 直接处理认证异常，不再调用filterChain.doFilter() - securityAuthenticationEntryPoint.commence( - request, - response, - new MyAuthenticationException(e.getMessage(), e) - ); + MyAuthenticationException myAuthenticationException = new MyAuthenticationException(e.getMessage(), e); + securityAuthenticationEntryPoint.commence(request, response, myAuthenticationException); + } catch (RuntimeException e) { MyAuthenticationException myAuthenticationException = new MyAuthenticationException("Authentication failed", e); securityAuthenticationEntryPoint.commence(request, response, myAuthenticationException); diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/provider/JwtTokenProvider.java b/auth-module/module-security/src/main/java/com/auth/module/security/provider/JwtTokenProvider.java index 87d4442..4e6fdea 100644 --- a/auth-module/module-security/src/main/java/com/auth/module/security/provider/JwtTokenProvider.java +++ b/auth-module/module-security/src/main/java/com/auth/module/security/provider/JwtTokenProvider.java @@ -33,8 +33,7 @@ public class JwtTokenProvider { * @param username 用户名 * @return 令牌Token */ - public String createToken(Long userId, String username, - List roles, List permissions) { + public String createToken(Long userId, String username, List roles, List permissions) { SecretKey key = getSecretKey(); // return JwtTokenUtil.createToken(userId, username, subject, key, expired); return JwtTokenUtil.createToken(userId, username, roles, permissions, subject, key, expired); 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 3a96d2c..b6a8253 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,69 +1,19 @@ package com.auth.module.security.service; -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; -import org.springframework.security.core.userdetails.UserDetails; +import com.auth.dao.base.view.UserRolePermission; import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -@Service -@Transactional -@RequiredArgsConstructor -public class DbUserDetailService implements UserDetailsService { - - private final UserMapper userMapper; - - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - // 查询当前用户 - UserEntity userEntity = userMapper.selectByUsername(username); - - // 判断当前用户是否存在 - if (userEntity == null) { - throw new UsernameNotFoundException("用户不存在"); - } - - Long userId = userEntity.getId(); - - List list = new ArrayList<>(); - // 设置用户角色 - List roles = findUserRolesByUserId(userId); - // 设置用户权限 - List permissions = findPermissionByUserId(userId); - list.addAll(roles); - list.addAll(permissions); - - Set authorities = list.stream().map(SimpleGrantedAuthority::new) - .collect(Collectors.toSet()); - - // 设置用户权限 - userEntity.setAuthorities(authorities); - // 返回时将用户密码置为空 - userEntity.setPassword(null); - return userEntity; - } +public interface DbUserDetailService extends UserDetailsService { /** * 根据用户id查找该用户的角色内容 * - * @param userId 用户id + * @param userRolePermissionList 用户角色权限列表 * @return 当前用户的角色信息 */ - public List findUserRolesByUserId(Long userId) { - List roleList = userMapper.selectRolesByUserId(userId); - return roleList.stream().map(RoleEntity::getRoleCode).toList(); - } + List findUserRolesByUserId(List userRolePermissionList); /** * 根据用户id查找该用户的权限内容 @@ -71,8 +21,6 @@ public class DbUserDetailService implements UserDetailsService { * @param userId 用户id * @return 当前用户的权限信息 */ - public List findPermissionByUserId(Long userId) { - List permissionList = userMapper.selectPermissionByUserId(userId); - return permissionList.stream().map(PermissionEntity::getPermissionCode).toList(); - } + List findPermissionByUserId(List userRolePermissionList); + } diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/service/LoginService.java b/auth-module/module-security/src/main/java/com/auth/module/security/service/LoginService.java new file mode 100644 index 0000000..cb25b14 --- /dev/null +++ b/auth-module/module-security/src/main/java/com/auth/module/security/service/LoginService.java @@ -0,0 +1,18 @@ +package com.auth.module.security.service; + + +import com.auth.dao.base.entity.UserEntity; +import com.auth.model.base.dto.LoginDto; +import com.auth.model.base.vo.LoginVo; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface LoginService extends IService { + + /** + * 用户登录 + * + * @param loginDto LoginRequest登录参数 + * @return 登录成功返回内容 + */ + LoginVo login(LoginDto loginDto); +} diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/service/impl/DbUserDetailServiceImpl.java b/auth-module/module-security/src/main/java/com/auth/module/security/service/impl/DbUserDetailServiceImpl.java new file mode 100644 index 0000000..4e7e69c --- /dev/null +++ b/auth-module/module-security/src/main/java/com/auth/module/security/service/impl/DbUserDetailServiceImpl.java @@ -0,0 +1,114 @@ +package com.auth.module.security.service.impl; + +import com.auth.dao.base.entity.UserEntity; +import com.auth.dao.base.mapper.v1.UserMapper; +import com.auth.dao.base.view.UserRolePermission; +import com.auth.module.security.service.DbUserDetailService; +import lombok.RequiredArgsConstructor; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.authentication.jaas.JaasGrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.security.Principal; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +@Transactional +@RequiredArgsConstructor +public class DbUserDetailServiceImpl implements DbUserDetailService { + + private final UserMapper userMapper; + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + // 查询当前用户 + UserEntity userEntity = userMapper.selectByUsername(username); + + // 判断当前用户是否存在 + if (userEntity == null) { + throw new UsernameNotFoundException("用户不存在"); + } + + Long userId = userEntity.getId(); + List userRolePermissionList = userMapper.selectUserRolePermissionByUsername(userId); + Map> roleCodeMap = userRolePermissionList.stream().collect(Collectors.groupingBy(UserRolePermission::getRoleCode)); + + List jaasGrantedAuthorities = new ArrayList<>(); + roleCodeMap.forEach((s, permissionCode) -> { + List permissions = getPermissionByRoleCode(s, roleCodeMap).stream().map(SimpleGrantedAuthority::new).toList(); + UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken(s, null, permissions); + JaasGrantedAuthority jaasGrantedAuthority = new JaasGrantedAuthority(s, (Principal) usernamePasswordAuthenticationToken.getPrincipal()); + jaasGrantedAuthorities.add(jaasGrantedAuthority); + }); + + List roles = findUserRolesByUserId(userRolePermissionList); + + // List list = new ArrayList<>(); + // // 设置用户角色 + // List roles = findUserRolesByUserId(userRolePermissionList); + // // 设置用户权限 + // List permissions = findPermissionByUserId(userRolePermissionList); + // list.addAll(roles); + // list.addAll(permissions); + + // Set authorities = list.stream() + // .map(SimpleGrantedAuthority::new) + // .collect(Collectors.toSet()); + + // 设置用户权限 + // userEntity.setAuthorities(authorities); + // // 返回时将用户密码置为空 + // userEntity.setPassword(null); + // return userEntity; + + return User.builder() + .username(username) + .password(userEntity.getPassword()) + .roles(roles.toArray(String[]::new)) + .authorities(jaasGrantedAuthorities) + .disabled(userEntity.getStatus()) + .build(); + } + + /** + * 根据角色码获取当前角色权限 + * + * @param userRolePermissionList 用户角色权限关系列表 + * @return 权限Code + */ + private List getPermissionByRoleCode(String roleCode, Map> userRolePermissionList) { + return userRolePermissionList.get(roleCode) + .stream().map(UserRolePermission::getPermissionCode) + .toList(); + } + + /** + * 根据用户id查找该用户的角色内容 + * + * @param userRolePermissionList 用户角色权限列表 + * @return 当前用户的角色信息 + */ + @Override + public List findUserRolesByUserId(List userRolePermissionList) { + return userRolePermissionList.stream().map(UserRolePermission::getRoleCode).toList(); + } + + /** + * 根据用户id查找该用户的权限内容 + * + * @param userRolePermissionList 用户角色权限列表 + * @return 当前用户的权限信息 + */ + @Override + public List findPermissionByUserId(List userRolePermissionList) { + return userRolePermissionList.stream().map(UserRolePermission::getPermissionCode).toList(); + } +} diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/service/InMemoryUserDetailsService.java b/auth-module/module-security/src/main/java/com/auth/module/security/service/impl/InMemoryUserDetailsService.java similarity index 95% rename from auth-module/module-security/src/main/java/com/auth/module/security/service/InMemoryUserDetailsService.java rename to auth-module/module-security/src/main/java/com/auth/module/security/service/impl/InMemoryUserDetailsService.java index 6cc3127..8a04593 100644 --- a/auth-module/module-security/src/main/java/com/auth/module/security/service/InMemoryUserDetailsService.java +++ b/auth-module/module-security/src/main/java/com/auth/module/security/service/impl/InMemoryUserDetailsService.java @@ -1,4 +1,4 @@ -package com.auth.module.security.service; +package com.auth.module.security.service.impl; // @Service // @RequiredArgsConstructor diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/service/impl/LoginServiceImpl.java b/auth-module/module-security/src/main/java/com/auth/module/security/service/impl/LoginServiceImpl.java new file mode 100644 index 0000000..06084ce --- /dev/null +++ b/auth-module/module-security/src/main/java/com/auth/module/security/service/impl/LoginServiceImpl.java @@ -0,0 +1,92 @@ +package com.auth.module.security.service.impl; + + +import com.auth.common.model.common.result.ResultCodeEnum; +import com.auth.common.model.enums.LoginEnums; +import com.auth.dao.base.entity.PermissionEntity; +import com.auth.dao.base.entity.RoleEntity; +import com.auth.dao.base.entity.UserEntity; +import com.auth.dao.base.mapper.v1.UserMapper; +import com.auth.model.base.dto.LoginDto; +import com.auth.model.base.vo.LoginVo; +import com.auth.module.security.provider.JwtTokenProvider; +import com.auth.module.security.service.LoginService; +import com.auth.module.security.service.strategy.DefaultLoginStrategy; +import com.auth.module.security.service.strategy.LoginContext; +import com.auth.module.security.service.strategy.LoginStrategy; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class LoginServiceImpl extends ServiceImpl implements LoginService { + + private final JwtTokenProvider jwtTokenProvider; + private final DbUserDetailServiceImpl dbUserDetailServiceImpl; + private final UserMapper userMapper; + private final PasswordEncoder passwordEncoder; + + /** + * 用户登录 + * + * @param loginDto LoginRequest登录参数 + * @return 登录成功返回内容 + */ + @Override + public LoginVo login(LoginDto loginDto) { + // 初始化所有策略（可扩展） + HashMap loginStrategyHashMap = new HashMap<>(); + // 默认的登录方式 + loginStrategyHashMap.put(LoginEnums.default_STRATEGY.getValue(), new DefaultLoginStrategy(userMapper)); + + // 使用登录上下文调用登录策略 + LoginContext loginContext = new LoginContext(loginStrategyHashMap); + UserEntity user = loginContext.executeStrategy(loginDto); + + // 验证登录逻辑 + if (user == null) throw new UsernameNotFoundException(ResultCodeEnum.USER_IS_EMPTY.getMessage()); + + // 数据库密码 + String dbPassword = user.getPassword(); + String password = loginDto.getPassword(); + if (!passwordEncoder.matches(password, dbPassword)) { + throw new UsernameNotFoundException(ResultCodeEnum.LOGIN_ERROR.getMessage()); + } + + // 登录结束后的操作 + loginContext.loginAfter(loginDto, user); + + // 设置用户创建用户id 和 更新用户id + Long userId = user.getId(); + user.setCreateUser(userId); + user.setUpdateUser(userId); + updateById(user); + + List roles = baseMapper.selectRolesByUserId(userId).stream().map(RoleEntity::getRoleCode).toList(); + List permission = baseMapper.selectPermissionByUserId(userId).stream().map(PermissionEntity::getPermissionCode).toList(); + String token = jwtTokenProvider.createToken(userId, user.getUsername(), roles, permission); + + // 过期时间 + Long expiresInSeconds = jwtTokenProvider.expired; + long expirationMillis = System.currentTimeMillis() + (expiresInSeconds * 1000); + Date date = new Date(expirationMillis); + + // 构建用户返回对象 + LoginVo loginVo = new LoginVo(); + BeanUtils.copyProperties(user, loginVo); + loginVo.setToken(token); + loginVo.setReadMeDay(expirationMillis); + loginVo.setExpires(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)); + + return loginVo; + } +} diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/service/strategy/DefaultLoginStrategy.java b/auth-module/module-security/src/main/java/com/auth/module/security/service/strategy/DefaultLoginStrategy.java new file mode 100644 index 0000000..aaeb50b --- /dev/null +++ b/auth-module/module-security/src/main/java/com/auth/module/security/service/strategy/DefaultLoginStrategy.java @@ -0,0 +1,46 @@ +package com.auth.module.security.service.strategy; + +import com.auth.dao.base.entity.UserEntity; +import com.auth.dao.base.mapper.v1.UserMapper; +import com.auth.model.base.dto.LoginDto; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 使用用户名登录 + */ +public class DefaultLoginStrategy implements LoginStrategy { + private final UserMapper userMapper; + + public DefaultLoginStrategy(UserMapper userMapper) { + this.userMapper = userMapper; + } + + /** + * 登录鉴定方法 + * 默认登录方式，使用用户名查询用户 + * + * @param loginDto 登录参数 + * @return 鉴定身份验证 + */ + @Override + public UserEntity authenticate(LoginDto loginDto) { + String username = loginDto.getUsername(); + + // 查询用户相关内容 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(UserEntity::getUsername, username); + return userMapper.selectOne(queryWrapper); + } + + /** + * 登录完成后的内容 + * + * @param loginDto 登录参数 + * @param adminUser 用户 + */ + @Override + public void authenticateAfter(LoginDto loginDto, UserEntity adminUser) { + + } + +} \ No newline at end of file diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/service/strategy/LoginContext.java b/auth-module/module-security/src/main/java/com/auth/module/security/service/strategy/LoginContext.java new file mode 100644 index 0000000..d869927 --- /dev/null +++ b/auth-module/module-security/src/main/java/com/auth/module/security/service/strategy/LoginContext.java @@ -0,0 +1,51 @@ +package com.auth.module.security.service.strategy; + + +import com.auth.dao.base.entity.UserEntity; +import com.auth.model.base.dto.LoginDto; +import org.springframework.security.core.userdetails.UsernameNotFoundException; + +import java.util.Map; + +/** + * 登录策略上下文 + */ +public class LoginContext { + + private final Map strategies; + + public LoginContext(Map strategies) { + this.strategies = strategies; + } + + + /** + * 执行登录策略 + * 根据情况判断 type 是否为空 + * + * @param loginDto 登录参数 + * @return 用户 + */ + public UserEntity executeStrategy(LoginDto loginDto) { + String type = loginDto.getType(); + LoginStrategy strategy = strategies.get(type); + + if (strategy == null) { + throw new UsernameNotFoundException("不支持登录类型: " + type); + } + + return strategy.authenticate(loginDto); + } + + /** + * 登录完成后的内容 + * + * @param loginDto 登录参数 + */ + public void loginAfter(LoginDto loginDto, UserEntity adminUser) { + String type = loginDto.getType(); + LoginStrategy strategy = strategies.get(type); + + strategy.authenticateAfter(loginDto, adminUser); + } +} \ No newline at end of file diff --git a/auth-module/module-security/src/main/java/com/auth/module/security/service/strategy/LoginStrategy.java b/auth-module/module-security/src/main/java/com/auth/module/security/service/strategy/LoginStrategy.java new file mode 100644 index 0000000..7bf70a9 --- /dev/null +++ b/auth-module/module-security/src/main/java/com/auth/module/security/service/strategy/LoginStrategy.java @@ -0,0 +1,27 @@ +package com.auth.module.security.service.strategy; + + +import com.auth.dao.base.entity.UserEntity; +import com.auth.model.base.dto.LoginDto; + +/** + * 登录策略 + */ +public interface LoginStrategy { + + /** + * 登录鉴定方法 + * + * @param loginDto 登录参数 + * @return 鉴定身份验证 + */ + UserEntity authenticate(LoginDto loginDto); + + /** + * 登录完成后的内容 + * + * @param loginDto 登录参数 + * @param adminUser {@link UserEntity} + */ + void authenticateAfter(LoginDto loginDto, UserEntity adminUser); +} diff --git a/auth-services/service-base/pom.xml b/auth-services/service-base/pom.xml index 2cd2d71..ae07abe 100644 --- a/auth-services/service-base/pom.xml +++ b/auth-services/service-base/pom.xml @@ -26,5 +26,10 @@ spring-boot-devtools runtime + + + org.dromara.x-file-storage + x-file-storage-spring + diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/controller/AuthLogController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/AuthLogController.java index e7c25fd..3ec4e5d 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/AuthLogController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/AuthLogController.java @@ -3,7 +3,7 @@ package com.auth.service.base.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.dao.base.entity.base.AuthLogEntity; +import com.auth.dao.base.entity.AuthLogEntity; import com.auth.model.base.dto.AuthLogDto; import com.auth.model.base.vo.AuthLogVo; import com.auth.service.base.service.AuthLogService; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/controller/DeptController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/DeptController.java index 823fdcd..ae4633a 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/DeptController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/DeptController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.DeptDto; import com.auth.model.base.vo.DeptVo; -import com.auth.dao.base.entity.base.DeptEntity; +import com.auth.dao.base.entity.DeptEntity; import com.auth.service.base.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/controller/DictController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/DictController.java index a4feb01..70b3833 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/DictController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/DictController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.DictDto; import com.auth.model.base.vo.DictVo; -import com.auth.dao.base.entity.base.DictEntity; +import com.auth.dao.base.entity.DictEntity; import com.auth.service.base.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/controller/EmailConfigController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/EmailConfigController.java index 922a0c2..7145729 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/EmailConfigController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/EmailConfigController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.EmailConfigDto; import com.auth.model.base.vo.EmailConfigVo; -import com.auth.dao.base.entity.base.EmailConfigEntity; +import com.auth.dao.base.entity.EmailConfigEntity; import com.auth.service.base.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/controller/EmailTemplateController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/EmailTemplateController.java index ac9ad52..f80ab53 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/EmailTemplateController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/EmailTemplateController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.EmailTemplateDto; import com.auth.model.base.vo.EmailTemplateVo; -import com.auth.dao.base.entity.base.EmailTemplateEntity; +import com.auth.dao.base.entity.EmailTemplateEntity; import com.auth.service.base.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/controller/FileController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/FileController.java index e55a1b6..0db287b 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/FileController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/FileController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.FileDto; import com.auth.model.base.vo.FileVo; -import com.auth.dao.base.entity.base.FileEntity; +import com.auth.dao.base.entity.FileEntity; import com.auth.service.base.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/controller/LoginLogController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/LoginLogController.java index 5515363..bfbd68d 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/LoginLogController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/LoginLogController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.LoginLogDto; import com.auth.model.base.vo.LoginLogVo; -import com.auth.dao.base.entity.base.LoginLogEntity; +import com.auth.dao.base.entity.LoginLogEntity; import com.auth.service.base.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/controller/MenuController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/MenuController.java index 07023d7..e335558 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/MenuController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/MenuController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.MenuDto; import com.auth.model.base.vo.MenuVo; -import com.auth.dao.base.entity.base.MenuEntity; +import com.auth.dao.base.entity.MenuEntity; import com.auth.service.base.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/controller/MenuRoleController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/MenuRoleController.java index 0e933fc..28d1140 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/MenuRoleController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/MenuRoleController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.MenuRoleDto; import com.auth.model.base.vo.MenuRoleVo; -import com.auth.dao.base.entity.base.MenuRoleEntity; +import com.auth.dao.base.entity.MenuRoleEntity; import com.auth.service.base.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/controller/OperationLogController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/OperationLogController.java index 09c23e5..2961af5 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/OperationLogController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/OperationLogController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.OperationLogDto; import com.auth.model.base.vo.OperationLogVo; -import com.auth.dao.base.entity.base.OperationLogEntity; +import com.auth.dao.base.entity.OperationLogEntity; import com.auth.service.base.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/controller/PermissionController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/PermissionController.java index 30b5a44..6bd47db 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/PermissionController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/PermissionController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.PermissionDto; import com.auth.model.base.vo.PermissionVo; -import com.auth.dao.base.entity.base.PermissionEntity; +import com.auth.dao.base.entity.PermissionEntity; import com.auth.service.base.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/controller/RoleController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/RoleController.java index 118f87c..511fe5e 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/RoleController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/RoleController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.RoleDto; import com.auth.model.base.vo.RoleVo; -import com.auth.dao.base.entity.base.RoleEntity; +import com.auth.dao.base.entity.RoleEntity; import com.auth.service.base.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/controller/RoleDataScopeController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/RoleDataScopeController.java index f7e04f7..ae268ff 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/RoleDataScopeController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/RoleDataScopeController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.RoleDataScopeDto; import com.auth.model.base.vo.RoleDataScopeVo; -import com.auth.dao.base.entity.base.RoleDataScopeEntity; +import com.auth.dao.base.entity.RoleDataScopeEntity; import com.auth.service.base.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/controller/RolePermissionController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/RolePermissionController.java index 3629535..f5c9fc9 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/RolePermissionController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/RolePermissionController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.RolePermissionDto; import com.auth.model.base.vo.RolePermissionVo; -import com.auth.dao.base.entity.base.RolePermissionEntity; +import com.auth.dao.base.entity.RolePermissionEntity; import com.auth.service.base.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/controller/UserController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserController.java index ba52a67..6577110 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.UserDto; import com.auth.model.base.vo.UserVo; -import com.auth.dao.base.entity.base.UserEntity; +import com.auth.dao.base.entity.UserEntity; import com.auth.service.base.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/controller/UserDeptController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserDeptController.java index 671b84d..706e612 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserDeptController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserDeptController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.UserDeptDto; import com.auth.model.base.vo.UserDeptVo; -import com.auth.dao.base.entity.base.UserDeptEntity; +import com.auth.dao.base.entity.UserDeptEntity; import com.auth.service.base.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/controller/UserRoleController.java b/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserRoleController.java index 163bd6b..08c6ac1 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserRoleController.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/controller/UserRoleController.java @@ -5,7 +5,7 @@ import com.auth.common.model.common.result.Result; import com.auth.common.model.common.result.ResultCodeEnum; import com.auth.model.base.dto.UserRoleDto; import com.auth.model.base.vo.UserRoleVo; -import com.auth.dao.base.entity.base.UserRoleEntity; +import com.auth.dao.base.entity.UserRoleEntity; import com.auth.service.base.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/service/AuthLogService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/AuthLogService.java index 871c7ee..5bdee3f 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/AuthLogService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/AuthLogService.java @@ -1,7 +1,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; -import com.auth.dao.base.entity.base.AuthLogEntity; +import com.auth.dao.base.entity.AuthLogEntity; import com.auth.model.base.dto.AuthLogDto; import com.auth.model.base.vo.AuthLogVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/DeptService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/DeptService.java index 3de23b9..14136f8 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/DeptService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/DeptService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.DeptDto; import com.auth.model.base.vo.DeptVo; -import com.auth.dao.base.entity.base.DeptEntity; +import com.auth.dao.base.entity.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/service/DictService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/DictService.java index 6b695c0..fb8b774 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/DictService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/DictService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.DictDto; import com.auth.model.base.vo.DictVo; -import com.auth.dao.base.entity.base.DictEntity; +import com.auth.dao.base.entity.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/service/EmailConfigService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/EmailConfigService.java index cc284bb..00f0a18 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/EmailConfigService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/EmailConfigService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.EmailConfigDto; import com.auth.model.base.vo.EmailConfigVo; -import com.auth.dao.base.entity.base.EmailConfigEntity; +import com.auth.dao.base.entity.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/service/EmailTemplateService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/EmailTemplateService.java index f610098..445151f 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/EmailTemplateService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/EmailTemplateService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.EmailTemplateDto; import com.auth.model.base.vo.EmailTemplateVo; -import com.auth.dao.base.entity.base.EmailTemplateEntity; +import com.auth.dao.base.entity.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/service/FileService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/FileService.java index 28d3f6a..586bc94 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/FileService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/FileService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.FileDto; import com.auth.model.base.vo.FileVo; -import com.auth.dao.base.entity.base.FileEntity; +import com.auth.dao.base.entity.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/service/LoginLogService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/LoginLogService.java index 8c64c8c..b344bc9 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/LoginLogService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/LoginLogService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.LoginLogDto; import com.auth.model.base.vo.LoginLogVo; -import com.auth.dao.base.entity.base.LoginLogEntity; +import com.auth.dao.base.entity.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/service/MenuRoleService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/MenuRoleService.java index 443cc2b..a42daca 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/MenuRoleService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/MenuRoleService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.MenuRoleDto; import com.auth.model.base.vo.MenuRoleVo; -import com.auth.dao.base.entity.base.MenuRoleEntity; +import com.auth.dao.base.entity.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/service/MenuService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/MenuService.java index 2ecc933..1dd9e9e 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/MenuService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/MenuService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.MenuDto; import com.auth.model.base.vo.MenuVo; -import com.auth.dao.base.entity.base.MenuEntity; +import com.auth.dao.base.entity.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/service/OperationLogService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/OperationLogService.java index fd620b1..7ab869a 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/OperationLogService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/OperationLogService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.OperationLogDto; import com.auth.model.base.vo.OperationLogVo; -import com.auth.dao.base.entity.base.OperationLogEntity; +import com.auth.dao.base.entity.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/service/PermissionService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/PermissionService.java index 0ed8cbf..9107f07 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/PermissionService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/PermissionService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.PermissionDto; import com.auth.model.base.vo.PermissionVo; -import com.auth.dao.base.entity.base.PermissionEntity; +import com.auth.dao.base.entity.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/service/RoleDataScopeService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/RoleDataScopeService.java index 97f7363..b6e83e5 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/RoleDataScopeService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/RoleDataScopeService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.RoleDataScopeDto; import com.auth.model.base.vo.RoleDataScopeVo; -import com.auth.dao.base.entity.base.RoleDataScopeEntity; +import com.auth.dao.base.entity.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/service/RolePermissionService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/RolePermissionService.java index 27bd17c..7ba980a 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/RolePermissionService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/RolePermissionService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.RolePermissionDto; import com.auth.model.base.vo.RolePermissionVo; -import com.auth.dao.base.entity.base.RolePermissionEntity; +import com.auth.dao.base.entity.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/service/RoleService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/RoleService.java index 956e69d..4c01f14 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/RoleService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/RoleService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.RoleDto; import com.auth.model.base.vo.RoleVo; -import com.auth.dao.base.entity.base.RoleEntity; +import com.auth.dao.base.entity.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/service/UserDeptService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/UserDeptService.java index 300728f..05441c6 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/UserDeptService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/UserDeptService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.UserDeptDto; import com.auth.model.base.vo.UserDeptVo; -import com.auth.dao.base.entity.base.UserDeptEntity; +import com.auth.dao.base.entity.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/service/UserRoleService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/UserRoleService.java index 9d14bff..998c5ba 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/UserRoleService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/UserRoleService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.UserRoleDto; import com.auth.model.base.vo.UserRoleVo; -import com.auth.dao.base.entity.base.UserRoleEntity; +import com.auth.dao.base.entity.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/service/UserService.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/UserService.java index fd3d106..1036938 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/UserService.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/UserService.java @@ -3,7 +3,7 @@ package com.auth.service.base.service; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.UserDto; import com.auth.model.base.vo.UserVo; -import com.auth.dao.base.entity.base.UserEntity; +import com.auth.dao.base.entity.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/service/impl/AuthLogServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/AuthLogServiceImpl.java index 389abf2..05f93b5 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/AuthLogServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/AuthLogServiceImpl.java @@ -1,7 +1,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; -import com.auth.dao.base.entity.base.AuthLogEntity; +import com.auth.dao.base.entity.AuthLogEntity; import com.auth.dao.base.mapper.v1.AuthLogMapper; import com.auth.model.base.dto.AuthLogDto; import com.auth.model.base.vo.AuthLogVo; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DeptServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DeptServiceImpl.java index 0790f7e..ab9e0d7 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DeptServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DeptServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.DeptDto; import com.auth.model.base.vo.DeptVo; -import com.auth.dao.base.entity.base.DeptEntity; +import com.auth.dao.base.entity.DeptEntity; import com.auth.dao.base.mapper.v1.DeptMapper; import com.auth.service.base.service.DeptService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DictServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DictServiceImpl.java index 7152ce3..3cd29d3 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DictServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/DictServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.DictDto; import com.auth.model.base.vo.DictVo; -import com.auth.dao.base.entity.base.DictEntity; +import com.auth.dao.base.entity.DictEntity; import com.auth.dao.base.mapper.v1.DictMapper; import com.auth.service.base.service.DictService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailConfigServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailConfigServiceImpl.java index ff8463e..ba7e51c 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailConfigServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailConfigServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.EmailConfigDto; import com.auth.model.base.vo.EmailConfigVo; -import com.auth.dao.base.entity.base.EmailConfigEntity; +import com.auth.dao.base.entity.EmailConfigEntity; import com.auth.dao.base.mapper.v1.EmailConfigMapper; import com.auth.service.base.service.EmailConfigService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailTemplateServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailTemplateServiceImpl.java index bc54d1b..fa992d9 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailTemplateServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/EmailTemplateServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.EmailTemplateDto; import com.auth.model.base.vo.EmailTemplateVo; -import com.auth.dao.base.entity.base.EmailTemplateEntity; +import com.auth.dao.base.entity.EmailTemplateEntity; import com.auth.dao.base.mapper.v1.EmailTemplateMapper; import com.auth.service.base.service.EmailTemplateService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/FileServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/FileServiceImpl.java index 3c2da2d..5ac4304 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/FileServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/FileServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.FileDto; import com.auth.model.base.vo.FileVo; -import com.auth.dao.base.entity.base.FileEntity; +import com.auth.dao.base.entity.FileEntity; import com.auth.dao.base.mapper.v1.FileMapper; import com.auth.service.base.service.FileService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/LoginLogServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/LoginLogServiceImpl.java index e48ab9f..765f602 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/LoginLogServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/LoginLogServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.LoginLogDto; import com.auth.model.base.vo.LoginLogVo; -import com.auth.dao.base.entity.base.LoginLogEntity; +import com.auth.dao.base.entity.LoginLogEntity; import com.auth.dao.base.mapper.v1.LoginLogMapper; import com.auth.service.base.service.LoginLogService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuRoleServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuRoleServiceImpl.java index 38a88ba..648c032 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuRoleServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuRoleServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.MenuRoleDto; import com.auth.model.base.vo.MenuRoleVo; -import com.auth.dao.base.entity.base.MenuRoleEntity; +import com.auth.dao.base.entity.MenuRoleEntity; import com.auth.dao.base.mapper.v1.MenuRoleMapper; import com.auth.service.base.service.MenuRoleService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuServiceImpl.java index 20c28f5..e8753c3 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/MenuServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.MenuDto; import com.auth.model.base.vo.MenuVo; -import com.auth.dao.base.entity.base.MenuEntity; +import com.auth.dao.base.entity.MenuEntity; import com.auth.dao.base.mapper.v1.MenuMapper; import com.auth.service.base.service.MenuService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/OperationLogServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/OperationLogServiceImpl.java index ccce945..5cd14b2 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/OperationLogServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/OperationLogServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.OperationLogDto; import com.auth.model.base.vo.OperationLogVo; -import com.auth.dao.base.entity.base.OperationLogEntity; +import com.auth.dao.base.entity.OperationLogEntity; import com.auth.dao.base.mapper.v1.OperationLogMapper; import com.auth.service.base.service.OperationLogService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/PermissionServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/PermissionServiceImpl.java index 692a616..c8f6865 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/PermissionServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/PermissionServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.PermissionDto; import com.auth.model.base.vo.PermissionVo; -import com.auth.dao.base.entity.base.PermissionEntity; +import com.auth.dao.base.entity.PermissionEntity; import com.auth.dao.base.mapper.v1.PermissionMapper; import com.auth.service.base.service.PermissionService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleDataScopeServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleDataScopeServiceImpl.java index 68aca71..079d535 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleDataScopeServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleDataScopeServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.RoleDataScopeDto; import com.auth.model.base.vo.RoleDataScopeVo; -import com.auth.dao.base.entity.base.RoleDataScopeEntity; +import com.auth.dao.base.entity.RoleDataScopeEntity; import com.auth.dao.base.mapper.v1.RoleDataScopeMapper; import com.auth.service.base.service.RoleDataScopeService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RolePermissionServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RolePermissionServiceImpl.java index 33b1213..2e98f61 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RolePermissionServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RolePermissionServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.RolePermissionDto; import com.auth.model.base.vo.RolePermissionVo; -import com.auth.dao.base.entity.base.RolePermissionEntity; +import com.auth.dao.base.entity.RolePermissionEntity; import com.auth.dao.base.mapper.v1.RolePermissionMapper; import com.auth.service.base.service.RolePermissionService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleServiceImpl.java index 88d7f18..0b2c47f 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/RoleServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.RoleDto; import com.auth.model.base.vo.RoleVo; -import com.auth.dao.base.entity.base.RoleEntity; +import com.auth.dao.base.entity.RoleEntity; import com.auth.dao.base.mapper.v1.RoleMapper; import com.auth.service.base.service.RoleService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserDeptServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserDeptServiceImpl.java index d665155..4bf639f 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserDeptServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserDeptServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.UserDeptDto; import com.auth.model.base.vo.UserDeptVo; -import com.auth.dao.base.entity.base.UserDeptEntity; +import com.auth.dao.base.entity.UserDeptEntity; import com.auth.dao.base.mapper.v1.UserDeptMapper; import com.auth.service.base.service.UserDeptService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserRoleServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserRoleServiceImpl.java index 947a914..bcb41eb 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserRoleServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserRoleServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.UserRoleDto; import com.auth.model.base.vo.UserRoleVo; -import com.auth.dao.base.entity.base.UserRoleEntity; +import com.auth.dao.base.entity.UserRoleEntity; import com.auth.dao.base.mapper.v1.UserRoleMapper; import com.auth.service.base.service.UserRoleService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserServiceImpl.java b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserServiceImpl.java index ac58c0e..71aee56 100644 --- a/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserServiceImpl.java +++ b/auth-services/service-base/src/main/java/com/auth/service/base/service/impl/UserServiceImpl.java @@ -3,7 +3,7 @@ package com.auth.service.base.service.impl; import com.auth.common.model.common.result.PageResult; import com.auth.model.base.dto.UserDto; import com.auth.model.base.vo.UserVo; -import com.auth.dao.base.entity.base.UserEntity; +import com.auth.dao.base.entity.UserEntity; import com.auth.dao.base.mapper.v1.UserMapper; import com.auth.service.base.service.UserService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/pom.xml b/pom.xml index 93eff2c..b7eab73 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ 4.5.0 2.0.47 8.5.17 + 2.3.0 1.18.32 0.12.6 4.0.2 @@ -114,6 +115,11 @@ minio ${minio.version} + + org.dromara.x-file-storage + x-file-storage-spring + ${x-file-storage-spring.version} + org.projectlombok