From 85d0189c966e0c9d2d139dfcf0629938202e2516 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Wed, 23 Apr 2025 17:06:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E5=91=BD=E5=90=8D=E5=8C=85?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomAuthorizationManagerServiceImpl.java | 2 +- .../cn/bunny/services/utils/TokenUtilsTest.java | 2 +- .../controller/system/UserController.java | 6 +++++- auth-system/domain/pom.xml | 4 ++-- .../impl/ConfigurationServiceImpl.java | 4 ++-- .../impl/EmailUsersServiceImpl.java | 4 ++-- .../configuration/impl/I18nServiceImpl.java | 8 +++----- .../message/impl/MessageReceivedServiceImpl.java | 4 ++-- .../schedule/impl/SchedulersServiceImpl.java | 8 ++++---- .../services/service/system/UserService.java | 6 +++++- .../service/system/impl/DeptServiceImpl.java | 4 ++-- .../service/system/impl/FilesServiceImpl.java | 8 ++++---- .../service/system/impl/PowerServiceImpl.java | 6 +++--- .../system/impl/RolePowerServiceImpl.java | 10 +++++----- .../service/system/impl/RoleServiceImpl.java | 14 +++++++------- .../service/system/impl/RouterServiceImpl.java | 14 +++++++------- .../service/system/impl/UserRoleServiceImpl.java | 12 ++++++------ .../service/system/impl/UserServiceImpl.java | 16 +++++++++++++++- .../cn/bunny/services/utils/system/UserUtil.java | 2 +- common/common-config/pom.xml | 2 +- .../cn/bunny/services/context/BaseContext.java | 2 +- common/{common-domain => domain-common}/pom.xml | 2 +- .../domain/constant/LocalDateTimeConstant.java | 0 .../cn/bunny/domain/constant/MinioConstant.java | 0 .../bunny/domain/constant/RedisUserConstant.java | 0 .../domain/constant/SecurityConfigConstant.java | 0 .../cn/bunny/domain/constant/UserConstant.java | 0 .../java/cn/bunny/domain/entity/BaseEntity.java | 0 .../cn/bunny/domain/entity/BaseUserEntity.java | 0 .../bunny/domain/enums/EmailTemplateEnums.java | 0 .../java/cn/bunny/domain/enums/JobEnums.java | 0 .../java/cn/bunny/domain/enums/LoginEnums.java | 0 .../cn/bunny/domain/model/email/EmailSend.java | 0 .../bunny/domain/model/email/EmailSendInit.java | 0 .../bunny/domain/model/file/MinioFilePath.java | 0 .../model/quartz/ScheduleExecuteLogJson.java | 0 .../cn/bunny/domain/views/ViewRolePower.java | 0 .../cn/bunny/domain/views/ViewRouterRole.java | 0 .../java/cn/bunny/domain/views/ViewUserDept.java | 0 .../main/java/cn/bunny/domain/vo/BaseUserVo.java | 0 .../src/main/java/cn/bunny/domain/vo/BaseVo.java | 0 .../main/java/cn/bunny/domain/vo}/LoginVo.java | 3 +-- .../cn/bunny/domain/vo/result/PageResult.java | 0 .../java/cn/bunny/domain/vo/result/Result.java | 0 .../bunny/domain/vo/result/ResultCodeEnum.java | 0 common/generator-code/pom.xml | 7 +++---- common/pom.xml | 2 +- 47 files changed, 85 insertions(+), 67 deletions(-) rename common/{common-domain => domain-common}/pom.xml (97%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/constant/LocalDateTimeConstant.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/constant/MinioConstant.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/constant/RedisUserConstant.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/constant/SecurityConfigConstant.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/constant/UserConstant.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/entity/BaseEntity.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/entity/BaseUserEntity.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/enums/EmailTemplateEnums.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/enums/JobEnums.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/enums/LoginEnums.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/model/email/EmailSend.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/model/email/EmailSendInit.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/model/file/MinioFilePath.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/model/quartz/ScheduleExecuteLogJson.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/views/ViewRolePower.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/views/ViewRouterRole.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/views/ViewUserDept.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/vo/BaseUserVo.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/vo/BaseVo.java (100%) rename {auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user => common/domain-common/src/main/java/cn/bunny/domain/vo}/LoginVo.java (96%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/vo/result/PageResult.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/vo/result/Result.java (100%) rename common/{common-domain => domain-common}/src/main/java/cn/bunny/domain/vo/result/ResultCodeEnum.java (100%) diff --git a/auth-admin/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java b/auth-admin/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java index e178cb6..e0582e6 100644 --- a/auth-admin/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java +++ b/auth-admin/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java @@ -3,7 +3,7 @@ package cn.bunny.services.security.custom; import cn.bunny.domain.constant.RedisUserConstant; import cn.bunny.domain.system.entity.Power; import cn.bunny.domain.system.entity.Role; -import cn.bunny.domain.system.vo.user.LoginVo; +import cn.bunny.domain.vo.LoginVo; import cn.bunny.domain.vo.result.ResultCodeEnum; import cn.bunny.services.context.BaseContext; import cn.bunny.services.mapper.system.PowerMapper; diff --git a/auth-admin/src/test/java/cn/bunny/services/utils/TokenUtilsTest.java b/auth-admin/src/test/java/cn/bunny/services/utils/TokenUtilsTest.java index dd546bb..4193a78 100644 --- a/auth-admin/src/test/java/cn/bunny/services/utils/TokenUtilsTest.java +++ b/auth-admin/src/test/java/cn/bunny/services/utils/TokenUtilsTest.java @@ -1,7 +1,7 @@ package cn.bunny.services.utils; import cn.bunny.domain.system.entity.AdminUser; -import cn.bunny.domain.system.vo.user.LoginVo; +import cn.bunny.domain.vo.LoginVo; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.utils.system.UserUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/auth-system/controllers/src/main/java/cn/bunny/services/controller/system/UserController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/system/UserController.java index 81f0058..7d3e472 100644 --- a/auth-system/controllers/src/main/java/cn/bunny/services/controller/system/UserController.java +++ b/auth-system/controllers/src/main/java/cn/bunny/services/controller/system/UserController.java @@ -2,7 +2,11 @@ package cn.bunny.services.controller.system; import cn.bunny.domain.system.dto.user.*; import cn.bunny.domain.system.entity.AdminUser; -import cn.bunny.domain.system.vo.user.*; +import cn.bunny.domain.system.vo.user.AdminUserVo; +import cn.bunny.domain.system.vo.user.RefreshTokenVo; +import cn.bunny.domain.system.vo.user.SearchUserinfoVo; +import cn.bunny.domain.system.vo.user.UserVo; +import cn.bunny.domain.vo.LoginVo; import cn.bunny.domain.vo.result.PageResult; import cn.bunny.domain.vo.result.Result; import cn.bunny.domain.vo.result.ResultCodeEnum; diff --git a/auth-system/domain/pom.xml b/auth-system/domain/pom.xml index f2e586c..4cede77 100644 --- a/auth-system/domain/pom.xml +++ b/auth-system/domain/pom.xml @@ -10,7 +10,7 @@ domain jar - domain + domain-system https://maven.apache.org UTF-8 @@ -19,7 +19,7 @@ cn.bunny - common-domain + domain-common 0.0.1-SNAPSHOT diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java index fcbb2c6..0ca4016 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java @@ -7,8 +7,8 @@ import cn.bunny.domain.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.service.configuration.ConfigurationService; import com.alibaba.fastjson2.JSON; +import jakarta.annotation.Resource; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -20,7 +20,7 @@ import java.io.InputStream; @Transactional public class ConfigurationServiceImpl implements ConfigurationService { - @Autowired + @Resource private RedisTemplate redisTemplate; /** diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java index 1250c8c..3556e1e 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java @@ -15,9 +15,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,7 +37,7 @@ import java.util.Map; @Transactional public class EmailUsersServiceImpl extends ServiceImpl implements EmailUsersService { - @Autowired + @Resource private EmailUsersMapper emailUsersMapper; /** diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java index 646aaa0..bcbef81 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.cache.annotation.CacheEvict; @@ -56,11 +57,8 @@ import java.util.zip.ZipOutputStream; @Transactional public class I18nServiceImpl extends ServiceImpl implements I18nService { - private final I18nTypeMapper i18nTypeMapper; - - public I18nServiceImpl(I18nTypeMapper i18nTypeMapper) { - this.i18nTypeMapper = i18nTypeMapper; - } + @Resource + private I18nTypeMapper i18nTypeMapper; /** * * 获取多语言内容 diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java index 50ba905..dcbad2e 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java @@ -18,9 +18,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,7 +38,7 @@ import java.util.List; @Transactional public class MessageReceivedServiceImpl extends ServiceImpl implements MessageReceivedService { - @Autowired + @Resource private UserUtil userUtil; /** diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java index b1c9392..5f51c88 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.schedule.impl; -import cn.bunny.domain.quartz.vo.SchedulersOperationDto; import cn.bunny.domain.quartz.dto.SchedulersAddDto; import cn.bunny.domain.quartz.dto.SchedulersDto; import cn.bunny.domain.quartz.dto.SchedulersUpdateDto; import cn.bunny.domain.quartz.entity.Schedulers; +import cn.bunny.domain.quartz.vo.SchedulersOperationDto; import cn.bunny.domain.quartz.vo.SchedulersVo; import cn.bunny.domain.vo.result.PageResult; import cn.bunny.domain.vo.result.ResultCodeEnum; @@ -16,10 +16,10 @@ import cn.bunny.services.service.schedule.SchedulersService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.quartz.*; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; @@ -35,10 +35,10 @@ import java.util.*; @Service public class SchedulersServiceImpl extends ServiceImpl implements SchedulersService { - @Autowired + @Resource private Scheduler scheduler; - @Autowired + @Resource private AnnotationScanner annotationScanner; /** diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/system/UserService.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/UserService.java index 8717a99..9b43f5f 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/system/UserService.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/system/UserService.java @@ -2,7 +2,11 @@ package cn.bunny.services.service.system; import cn.bunny.domain.system.dto.user.*; import cn.bunny.domain.system.entity.AdminUser; -import cn.bunny.domain.system.vo.user.*; +import cn.bunny.domain.system.vo.user.AdminUserVo; +import cn.bunny.domain.system.vo.user.RefreshTokenVo; +import cn.bunny.domain.system.vo.user.SearchUserinfoVo; +import cn.bunny.domain.system.vo.user.UserVo; +import cn.bunny.domain.vo.LoginVo; import cn.bunny.domain.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java index 83b38eb..8d547f0 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java @@ -14,8 +14,8 @@ import cn.bunny.services.service.system.DeptService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -36,7 +36,7 @@ import java.util.stream.Collectors; @Transactional public class DeptServiceImpl extends ServiceImpl implements DeptService { - @Autowired + @Resource private UserDeptMapper userDeptMapper; /** diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java index 8889104..25a35e8 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java @@ -21,10 +21,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import jakarta.validation.Valid; import lombok.SneakyThrows; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -55,13 +55,13 @@ public class FilesServiceImpl extends ServiceImpl implements @Value("${spring.servlet.multipart.max-file-size}") private String maxFileSize; - @Autowired + @Resource private MinioProperties properties; - @Autowired + @Resource private MinioUtil minioUtil; - @Autowired + @Resource private FilesMapper filesMapper; /** diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java index 140e61c..c89370e 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.system.impl; -import cn.bunny.domain.system.entity.Power; import cn.bunny.domain.system.dto.power.PowerAddDto; import cn.bunny.domain.system.dto.power.PowerDto; import cn.bunny.domain.system.dto.power.PowerUpdateBatchByParentIdDto; import cn.bunny.domain.system.dto.power.PowerUpdateDto; +import cn.bunny.domain.system.entity.Power; import cn.bunny.domain.system.vo.PowerVo; import cn.bunny.domain.vo.result.PageResult; import cn.bunny.domain.vo.result.ResultCodeEnum; @@ -17,9 +17,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -39,7 +39,7 @@ import java.util.List; @Transactional public class PowerServiceImpl extends ServiceImpl implements PowerService { - @Autowired + @Resource private RolePowerMapper rolePowerMapper; /** diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java index d0ff20c..0892f53 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.system.impl; +import cn.bunny.domain.system.dto.AssignPowersToRoleDto; import cn.bunny.domain.system.entity.AdminUser; import cn.bunny.domain.system.entity.RolePower; import cn.bunny.domain.system.entity.UserRole; -import cn.bunny.domain.system.dto.AssignPowersToRoleDto; import cn.bunny.services.mapper.system.RolePowerMapper; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.mapper.system.UserRoleMapper; @@ -11,7 +11,7 @@ import cn.bunny.services.service.system.RolePowerService; import cn.bunny.services.utils.system.RoleUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; +import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,13 +29,13 @@ import java.util.List; @Transactional public class RolePowerServiceImpl extends ServiceImpl implements RolePowerService { - @Autowired + @Resource private UserMapper userMapper; - @Autowired + @Resource private RoleUtil roleUtil; - @Autowired + @Resource private UserRoleMapper userRoleMapper; /** diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java index e0860f6..ae547cb 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.system.impl; -import cn.bunny.domain.system.entity.Role; -import cn.bunny.domain.system.entity.UserRole; import cn.bunny.domain.system.dto.role.RoleAddDto; import cn.bunny.domain.system.dto.role.RoleDto; import cn.bunny.domain.system.dto.role.RoleUpdateDto; +import cn.bunny.domain.system.entity.Role; +import cn.bunny.domain.system.entity.UserRole; import cn.bunny.domain.system.vo.RoleVo; import cn.bunny.domain.vo.result.PageResult; import cn.bunny.domain.vo.result.ResultCodeEnum; @@ -19,9 +19,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -39,16 +39,16 @@ import java.util.List; @Service public class RoleServiceImpl extends ServiceImpl implements RoleService { - @Autowired + @Resource private UserRoleMapper userRoleMapper; - @Autowired + @Resource private RolePowerMapper rolePowerMapper; - @Autowired + @Resource private RouterRoleMapper routerRoleMapper; - @Autowired + @Resource private RoleUtil roleUtil; /** diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java index d58ed1a..e1818aa 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java @@ -1,11 +1,11 @@ package cn.bunny.services.service.system.impl; -import cn.bunny.domain.system.entity.Role; -import cn.bunny.domain.system.entity.Router; import cn.bunny.domain.system.dto.router.RouterAddDto; import cn.bunny.domain.system.dto.router.RouterManageDto; import cn.bunny.domain.system.dto.router.RouterUpdateByIdWithRankDto; import cn.bunny.domain.system.dto.router.RouterUpdateDto; +import cn.bunny.domain.system.entity.Role; +import cn.bunny.domain.system.entity.Router; import cn.bunny.domain.system.vo.router.RouterManageVo; import cn.bunny.domain.system.vo.router.RouterMeta; import cn.bunny.domain.system.vo.router.UserRouterVo; @@ -26,8 +26,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,16 +45,16 @@ import java.util.stream.Collectors; @Service @Transactional public class RouterServiceImpl extends ServiceImpl implements RouterService { - @Autowired + @Resource private RouterServiceUtil routerServiceUtil; - @Autowired + @Resource private RoleMapper roleMapper; - @Autowired + @Resource private RouterRoleMapper routerRoleMapper; - @Autowired + @Resource private RolePowerMapper rolePowerMapper; /** diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java index 14c2f26..dc879ea 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java @@ -4,7 +4,7 @@ import cn.bunny.domain.constant.RedisUserConstant; import cn.bunny.domain.system.dto.user.AssignRolesToUsersDto; import cn.bunny.domain.system.entity.AdminUser; import cn.bunny.domain.system.entity.UserRole; -import cn.bunny.domain.system.vo.user.LoginVo; +import cn.bunny.domain.vo.LoginVo; import cn.bunny.domain.vo.result.ResultCodeEnum; import cn.bunny.services.context.BaseContext; import cn.bunny.services.exception.AuthCustomerException; @@ -14,7 +14,7 @@ import cn.bunny.services.service.system.UserRoleService; import cn.bunny.services.utils.system.UserUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; +import jakarta.annotation.Resource; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,16 +34,16 @@ import java.util.concurrent.TimeUnit; @Transactional public class UserRoleServiceImpl extends ServiceImpl implements UserRoleService { - @Autowired + @Resource private UserRoleMapper userRoleMapper; - @Autowired + @Resource private UserUtil userUtil; - @Autowired + @Resource private UserMapper userMapper; - @Autowired + @Resource private RedisTemplate redisTemplate; /** diff --git a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java index bce76f0..788731d 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java +++ b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java @@ -12,8 +12,12 @@ import cn.bunny.domain.system.dto.user.*; import cn.bunny.domain.system.entity.AdminUser; import cn.bunny.domain.system.entity.Role; import cn.bunny.domain.system.entity.UserDept; -import cn.bunny.domain.system.vo.user.*; +import cn.bunny.domain.system.vo.user.AdminUserVo; +import cn.bunny.domain.system.vo.user.RefreshTokenVo; +import cn.bunny.domain.system.vo.user.SearchUserinfoVo; +import cn.bunny.domain.system.vo.user.UserVo; import cn.bunny.domain.views.ViewUserDept; +import cn.bunny.domain.vo.LoginVo; import cn.bunny.domain.vo.result.PageResult; import cn.bunny.domain.vo.result.ResultCodeEnum; import cn.bunny.services.context.BaseContext; @@ -71,24 +75,34 @@ public class UserServiceImpl extends ServiceImpl implemen @Resource private UserUtil userUtil; + @Resource private ConcreteSenderEmailTemplate concreteSenderEmailTemplate; + @Resource private RedisTemplate redisTemplate; + @Resource private FilesService filesService; + @Resource private UserDeptMapper userDeptMapper; + @Resource private UserRoleMapper userRoleMapper; + @Resource private UserLoginLogMapper userLoginLogMapper; + @Resource private EmailTemplateMapper emailTemplateMapper; + @Resource private RoleMapper roleMapper; + @Resource private UserMapper userMapper; + @Resource private PasswordEncoder passwordEncoder; diff --git a/auth-system/services/src/main/java/cn/bunny/services/utils/system/UserUtil.java b/auth-system/services/src/main/java/cn/bunny/services/utils/system/UserUtil.java index 14d9412..064e3b5 100644 --- a/auth-system/services/src/main/java/cn/bunny/services/utils/system/UserUtil.java +++ b/auth-system/services/src/main/java/cn/bunny/services/utils/system/UserUtil.java @@ -7,7 +7,7 @@ import cn.bunny.domain.log.entity.UserLoginLog; import cn.bunny.domain.system.entity.AdminUser; import cn.bunny.domain.system.entity.Power; import cn.bunny.domain.system.entity.Role; -import cn.bunny.domain.system.vo.user.LoginVo; +import cn.bunny.domain.vo.LoginVo; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.log.UserLoginLogMapper; import cn.bunny.services.mapper.system.PowerMapper; diff --git a/common/common-config/pom.xml b/common/common-config/pom.xml index 150f681..2f98534 100644 --- a/common/common-config/pom.xml +++ b/common/common-config/pom.xml @@ -20,7 +20,7 @@ cn.bunny - domain + domain-common 0.0.1-SNAPSHOT diff --git a/common/common-config/src/main/java/cn/bunny/services/context/BaseContext.java b/common/common-config/src/main/java/cn/bunny/services/context/BaseContext.java index 39e8cf4..e17d781 100644 --- a/common/common-config/src/main/java/cn/bunny/services/context/BaseContext.java +++ b/common/common-config/src/main/java/cn/bunny/services/context/BaseContext.java @@ -1,7 +1,7 @@ package cn.bunny.services.context; -import cn.bunny.domain.system.vo.user.LoginVo; +import cn.bunny.domain.vo.LoginVo; public class BaseContext { private static final ThreadLocal userId = new ThreadLocal<>(); diff --git a/common/common-domain/pom.xml b/common/domain-common/pom.xml similarity index 97% rename from common/common-domain/pom.xml rename to common/domain-common/pom.xml index be0557e..a01b92b 100644 --- a/common/common-domain/pom.xml +++ b/common/domain-common/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT - common-domain + domain-common jar common-domain diff --git a/common/common-domain/src/main/java/cn/bunny/domain/constant/LocalDateTimeConstant.java b/common/domain-common/src/main/java/cn/bunny/domain/constant/LocalDateTimeConstant.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/constant/LocalDateTimeConstant.java rename to common/domain-common/src/main/java/cn/bunny/domain/constant/LocalDateTimeConstant.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/constant/MinioConstant.java b/common/domain-common/src/main/java/cn/bunny/domain/constant/MinioConstant.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/constant/MinioConstant.java rename to common/domain-common/src/main/java/cn/bunny/domain/constant/MinioConstant.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/constant/RedisUserConstant.java b/common/domain-common/src/main/java/cn/bunny/domain/constant/RedisUserConstant.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/constant/RedisUserConstant.java rename to common/domain-common/src/main/java/cn/bunny/domain/constant/RedisUserConstant.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/constant/SecurityConfigConstant.java b/common/domain-common/src/main/java/cn/bunny/domain/constant/SecurityConfigConstant.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/constant/SecurityConfigConstant.java rename to common/domain-common/src/main/java/cn/bunny/domain/constant/SecurityConfigConstant.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/constant/UserConstant.java b/common/domain-common/src/main/java/cn/bunny/domain/constant/UserConstant.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/constant/UserConstant.java rename to common/domain-common/src/main/java/cn/bunny/domain/constant/UserConstant.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/entity/BaseEntity.java b/common/domain-common/src/main/java/cn/bunny/domain/entity/BaseEntity.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/entity/BaseEntity.java rename to common/domain-common/src/main/java/cn/bunny/domain/entity/BaseEntity.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/entity/BaseUserEntity.java b/common/domain-common/src/main/java/cn/bunny/domain/entity/BaseUserEntity.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/entity/BaseUserEntity.java rename to common/domain-common/src/main/java/cn/bunny/domain/entity/BaseUserEntity.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/enums/EmailTemplateEnums.java b/common/domain-common/src/main/java/cn/bunny/domain/enums/EmailTemplateEnums.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/enums/EmailTemplateEnums.java rename to common/domain-common/src/main/java/cn/bunny/domain/enums/EmailTemplateEnums.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/enums/JobEnums.java b/common/domain-common/src/main/java/cn/bunny/domain/enums/JobEnums.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/enums/JobEnums.java rename to common/domain-common/src/main/java/cn/bunny/domain/enums/JobEnums.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/enums/LoginEnums.java b/common/domain-common/src/main/java/cn/bunny/domain/enums/LoginEnums.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/enums/LoginEnums.java rename to common/domain-common/src/main/java/cn/bunny/domain/enums/LoginEnums.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/model/email/EmailSend.java b/common/domain-common/src/main/java/cn/bunny/domain/model/email/EmailSend.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/model/email/EmailSend.java rename to common/domain-common/src/main/java/cn/bunny/domain/model/email/EmailSend.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/model/email/EmailSendInit.java b/common/domain-common/src/main/java/cn/bunny/domain/model/email/EmailSendInit.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/model/email/EmailSendInit.java rename to common/domain-common/src/main/java/cn/bunny/domain/model/email/EmailSendInit.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/model/file/MinioFilePath.java b/common/domain-common/src/main/java/cn/bunny/domain/model/file/MinioFilePath.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/model/file/MinioFilePath.java rename to common/domain-common/src/main/java/cn/bunny/domain/model/file/MinioFilePath.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/model/quartz/ScheduleExecuteLogJson.java b/common/domain-common/src/main/java/cn/bunny/domain/model/quartz/ScheduleExecuteLogJson.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/model/quartz/ScheduleExecuteLogJson.java rename to common/domain-common/src/main/java/cn/bunny/domain/model/quartz/ScheduleExecuteLogJson.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/views/ViewRolePower.java b/common/domain-common/src/main/java/cn/bunny/domain/views/ViewRolePower.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/views/ViewRolePower.java rename to common/domain-common/src/main/java/cn/bunny/domain/views/ViewRolePower.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/views/ViewRouterRole.java b/common/domain-common/src/main/java/cn/bunny/domain/views/ViewRouterRole.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/views/ViewRouterRole.java rename to common/domain-common/src/main/java/cn/bunny/domain/views/ViewRouterRole.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/views/ViewUserDept.java b/common/domain-common/src/main/java/cn/bunny/domain/views/ViewUserDept.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/views/ViewUserDept.java rename to common/domain-common/src/main/java/cn/bunny/domain/views/ViewUserDept.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/vo/BaseUserVo.java b/common/domain-common/src/main/java/cn/bunny/domain/vo/BaseUserVo.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/vo/BaseUserVo.java rename to common/domain-common/src/main/java/cn/bunny/domain/vo/BaseUserVo.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/vo/BaseVo.java b/common/domain-common/src/main/java/cn/bunny/domain/vo/BaseVo.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/vo/BaseVo.java rename to common/domain-common/src/main/java/cn/bunny/domain/vo/BaseVo.java diff --git a/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/LoginVo.java b/common/domain-common/src/main/java/cn/bunny/domain/vo/LoginVo.java similarity index 96% rename from auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/LoginVo.java rename to common/domain-common/src/main/java/cn/bunny/domain/vo/LoginVo.java index 3dbd85f..bfae6f1 100644 --- a/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/LoginVo.java +++ b/common/domain-common/src/main/java/cn/bunny/domain/vo/LoginVo.java @@ -1,6 +1,5 @@ -package cn.bunny.domain.system.vo.user; +package cn.bunny.domain.vo; -import cn.bunny.domain.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/common/common-domain/src/main/java/cn/bunny/domain/vo/result/PageResult.java b/common/domain-common/src/main/java/cn/bunny/domain/vo/result/PageResult.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/vo/result/PageResult.java rename to common/domain-common/src/main/java/cn/bunny/domain/vo/result/PageResult.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/vo/result/Result.java b/common/domain-common/src/main/java/cn/bunny/domain/vo/result/Result.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/vo/result/Result.java rename to common/domain-common/src/main/java/cn/bunny/domain/vo/result/Result.java diff --git a/common/common-domain/src/main/java/cn/bunny/domain/vo/result/ResultCodeEnum.java b/common/domain-common/src/main/java/cn/bunny/domain/vo/result/ResultCodeEnum.java similarity index 100% rename from common/common-domain/src/main/java/cn/bunny/domain/vo/result/ResultCodeEnum.java rename to common/domain-common/src/main/java/cn/bunny/domain/vo/result/ResultCodeEnum.java diff --git a/common/generator-code/pom.xml b/common/generator-code/pom.xml index b787906..29fbc2e 100644 --- a/common/generator-code/pom.xml +++ b/common/generator-code/pom.xml @@ -2,10 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - generator-code-server - 3.4.3 - ../pom.xml + cn.bunny + common + 0.0.1-SNAPSHOT generator-code diff --git a/common/pom.xml b/common/pom.xml index 85ff8c6..b1c81f1 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -14,7 +14,7 @@ https://maven.apache.org - common-domain + domain-common common-config generator-code