From 4c98bc44c920ad8cd9020b5fbd4c49cd37c8aeaf Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Mon, 21 Apr 2025 14:23:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B4=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReadMe.md | 733 +----------------- .../cn/bunny/services/quartz/JobHello.java | 1 + .../security/config/MethodSecurityConfig.java | 2 +- .../security/config/WebSecurityConfig.java | 19 +- ...CustomAuthorizationManagerServiceImpl.java | 16 +- .../filter/TokenLoginFilterService.java | 77 -- auth-services/domain/domain-common/pom.xml | 20 - .../controllers/pom.xml | 2 +- .../services/controller/IndexController.java | 0 .../ConfigurationController.java | 0 .../EmailTemplateController.java | 0 .../configuration/EmailUsersController.java | 0 .../configuration/I18nController.java | 0 .../configuration/I18nTypeController.java | 0 .../configuration/MenuIconController.java | 0 .../log/ScheduleExecuteLogController.java | 0 .../log/UserLoginLogController.java | 0 .../controller/message/MessageController.java | 0 .../message/MessageReceivedController.java | 0 .../message/MessageTypeController.java | 0 .../schedule/SchedulersController.java | 0 .../schedule/SchedulersGroupController.java | 0 .../controller/system/DeptController.java | 0 .../controller/system/FilesController.java | 0 .../controller/system/PowerController.java | 0 .../controller/system/RoleController.java | 0 .../system/RolePowerController.java | 0 .../controller/system/RouterController.java | 0 .../system/RouterRoleController.java | 0 .../controller/system/UserController.java | 7 + .../controller/system/UserRoleController.java | 0 .../domain}/pom.xml | 9 +- .../dto/WebConfigurationDto.java | 0 .../entity/WebConfiguration.java | 0 .../configuration/vo/WebConfigurationVo.java | 0 .../domain/email/dto/EmailTemplateAddDto.java | 0 .../domain/email/dto/EmailTemplateDto.java | 0 .../email/dto/EmailTemplateUpdateDto.java | 0 .../email/dto/EmailUserUpdateStatusDto.java | 0 .../domain/email/dto/EmailUsersAddDto.java | 0 .../bunny/domain/email/dto/EmailUsersDto.java | 0 .../domain/email/dto/EmailUsersUpdateDto.java | 0 .../domain/email/entity/EmailTemplate.java | 0 .../bunny/domain/email/entity/EmailUsers.java | 0 .../domain/email/vo/EmailTemplateVo.java | 0 .../bunny/domain/email/vo/EmailUsersVo.java | 0 .../bunny/domain/files/dto/FileUploadDto.java | 0 .../bunny/domain/files/dto/FilesAddDto.java | 0 .../cn/bunny/domain/files/dto/FilesDto.java | 0 .../domain/files/dto/FilesUpdateDto.java | 0 .../cn/bunny/domain/files/entity/Files.java | 0 .../cn/bunny/domain/files/vo/FileInfoVo.java | 0 .../cn/bunny/domain/files/vo/FilesVo.java | 0 .../cn/bunny/domain/i18n/dto/I18nAddDto.java | 0 .../cn/bunny/domain/i18n/dto/I18nDto.java | 0 .../bunny/domain/i18n/dto/I18nTypeAddDto.java | 0 .../cn/bunny/domain/i18n/dto/I18nTypeDto.java | 0 .../domain/i18n/dto/I18nTypeUpdateDto.java | 0 .../domain/i18n/dto/I18nUpdateByFileDto.java | 0 .../bunny/domain/i18n/dto/I18nUpdateDto.java | 0 .../cn/bunny/domain/i18n/entity/I18n.java | 0 .../cn/bunny/domain/i18n/entity/I18nType.java | 0 .../cn/bunny/domain/i18n/vo/I18nTypeVo.java | 0 .../java/cn/bunny/domain/i18n/vo/I18nVo.java | 0 .../domain/log/dto/ScheduleExecuteLogDto.java | 0 .../bunny/domain/log/dto/UserLoginLogDto.java | 0 .../domain/log/dto/UserLoginLogUpdateDto.java | 0 .../domain/log/entity/ScheduleExecuteLog.java | 0 .../cn/bunny/domain/log/entity/SystemLog.java | 0 .../bunny/domain/log/entity/UserLoginLog.java | 0 .../domain/log/vo/QuartzExecuteLogVo.java | 0 .../domain/log/vo/UserLoginLogLocalVo.java | 0 .../bunny/domain/log/vo/UserLoginLogVo.java | 0 .../domain/menuIcon/dto/MenuIconAddDto.java | 0 .../domain/menuIcon/dto/MenuIconDto.java | 0 .../menuIcon/dto/MenuIconUpdateDto.java | 0 .../domain/menuIcon/entity/MenuIcon.java | 0 .../bunny/domain/menuIcon/vo/MenuIconVo.java | 0 .../domain/message/dto/MessageAddDto.java | 0 .../bunny/domain/message/dto/MessageDto.java | 0 .../message/dto/MessageReceivedDto.java | 0 .../message/dto/MessageReceivedUpdateDto.java | 0 .../domain/message/dto/MessageTypeAddDto.java | 0 .../domain/message/dto/MessageTypeDto.java | 0 .../message/dto/MessageTypeUpdateDto.java | 0 .../domain/message/dto/MessageUpdateDto.java | 0 .../domain/message/dto/MessageUserDto.java | 0 .../bunny/domain/message/entity/Message.java | 0 .../message/entity/MessageReceived.java | 0 .../domain/message/entity/MessageType.java | 0 .../domain/message/vo/MessageDetailVo.java | 0 .../vo/MessageReceivedWithMessageVo.java | 0 .../message/vo/MessageReceivedWithUserVo.java | 0 .../domain/message/vo/MessageTypeVo.java | 0 .../domain/message/vo/MessageUserVo.java | 0 .../cn/bunny/domain/message/vo/MessageVo.java | 0 .../domain/quartz/dto/SchedulersAddDto.java | 0 .../domain/quartz/dto/SchedulersDto.java | 0 .../quartz/dto/SchedulersGroupAddDto.java | 0 .../domain/quartz/dto/SchedulersGroupDto.java | 0 .../quartz/dto/SchedulersGroupUpdateDto.java | 0 .../quartz/dto/SchedulersUpdateDto.java | 0 .../domain/quartz/entity/Schedulers.java | 0 .../domain/quartz/entity/SchedulersGroup.java | 0 .../domain/quartz/vo/SchedulersGroupVo.java | 0 .../quartz/vo/SchedulersOperationDto.java | 0 .../bunny/domain/quartz/vo/SchedulersVo.java | 0 .../system/dto/AssignPowersToRoleDto.java | 0 .../domain/system/dto/dept/DeptAddDto.java | 0 .../bunny/domain/system/dto/dept/DeptDto.java | 0 .../domain/system/dto/dept/DeptUpdateDto.java | 0 .../domain/system/dto/power/PowerAddDto.java | 0 .../domain/system/dto/power/PowerDto.java | 0 .../power/PowerUpdateBatchByParentIdDto.java | 0 .../system/dto/power/PowerUpdateDto.java | 0 .../domain/system/dto/role/RoleAddDto.java | 0 .../bunny/domain/system/dto/role/RoleDto.java | 0 .../domain/system/dto/role/RoleUpdateDto.java | 0 .../dto/router/AssignRolesToRoutersDto.java | 0 .../system/dto/router/RouterAddDto.java | 0 .../system/dto/router/RouterManageDto.java | 0 .../router/RouterUpdateByIdWithRankDto.java | 0 .../system/dto/router/RouterUpdateDto.java | 0 .../system/dto/user/AdminUserAddDto.java | 0 .../domain/system/dto/user/AdminUserDto.java | 0 .../user/AdminUserUpdateByLocalUserDto.java | 0 .../system/dto/user/AdminUserUpdateDto.java | 0 .../user/AdminUserUpdateUserStatusDto.java | 0 .../user/AdminUserUpdateWithPasswordDto.java | 0 .../dto/user/AssignRolesToUsersDto.java | 0 .../domain/system/dto/user/LoginDto.java | 5 +- .../system/dto/user/RefreshTokenDto.java | 0 .../dto/user/UserUpdateWithAvatarDto.java | 0 .../bunny/domain/system/entity/AdminUser.java | 0 .../cn/bunny/domain/system/entity/Dept.java | 0 .../cn/bunny/domain/system/entity/Power.java | 0 .../cn/bunny/domain/system/entity/Role.java | 0 .../bunny/domain/system/entity/RolePower.java | 0 .../cn/bunny/domain/system/entity/Router.java | 0 .../domain/system/entity/RouterRole.java | 0 .../bunny/domain/system/entity/UserDept.java | 0 .../bunny/domain/system/entity/UserRole.java | 0 .../cn/bunny/domain/system/vo/DeptVo.java | 0 .../cn/bunny/domain/system/vo/PowerVo.java | 0 .../cn/bunny/domain/system/vo/RoleVo.java | 0 .../system/vo/router/RouterManageVo.java | 0 .../domain/system/vo/router/RouterMeta.java | 0 .../domain/system/vo/router/UserRouterVo.java | 0 .../domain/system/vo/user/AdminUserVo.java | 0 .../bunny/domain/system/vo/user/LoginVo.java | 0 .../domain/system/vo/user/RefreshTokenVo.java | 0 .../system/vo/user/SearchUserinfoVo.java | 0 .../bunny/domain/system/vo/user/UserVo.java | 0 .../domain/system/vo/user/ValidateCodeVo.java | 0 .../mappers/pom.xml | 4 +- .../configuration/EmailTemplateMapper.java | 0 .../configuration/EmailUsersMapper.java | 0 .../mapper/configuration/I18nMapper.java | 0 .../mapper/configuration/I18nTypeMapper.java | 0 .../mapper/configuration/MenuIconMapper.java | 0 .../mapper/log/ScheduleExecuteLogMapper.java | 0 .../mapper/log/UserLoginLogMapper.java | 0 .../mapper/message/MessageMapper.java | 0 .../mapper/message/MessageReceivedMapper.java | 0 .../mapper/message/MessageTypeMapper.java | 0 .../schedule/SchedulersGroupMapper.java | 0 .../mapper/schedule/SchedulersMapper.java | 0 .../services/mapper/system/DeptMapper.java | 0 .../services/mapper/system/FilesMapper.java | 0 .../services/mapper/system/PowerMapper.java | 0 .../services/mapper/system/RoleMapper.java | 0 .../mapper/system/RolePowerMapper.java | 0 .../services/mapper/system/RouterMapper.java | 0 .../mapper/system/RouterRoleMapper.java | 0 .../mapper/system/UserDeptMapper.java | 0 .../services/mapper/system/UserMapper.java | 0 .../mapper/system/UserRoleMapper.java | 0 .../configuration/EmailTemplateMapper.xml | 0 .../mapper/configuration/EmailUsersMapper.xml | 0 .../mapper/configuration/I18nMapper.xml | 0 .../mapper/configuration/I18nTypeMapper.xml | 0 .../mapper/configuration/MenuIconMapper.xml | 0 .../mapper/log/ScheduleExecuteLogMapper.xml | 0 .../mapper/log/UserLoginLogMapper.xml | 0 .../mapper/message/MessageMapper.xml | 0 .../mapper/message/MessageReceivedMapper.xml | 0 .../mapper/message/MessageTypeMapper.xml | 0 .../mapper/schedule/SchedulersGroupMapper.xml | 0 .../mapper/schedule/SchedulersMapper.xml | 0 .../resources/mapper/system/DeptMapper.xml | 0 .../resources/mapper/system/FilesMapper.xml | 0 .../resources/mapper/system/PowerMapper.xml | 0 .../resources/mapper/system/RoleMapper.xml | 0 .../mapper/system/RolePowerMapper.xml | 0 .../resources/mapper/system/RouterMapper.xml | 0 .../mapper/system/RouterRoleMapper.xml | 0 .../mapper/system/UserDeptMapper.xml | 0 .../resources/mapper/system/UserMapper.xml | 0 .../mapper/system/UserRoleMapper.xml | 0 {auth-services => auth-system}/pom.xml | 4 +- .../services/pom.xml | 3 +- .../bunny/services/aop/AnnotationScanner.java | 0 .../bunny/services/aop/JobExecuteAspect.java | 0 .../aop/annotation/QuartzSchedulers.java | 0 .../configuration/ConfigurationService.java | 0 .../configuration/EmailTemplateService.java | 0 .../configuration/EmailUsersService.java | 0 .../service/configuration/I18nService.java | 0 .../configuration/I18nTypeService.java | 0 .../configuration/MenuIconService.java | 0 .../impl/ConfigurationServiceImpl.java | 0 .../impl/EmailTemplateServiceImpl.java | 0 .../impl/EmailUsersServiceImpl.java | 0 .../configuration/impl/I18nServiceImpl.java | 0 .../impl/I18nTypeServiceImpl.java | 0 .../impl/MenuIconServiceImpl.java | 0 .../log/ScheduleExecuteLogService.java | 0 .../service/log/UserLoginLogService.java | 0 .../impl/ScheduleExecuteLogServiceImpl.java | 0 .../log/impl/UserLoginLogServiceImpl.java | 0 .../message/MessageReceivedService.java | 0 .../service/message/MessageService.java | 0 .../service/message/MessageTypeService.java | 0 .../impl/MessageReceivedServiceImpl.java | 0 .../message/impl/MessageServiceImpl.java | 0 .../message/impl/MessageTypeServiceImpl.java | 0 .../schedule/SchedulersGroupService.java | 0 .../service/schedule/SchedulersService.java | 0 .../impl/SchedulersGroupServiceImpl.java | 0 .../schedule/impl/SchedulersServiceImpl.java | 0 .../services/service/system/DeptService.java | 0 .../services/service/system/FilesService.java | 0 .../services/service/system/PowerService.java | 0 .../service/system/RolePowerService.java | 0 .../services/service/system/RoleService.java | 0 .../service/system/RouterRoleService.java | 0 .../service/system/RouterService.java | 0 .../service/system/UserDeptService.java | 0 .../service/system/UserRoleService.java | 0 .../services/service/system/UserService.java | 3 +- .../service/system/impl/DeptServiceImpl.java | 0 .../service/system/impl/FilesServiceImpl.java | 0 .../service/system/impl/PowerServiceImpl.java | 0 .../system/impl/RolePowerServiceImpl.java | 0 .../service/system/impl/RoleServiceImpl.java | 0 .../system/impl/RouterRoleServiceImpl.java | 0 .../system/impl/RouterServiceImpl.java | 0 .../system/impl/UserDeptServiceImpl.java | 0 .../system/impl/UserRoleServiceImpl.java | 0 .../service/system/impl/UserServiceImpl.java | 29 +- .../email/AbstractSenderEmailTemplate.java | 0 .../email/ConcreteSenderEmailTemplate.java | 0 .../ConcreteSenderEmailTemplateTest.java | 0 .../utils/login/DefaultLoginStrategy.java | 0 .../utils/login/EmailLoginStrategy.java | 0 .../services/utils/login/LoginContext.java | 0 .../services/utils/login/LoginStrategy.java | 0 .../bunny/services/utils/system/FileUtil.java | 0 .../bunny/services/utils/system/I18nUtil.java | 0 .../bunny/services/utils/system/RoleUtil.java | 0 .../utils/system/RouterServiceUtil.java | 0 .../bunny/services/utils/system/UserUtil.java | 0 common/common-config/pom.xml | 4 +- .../domain => common/common-domain}/pom.xml | 31 +- .../constant/LocalDateTimeConstant.java | 0 .../bunny/domain/constant/MinioConstant.java | 0 .../domain/constant/RedisUserConstant.java | 0 .../constant/SecurityConfigConstant.java | 0 .../bunny/domain/constant/UserConstant.java | 0 .../cn/bunny/domain/entity/BaseEntity.java | 0 .../bunny/domain/entity/BaseUserEntity.java | 0 .../domain/enums/EmailTemplateEnums.java | 0 .../java/cn/bunny/domain/enums/JobEnums.java | 0 .../cn/bunny/domain/enums/LoginEnums.java | 2 - .../bunny/domain/model/email/EmailSend.java | 0 .../domain/model/email/EmailSendInit.java | 0 .../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 .../cn/bunny/domain/views/ViewUserDept.java | 0 .../java/cn/bunny/domain/vo/BaseUserVo.java | 0 .../main/java/cn/bunny/domain/vo/BaseVo.java | 0 .../cn/bunny/domain/vo/result/PageResult.java | 0 .../cn/bunny/domain/vo/result/Result.java | 0 .../domain/vo/result/ResultCodeEnum.java | 0 common/generator-code/pom.xml | 7 +- common/pom.xml | 3 +- pom.xml | 2 +- 289 files changed, 71 insertions(+), 912 deletions(-) delete mode 100644 auth-admin/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java delete mode 100644 auth-services/domain/domain-common/pom.xml rename {auth-services => auth-system}/controllers/pom.xml (94%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/IndexController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/configuration/I18nController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/message/MessageController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/system/DeptController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/system/FilesController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/system/PowerController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/system/RoleController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/system/RolePowerController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/system/RouterController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java (100%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/system/UserController.java (95%) rename {auth-services => auth-system}/controllers/src/main/java/cn/bunny/services/controller/system/UserRoleController.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/pom.xml (81%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/configuration/dto/WebConfigurationDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/configuration/entity/WebConfiguration.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/configuration/vo/WebConfigurationVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/email/dto/EmailTemplateAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/email/dto/EmailTemplateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/email/dto/EmailTemplateUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/email/dto/EmailUserUpdateStatusDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/email/dto/EmailUsersAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/email/dto/EmailUsersDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/email/dto/EmailUsersUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/email/entity/EmailTemplate.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/email/entity/EmailUsers.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/email/vo/EmailTemplateVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/email/vo/EmailUsersVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/files/dto/FileUploadDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/files/dto/FilesAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/files/dto/FilesDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/files/dto/FilesUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/files/entity/Files.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/files/vo/FileInfoVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/files/vo/FilesVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/i18n/dto/I18nAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/i18n/dto/I18nDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/i18n/dto/I18nUpdateByFileDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/i18n/dto/I18nUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/i18n/entity/I18n.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/i18n/entity/I18nType.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/i18n/vo/I18nTypeVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/i18n/vo/I18nVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/log/dto/ScheduleExecuteLogDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/log/dto/UserLoginLogDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/log/dto/UserLoginLogUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/log/entity/ScheduleExecuteLog.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/log/entity/SystemLog.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/log/entity/UserLoginLog.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/log/vo/QuartzExecuteLogVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/log/vo/UserLoginLogLocalVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/log/vo/UserLoginLogVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/menuIcon/entity/MenuIcon.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/menuIcon/vo/MenuIconVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/dto/MessageAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/dto/MessageDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/dto/MessageReceivedDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/dto/MessageReceivedUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/dto/MessageTypeAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/dto/MessageTypeDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/dto/MessageTypeUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/dto/MessageUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/dto/MessageUserDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/entity/Message.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/entity/MessageReceived.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/entity/MessageType.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/vo/MessageDetailVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithMessageVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithUserVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/vo/MessageTypeVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/vo/MessageUserVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/message/vo/MessageVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/quartz/dto/SchedulersAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/quartz/dto/SchedulersDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/quartz/dto/SchedulersUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/quartz/entity/Schedulers.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/quartz/entity/SchedulersGroup.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/quartz/vo/SchedulersGroupVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/quartz/vo/SchedulersOperationDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/quartz/vo/SchedulersVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/AssignPowersToRoleDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/dept/DeptAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/dept/DeptDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/dept/DeptUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/power/PowerAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/power/PowerDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/power/PowerUpdateBatchByParentIdDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/power/PowerUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/role/RoleAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/role/RoleDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/role/RoleUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/router/AssignRolesToRoutersDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/router/RouterAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/router/RouterManageDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/router/RouterUpdateByIdWithRankDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/router/RouterUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/user/AdminUserAddDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/user/AdminUserDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateUserStatusDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateWithPasswordDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/user/AssignRolesToUsersDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java (82%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/user/RefreshTokenDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/dto/user/UserUpdateWithAvatarDto.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/entity/AdminUser.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/entity/Dept.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/entity/Power.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/entity/Role.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/entity/RolePower.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/entity/Router.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/entity/RouterRole.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/entity/UserDept.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/entity/UserRole.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/vo/DeptVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/vo/PowerVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/vo/RoleVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/vo/router/RouterManageVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/vo/router/RouterMeta.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/vo/router/UserRouterVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/vo/user/AdminUserVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/vo/user/LoginVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/vo/user/RefreshTokenVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/vo/user/SearchUserinfoVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/vo/user/UserVo.java (100%) rename {auth-services/domain/domain-system => auth-system/domain}/src/main/java/cn/bunny/domain/system/vo/user/ValidateCodeVo.java (100%) rename {auth-services => auth-system}/mappers/pom.xml (88%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/system/FilesMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/system/PowerMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/system/RolePowerMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/system/UserMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/configuration/EmailTemplateMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/configuration/EmailUsersMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/configuration/I18nMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/configuration/I18nTypeMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/configuration/MenuIconMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/log/UserLoginLogMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/message/MessageMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/message/MessageReceivedMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/message/MessageTypeMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/schedule/SchedulersMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/system/DeptMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/system/FilesMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/system/PowerMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/system/RoleMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/system/RolePowerMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/system/RouterMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/system/RouterRoleMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/system/UserDeptMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/system/UserMapper.xml (100%) rename {auth-services => auth-system}/mappers/src/main/resources/mapper/system/UserRoleMapper.xml (100%) rename {auth-services => auth-system}/pom.xml (91%) rename {auth-services => auth-system}/services/pom.xml (98%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/aop/AnnotationScanner.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/configuration/I18nService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/message/MessageService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/message/MessageTypeService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/DeptService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/FilesService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/PowerService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/RolePowerService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/RoleService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/RouterRoleService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/RouterService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/UserDeptService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/UserRoleService.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/UserService.java (96%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java (98%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/utils/login/LoginContext.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/utils/system/FileUtil.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/utils/system/I18nUtil.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/utils/system/RoleUtil.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/utils/system/RouterServiceUtil.java (100%) rename {auth-services => auth-system}/services/src/main/java/cn/bunny/services/utils/system/UserUtil.java (100%) rename {auth-services/domain => common/common-domain}/pom.xml (88%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/constant/LocalDateTimeConstant.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/constant/MinioConstant.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/constant/RedisUserConstant.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/constant/SecurityConfigConstant.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/constant/UserConstant.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/entity/BaseEntity.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/entity/BaseUserEntity.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/enums/EmailTemplateEnums.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/enums/JobEnums.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/enums/LoginEnums.java (83%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/model/email/EmailSend.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/model/email/EmailSendInit.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/model/file/MinioFilePath.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/model/quartz/ScheduleExecuteLogJson.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/views/ViewRolePower.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/views/ViewRouterRole.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/views/ViewUserDept.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/vo/BaseUserVo.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/vo/BaseVo.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/vo/result/PageResult.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/vo/result/Result.java (100%) rename {auth-services/domain/domain-common => common/common-domain}/src/main/java/cn/bunny/domain/vo/result/ResultCodeEnum.java (100%) diff --git a/ReadMe.md b/ReadMe.md index 0e1828e..b0accb7 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -32,7 +32,7 @@ - 代码生成器前端：https://gitee.com/BunnyBoss/generator-code-web - 代码生成器后端：https://gitee.com/BunnyBoss/generator-code-server -![DAOCHU](./images/DAOCHU.png) +![DAOCHU](D:\Project\Project\FullStack\Auth\auth-server\images\DAOCHU.png) # 项目预览 @@ -50,747 +50,20 @@ > > ![image-20250108225915189](http://129.211.31.58:9000/docs/image-20250108225915189.png) -## 环境搭建 +# 项目概览 -### 安装docker内容 - -#### centos或rocky - -```shell -# 更新yum 和 dnf -yum update -y -dnf update -y - -# 安装必要依赖 -yum install -y yum-utils device-mapper-persistent-data lvm2 - -# 设置镜像源 -sudo yum-config-manager --add-repo http://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo -yum list docker-ce --showduplicates | sort -r - -# 安装docker -yum -y install docker-ce.x86_64 - -# 开机启动docker -systemctl enable docker -systemctl start docker -``` - -#### Ubuntu环境搭建 - -```bash -sudo apt-get remove docker docker-engine docker.io containerd runc -sudo apt update -sudo apt upgrade -sudo apt-get install ca-certificates curl gnupg lsb-release -# 添加Docker官方GPG密钥 -sudo curl -fsSL http://mirrors.aliyun.com/docker-ce/linux/ubuntu/gpg | sudo apt-key add - -sudo add-apt-repository "deb [arch=amd64] http://mirrors.aliyun.com/docker-ce/linux/ubuntu $(lsb_release -cs) stable" -# 安装docker -sudo apt-get install docker-ce docker-ce-cli containerd.io -# 默认情况下，只有root用户和docker组的用户才能运行Docker命令。我们可以将当前用户添加到docker组，以避免每次使用Docker时都需要使用sudo，设置完成后退出当前用户之后再进入既可 -sudo usermod -aG docker $USER -# 运行docker -sudo systemctl start docker -# 安装工具 -sudo apt-get -y install apt-transport-https ca-certificates curl software-properties-common -# 重启docker -sudo service docker restart -``` - -避免每次操作docker需要输入sudo - -```bash -# 创建分组一般 -sudo groupadd docker -# 将当前用户添加到分组 -sudo usermod -aG docker $USER -# 重启终端生效 -exit -``` - -> [!warning] -> -> 安装docker会可能会遇到镜像无法拉去问题试下面的几个镜像地址，根据你自己的需要进行配置不是所有人都需要；同时也不能保证地址真的有效！！！ -> -> 复制下面的内容到`daemon.json` -> -> ```json -> # 创建目录 -> sudo mkdir -p /etc/docker -> -> # 写入配置文件 -> sudo tee /etc/docker/daemon.json <<-'EOF' -> { -> "registry-mirrors": [ -> "https://docker-0.unsee.tech", -> "https://docker-cf.registry.cyou", -> "https://docker.1panel.live" -> ] -> } -> EOF -> -> # 重启docker服务 -> sudo systemctl daemon-reload && sudo systemctl restart docker -> ``` -> -> 重启docker -> -> ```bash -> sudo systemctl restart docker.socket -> ``` - -## Docker-Compose 搭建环境 - -### 安装Docker-Compose - -使用docker-compose有的时候会因为版本不同，但是配置文件主要内容就是这些。需要注意版本问题 - -#### Centos、Rocky - -```bash -sudo yum install docker-ce docker-ce-cli containerd.io - -sudo yum install curl -curl -L https://get.daocloud.io/docker/compose/releases/download/1.25.4/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose - -sudo chmod +x /usr/local/bin/docker-compose - -sudo docker-compose --version -``` - -#### Ubuntu - -```bash -sudo apt install docker-compose -``` - -### docker-compose文件位置 - -![image-20250222184020443](http://129.211.31.58:9000/docs/image-20250222184020443.png) - -### 相关命令 - -#### 只拉取镜像 - -docker-compose pull 命令会拉取 docker-compose.yml 文件中定义的所有服务的镜像，但不会创建或启动容器。 - -```bash -docker-compose pull -``` - -#### 拉取镜像而不做其他操作 - -只拉取镜像而不做其他操作，可以结合 docker-compose 的其他命令来实现： - -```bash -docker-compose up --no-start -``` - -#### 拉取镜像并创建容器 - -```bash -docker-compose up -d -``` - -#### 数据库文件 - -在后端文件的根目录中 - -![image-20241107133345299](http://129.211.31.58:9000/docs/image-20241107133345299.png) - -## 后端日志文件 - -在后端日志文件中，使用了`logback.xml`进行格式化。然而，使用`logback.xml`后，配置文件中指定的日志输出文件位置可能会失效。如果项目是通过Docker部署的，想在宿主机查看日志文件需要进行文件映射。 - -### 使用SpringBoot - -在配置文件中，指定名称和目录路径即可，之后使用docker映射就可以在宿主机看到日志了 - -如果想要用自带需要删除`logback.xml`文件 - -``` -logging: - level: - cn.bunny.service.mapper: warn - cn.bunny.service.controller: warn - cn.bunny.service.service: warn - root: warn - pattern: - dateformat: HH:mm:ss:SSS - file: - path: "logs/${spring.application.name}" - name: "logs/${spring.application.name}" -``` - -### 使用logback.xml - -指定目录的位置`D:/logs/${datetime}/auth-server.log`根据你需要的指定 - -```xml - - - - - - - %cyan([%thread]) %yellow(%-5level) %green(%logger{100}).%boldRed(%method)-%boldMagenta(%line)- %blue(%msg%n) - - - - - - -/www/root/server/logs/${datetime}/auth-server.log -true - - %date{yyyy-MM-dd HH:mm:ss} %-5level %logger{100} %method %line %msg%n - UTF-8 - - -``` - -> 如果按照上面搭建，日志文件会在`/www/root/server/logs`下，即使使Windows系统也会存在，如果docker使用的是文件映射，那么日志文件会在容器相对应的位置 - -如果开发环境或者其他环境也需要日志，可以根据当前环境进行选择`` - -```xml - - - - - - - - - - -``` - -# 项目特点 - -### 按钮权限显示 - -如果当前用户在这个页面中只有【添加】和【删除】那么页面按钮中只会显示出【添加按钮】和【删除按钮】 - -### 去除前后空格 - -后端配置了自动去除前端传递的空字符串，如果传递的内容前后有空格会自动去除前后的空格 - -![image-20241105215241811](http://129.211.31.58:9000/docs/image-20241105215241811.png) - -### 项目接口和页面 - -接口地址有两个： - -1. knife4j -2. swagger - -接口地址://localhost:7070/doc.html#/home - -![image-20241105213953503](http://129.211.31.58:9000/docs/image-20241105213953503.png) - -swagger接口地址：http://localhost:7070/swagger-ui/index.html - -![image-20241105214100720](http://129.211.31.58:9000/docs/image-20241105214100720.png) - -前端接口地址：http://localhost:7000/#/welcome - -![image-20241105214230389](http://129.211.31.58:9000/docs/image-20241105214230389.png) - -## 登录功能 - -> [!warning] -> -> 可以选择邮箱登录或者是密码直接登录，两者不互用。 - -### 账号登录 +接口地址：访问`http:://localhost:7070`会有接口地址信息 ![image-20250222184157801](http://129.211.31.58:9000/docs/image-20250222184157801.png) -#### 业务需求 - -- 用户输入用户名和密码进行登录 - -#### 实现思路 - -- 用户输入账号和密码和数据库中账号密码进行比对，成功后进行页面跳转 -- 如果账户禁用会显示账户已封禁 - -> [!tip] -> -> 这里做了登录策略，可以方便以后的扩展。 -> -> ![image-20250222184405761](http://129.211.31.58:9000/docs/image-20250222184405761-1740221103225-1.png) - -**后端实现文件位置** - -- 拦截请求为`/admin/login`的请求之后进行登录验证的判断 - -![image-20250222184248858](http://129.211.31.58:9000/docs/image-20250222184248858.png) - -### 邮箱登录 - -#### 业务需求 - -- 用户输入邮箱账号、密码、邮箱验证码之后进行登录 - -#### 实现思路 - -- 需要验证用户输入的邮箱格式是否正确。 -- 在未输入验证码的情况下输入密码会提示用户，同时后端也会进行验证。如果输入了邮箱验证码但是Redis中不存在或已过期，会提示：邮箱验证码不存在或已过期。 -- 之后对邮箱账号和密码进行判断包括邮箱验证码进行判断 - -## 首页功能 - -功能菜单，首页图表展示部分功能已经由这个模板作者设计好，其中需要注意的是，如果要查看历史消息或者是进入消息页面可以双击 - -### 消息功能 - -#### 业务需求 - -1. 消息页面的展示，包含删除、批量删除、选中已读和当前页面所有消息都标为已读 -2. 当用户对左侧菜单点击时可以过滤出消息内容，展示不同的消息类型 - -3. 可以点击已读和全部进行筛选消息 - -4. 可以根据标题进行搜搜 -5. 包含分页 - -#### 实现思路 - -1. 显示当前消息类型，用户点击时带参数请求，只带当前消息类型，不默认携带已读状态查询，然后从数据库筛选并返回结果。 - -2. 点击"已读"选项时，若选择"全部"（之前是设置为undefined，这样就不会携带参数了，但是底下会有警告），现在改为空字符串，后端只需过滤掉空字符串即可。 - -3. 删除选定数据，若用户选择列表并筛选出所有ID，将数据传递给后端（用户删除为逻辑删除）。 - -4. 全部标为已读![image-20241106131949217](http://129.211.31.58:9000/docs/image-20241106131949217.png)，类似删除操作，筛选出选中数据的ID，然后传递给后端以标记为已读。 - -5. 将所有数据标记为已读！当前页面前端使用map提取所有ID，整合成ID列表传递给后端，表示页面上所有数据已读。 - -6. 输入标题后，随输入变化进行搜索。 - -消息提醒在页面刷新时会出现这样 - -![image-20241229214535717](http://129.211.31.58:9000/docs/image-20241229214535717.png) - -### 用户管理 - -#### 需求分析 - -1. 用户操作需要包含CURD的操作 -2. 为了方便在用户中需要给出快速禁用当前用户按钮 -3. 需要显示用户头像、性别、最后登录的IP地址和归属地 -4. 在左侧中需要包含部分查询 -5. 可以根据点击的部门查询当前部门下的用户 -6. 根据用户可以强制下线、管理员可以修改用户密码、为用户分配角色 - -**重置密码** - -重置密码需要判断当前用户密码是否是符合指定的密码格式，并且会根据当前输入密码计算得分如果当前密码复杂则得分越高那么密码强度越强 - -![image-20241106003256994](http://129.211.31.58:9000/docs/image-20241106003256994.png) - -重置密码组件在前端的公共组件文件中 - -![image-20241106003426573](http://129.211.31.58:9000/docs/image-20241106003426573.png) - -**分配角色** - -- 给用户分配了admin角色后，其他路由绑定和权限设置就不再需要了，因为后端会根据admin角色在前端用户信息中设置通用权限码，如`*`、`*::*`、`*::*::*`，表示前端用户可以访问所有权限并查看所有内容。 -- 管理员有权对用户进行角色分配，这涉及到许多操作，包括菜单显示和接口访问权限。角色与权限相关联，角色也与菜单相关联。 - -- 当用户访问菜单时，会根据其角色看到其所属的菜单内容。随后，角色与权限接口相关联，根据用户的权限来决定是否显示操作按钮。后端会根据用户的权限验证其是否可以访问当前接口。 - -- 用户登录或刷新页面时会重新获取用户信息，用户信息中包含角色和权限信息。利用角色和权限信息与前端传递的路径进行比对判断，如果用户包含菜单角色，则可以访问。如果用户包含前端路由中的权限，则表示该权限可以访问。后端也会进行权限判断，以防止通过接口文档等方式访问。 - -- 分配好角色后，菜单会根据当前路由角色匹配用户角色，从而根据用户角色显示相应的菜单内容。 - -![image-20241106004533031](http://129.211.31.58:9000/docs/image-20241106004533031.png) - -### 角色管理 - -角色管理包含CURD和权限分配操作 - ![image-20241106132548236](http://129.211.31.58:9000/docs/image-20241106132548236.png) -#### 业务需求 - -用户对角色进行CURD操作，点击权限设置时让用户分配权限 - -#### 实现思路 - -1. 在设计的表中，如果存在相同的角色码，系统会提示用户当前角色已经存在。 - -2. 后端会根据角色的ID分配权限的ID列表。 - -![image-20241106135600255](http://129.211.31.58:9000/docs/image-20241106135600255.png) - -3. 后端在角色权限表中会根据角色的ID分配权限内容。在角色权限表中，会先删除当前角色所有的权限内容，然后再进行权限内容的重新分配。 - -```java -public void assignPowersToRole(AssignPowersToRoleDto dto) { - List powerIds = dto.getPowerIds(); - Long roleId = dto.getRoleId(); - - // 删除这个角色下所有权限 - baseMapper.deleteBatchRoleIdsWithPhysics(List.of(roleId)); - - // 保存分配数据 - List rolePowerList = powerIds.stream().map(powerId -> { - RolePower rolePower = new RolePower(); - rolePower.setRoleId(roleId); - rolePower.setPowerId(powerId); - return rolePower; - }).toList(); - saveBatch(rolePowerList); - - // 找到所有和当前更新角色相同的用户 - List roleIds = userRoleMapper.selectList(Wrappers.lambdaQuery().eq(UserRole::getRoleId, roleId)) - .stream().map(UserRole::getUserId).toList(); - - // 根据Id查找所有用户 - List adminUsers = userMapper.selectList(Wrappers.lambdaQuery().in(!roleIds.isEmpty(), AdminUser::getId, roleIds)); - - // 用户为空时不更新Redis的key - if (adminUsers.isEmpty()) return; - - // 更新Redis中用户信息 - List userIds = adminUsers.stream().map(AdminUser::getId).toList(); - roleFactory.updateUserRedisInfo(userIds); -} -``` - -### 权限管理 - -![image-20241106135954104](http://129.211.31.58:9000/docs/image-20241106135954104.png) - -![image-20241106140006176](http://129.211.31.58:9000/docs/image-20241106140006176.png) - -在权限配置中，添加/修改权限时的请求地址为后端接口的请求地址，请求地址使用了【`正则表达式`】判断和【`antpath`】方式填写 - -#### 业务需求 - -1. 对权限表进行CURD操作 -2. 在表格中点击新增时，父级id为当前点击行的id - -#### 实现思路 - -点击当前行父级id为当前的行的id - -![image-20241106140420845](http://129.211.31.58:9000/docs/image-20241106140420845.png) - -#### 权限判断实现方式 - -##### 后端判断方式 - -判断权限是否可以访问，后端实现判断逻辑 - -![image-20241106003921315](http://129.211.31.58:9000/docs/image-20241106003921315.png) - -##### 前端判断方式 - -角色分配方式有下面几种想洗参考：https://pure-admin.github.io/vue-pure-admin/#/permission/button/router，[文档页面](https://pure-admin.github.io/pure-admin-doc/pages/routerMenu/#%E4%B8%BA%E4%BB%80%E4%B9%88%E8%B7%AF%E7%94%B1%E7%9A%84-name-%E5%BF%85%E5%86%99-%E8%80%8C%E4%B8%94%E5%BF%85%E9%A1%BB%E5%94%AF%E4%B8%80) - -1. 使用标签方式 - -![image-20241106004247600](http://129.211.31.58:9000/docs/image-20241106004247600.png) - -2. 使用函数方式 - -![image-20241106004310635](http://129.211.31.58:9000/docs/image-20241106004310635.png) - -3. 使用指令方式 - -![image-20241106005252328](http://129.211.31.58:9000/docs/image-20241106005252328.png) - -在前端utils文件夹下有`auth.ts`文件里面包含了权限码信息，如果当前菜单属性中包含这个权限码表示可以访问这个权限 - -![image-20241106004433489](http://129.211.31.58:9000/docs/image-20241106004433489.png) - -![image-20241106004500855](http://129.211.31.58:9000/docs/image-20241106004500855.png) - -### 菜单管理 - ![image-20241106140545328](http://129.211.31.58:9000/docs/image-20241106140545328.png) -### 菜单路由 - -在做菜单返回时必须要了解角色和权限表 - -#### 需求分析 - -1. 从数据库中返回出所有的菜单，其中需要整合成前端所要的形式，需要包含`roles`和`auths`，及其其它参数。 -2. 用户需要根据自己的角色访问不同的菜单。 -3. 如果当前用户不可以访问某些按钮需要隐藏。 -4. 用户通过其它手段访问如：swagger、knife4j、apifox、postman这种工具访问需要做权限验证，如果当前用户不满足访问这些接口后端需要拒绝。 -5. 如果已经添加了菜单名称、路由等级、路由路径会提示`xxx已存在`![image-20241106132818902](http://129.211.31.58:9000/docs/image-20241106132818902.png) - -6. 在数据库中为部分字段建立了唯一索引 - -#### 实现思路 - -1. 角色和权限哪些可以访问的页面交给前端，在模板中已经设计好，如果用户访问了自己看不到的菜单会出现`403` - 页面；判断方式是根据后端返回的菜单中如果包含当前用户的角色就表示可以访问当前的菜单，如果用户信息中没有这个角色则表示不可以访问这个页面。 -2. 页面是否可以访问只是在操作上，如果用户通过接口访问是阻止不了的，所以这时后端需要在后端中进行判断，当前的访问路径是否是被允许的，也就是这个用户是否有这个权限，权限表设计中包含了请求路径 -3. 后端需要判断用户请求这个接口是否有权访问 - -> 整合成前端格式返回需要递归，后端根据当前用户访问的菜单需要进行递归菜单数据之后返回前端，并将这些菜单绑定的角色放置在`roles` -> 中，之后根据角色查询全新啊相关内容，要将权限内容放置在`auths`中. -> -> 如果包含子菜单需要防止在`children`数组中，后端实现时如果没有子菜单默认是空数组而不是`null` -> -> 大致如下： -> -> ```json -> { -> "menuType": 0, -> "title": "admin_user", -> "path": "/system/admin-user", -> "component": "/system/adminUser/index", -> "meta": { -> "icon": "ic:round-manage-accounts", -> "title": "admin_user", -> "rank": 2, -> "roles": [ -> "admin", -> "all_page", -> "system", -> "test" -> ], -> "auths": [ -> "message::updateMessage", -> "menuIcon::getMenuIconList", -> "admin::messageReceived", -> "config::getWebConfig", -> "admin::config", -> "i18n::getI18n", -> .... -> ], -> "frameSrc": "" -> }, -> "children": [], -> "id": "1841803086252548097", -> "parentId": "1", -> "name": "admin_user", -> "rank": 2 -> } -> ``` - -### 部门管理 - -![image-20241106140738517](http://129.211.31.58:9000/docs/image-20241106140738517.png) - -![image-20241106140728748](http://129.211.31.58:9000/docs/image-20241106140728748.png) - -#### 业务需求 - -1. 包含CURD -2. 在用户管理中可以选择对应的部门 - -#### 实现思路 - -1. CURD接口文件如下 - -![image-20241106140826034](http://129.211.31.58:9000/docs/image-20241106140826034.png) - -2. 管理员为用户分配部门 - -![image-20241106140942278](http://129.211.31.58:9000/docs/image-20241106140942278.png) - -### 菜单图标 - ![image-20241106141037894](http://129.211.31.58:9000/docs/image-20241106141037894.png) -#### 业务需求 - -1. 用户在菜单中可以选择存储在数据库中的图标内容 -2. 包含CURD内容 - -#### 实现思路 - -后端需要返回接口格式实体类如下 - -```java -public class MenuIconVo extends BaseUserVo { - - @Schema(name = "iconCode", title = "icon类名") - private String iconCode; - - @Schema(name = "iconName", title = "icon 名称") - private String iconName; - -} -``` - -![image-20241106141521051](http://129.211.31.58:9000/docs/image-20241106141521051.png) - -前端封装好的组件 - -### 邮箱相关 - -#### 业务需求 - -1. 邮件用户配置CURD -2. 邮件模板CURD -3. 邮件用户中只能有一个是默认的，如果当前修改其它项需要将其它已经启用改为不启用 -4. 邮件模板需要绑定邮件用户 - -### 实现思路 - -邮件模板中，添加或者修改时前端需要返回所有的邮件模板用户，添加或者修改时将用户ID存储在邮件模板的数据字段中 - -### web配置 - -![image-20241106142001190](http://129.211.31.58:9000/docs/image-20241106142001190.png) - -#### 主题颜色 - -后端做了Hash值校验，如果是RGB会造成颜色显示有些问题，比如使用纯色的按钮，想下面的这种的，鼠标hover事件会变透明因为无法计算Hash值，所以在修改颜色值时一定要保证是Hash值 - -![image-20241229214049079](http://129.211.31.58:9000/docs/image-20241229214049079.png) - -![image-20241229214217968](http://129.211.31.58:9000/docs/image-20241229214217968.png) - -修改完成的示例 - -![image-20241229214329544](http://129.211.31.58:9000/docs/image-20241229214329544.png) - -### 系统监控 - -#### 服务监控 - -从SpringBoot的Actuator中获取信息，页面采用响应式 - ![image-20241106142208794](http://129.211.31.58:9000/docs/image-20241106142208794.png) -#### 系统缓存 - -当前内容被SpringBoot缓存会显示在这 - -![image-20241106142253759](http://129.211.31.58:9000/docs/image-20241106142253759.png) - -### 定时任务 - 采用Quarter持久化存储。 -#### 示例显示 - ![image-20241229220003779](http://129.211.31.58:9000/docs/image-20241229220003779.png) - -### 多语言管理 - -![image-20241106142531047](http://129.211.31.58:9000/docs/image-20241106142531047.png) - -![image-20241106142544172](http://129.211.31.58:9000/docs/image-20241106142544172.png) - -### 日志管理 - -存储在MySQL中，如果想做优化可以放在MongoDB中 - -### 消息管理 - -管理员可以发送消息告诉xxx用户，在主页中会显示![image-20241106142908363](http://129.211.31.58:9000/docs/image-20241106142908363.png) - -之后点击时会看到消息封面、标题、简介、消息等级、消息等级内容 - -![image-20241106142949366](http://129.211.31.58:9000/docs/image-20241106142949366.png) - -#### 消息类型 - -![image-20241106143008098](http://129.211.31.58:9000/docs/image-20241106143008098.png) - -包含CURD，用户编辑消息发送时可以在选择 - -![image-20241106144017015](http://129.211.31.58:9000/docs/image-20241106144017015.png) - -同时在用户消息栏中也会显示对应内容，前端判断逻辑如下 - -![image-20241106144146081](http://129.211.31.58:9000/docs/image-20241106144146081.png) - -#### 消息编辑 - -提供md编辑器和富文本编辑器 - -消息接受用户，如果不填写表示全部的用户，填写后会根据填写的内容存储在用户接受表中 - -消息等级是显示消息样式颜色，文字内容为消息简介内容 - -#### 消息接收管理 - -根据所选的接受用户会出现在下面的用户接受表中，可以对当前用户是否已读进行修改 - -#### 消息发送管理 - -之前编辑过的消息都会在这 - -# 环境部署 - -使用Docker进行部署，后端接口地址以`/api`开头，前端默认请求前缀为`/api`，因此在请求时需要进行替换。详细内容请参考以下【项目部署】说明。 - -## 前端部署 - -运行`pnpm build` - -`dockerfile`中暴露端口要和生产环境的端口号保持一致 - -### 使用http协议 - -如果不使用https，需要将下面内容注释 - -![image-20241108152526666](http://129.211.31.58:9000/docs/auth/image-20241108152526666.png) - -对外暴露端口改为`80`或者你自己喜欢的端口 - -![image-20241108154244339](http://129.211.31.58:9000/docs/auth/image-20241108154244339.png) - -#### NGINX配置 - -将NGINX配置修改为以下内容，如果你的暴露的端口和我一样是`80` - -![image-20241108154344561](http://129.211.31.58:9000/docs/auth/image-20241108154344561.png) - -#### 运行docker文件 - -![image-20241108151726981](http://129.211.31.58:9000/docs/auth/image-20241108151726981.png) - -![image-20241108151940158](http://129.211.31.58:9000/docs/auth/image-20241108151940158.png) - -> 命令预览 -> -> ```sh -> docker build -f Dockerfile -t bunny_auth_web:1.0.0 . && docker run -p 80:443 -p 443:443 --name bunny_auth_web --restart always bunny_auth_web:1.0.0 -> ``` - -## 后端部署 - -### 注意事项 - -如果需要打包需要手动创建生产环境文件：`application-prod.yml` - -![image-20241117202134939](http://129.211.31.58:9000/docs/image-20241117202134939.png) - -### 环境设置 - -开发环境环境：对外暴露的端口是`7070` - -生产环境：对外暴露的端口是`8000` - -需要先打包，打包完成后会在目录下生成对应的`target`相关文件 - -```bash -# 开发环境 -mvn clean package -Pprod -DskipTests - -# 测试环境 -mvn clean package -Ptest -DskipTests -``` - -**:star: 如果不需要内置文件操作什么的这一步可以忽略** - -![image-20241108153705104](http://129.211.31.58:9000/docs/auth/image-20241108153705104.png) - -这个文件夹是必须的 - -![image-20241108153750097](http://129.211.31.58:9000/docs/auth/image-20241108153750097.png) diff --git a/auth-admin/src/main/java/cn/bunny/services/quartz/JobHello.java b/auth-admin/src/main/java/cn/bunny/services/quartz/JobHello.java index 6d008d1..fedad33 100644 --- a/auth-admin/src/main/java/cn/bunny/services/quartz/JobHello.java +++ b/auth-admin/src/main/java/cn/bunny/services/quartz/JobHello.java @@ -11,6 +11,7 @@ import org.quartz.JobExecutionException; public class JobHello implements Job { @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + // 测试使用 System.out.print("执行任务--JobHello。。。。。。。。。"); } } diff --git a/auth-admin/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java b/auth-admin/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java index c98a0e7..9814d13 100644 --- a/auth-admin/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java +++ b/auth-admin/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java @@ -13,12 +13,12 @@ import org.springframework.security.crypto.password.PasswordEncoder; @Configuration public class MethodSecurityConfig { + @Bean public PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } - /** * 使用数据库方式 * 登录方式：邮箱+用户名 diff --git a/auth-admin/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java b/auth-admin/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java index a694d87..e7e7a91 100644 --- a/auth-admin/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java +++ b/auth-admin/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java @@ -1,20 +1,16 @@ package cn.bunny.services.security.config; import cn.bunny.services.security.custom.CustomAuthorizationManagerServiceImpl; -import cn.bunny.services.security.filter.TokenLoginFilterService; import cn.bunny.services.security.handelr.SecurityAccessDeniedHandler; import cn.bunny.services.security.handelr.SecurityAuthenticationEntryPoint; -import cn.bunny.services.service.system.UserService; import jakarta.annotation.Resource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.util.matcher.RegexRequestMatcher; @Configuration @@ -24,21 +20,16 @@ public class WebSecurityConfig { // 需要排出的无需验证的请求路径 public static String[] annotations = { - "/", "/ws/**", "/**.html", + "/", "/ws/**", "/**.html", "/error", "/media.ico", "/favicon.ico", "/webjars/**", "/v3/api-docs/**", "/swagger-ui/**", + "/*/*/login", "/*/*/noAuth/**", "/*/noAuth/**", "/noAuth/**", - "/error", "/*/i18n/getI18n", + "/*/i18n/getI18n", }; - @Resource - private UserService userService; - @Resource private CustomAuthorizationManagerServiceImpl customAuthorizationManagerService; - @Resource - private AuthenticationConfiguration authenticationConfiguration; - @Bean public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { httpSecurity @@ -65,9 +56,7 @@ public class WebSecurityConfig { // 没有权限访问 exception.accessDeniedHandler(new SecurityAccessDeniedHandler()); }) - // 登录验证过滤器 - .addFilterBefore(new TokenLoginFilterService(authenticationConfiguration, userService), UsernamePasswordAuthenticationFilter.class); + ; return httpSecurity.build(); } - } 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 da83a84..e178cb6 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 @@ -11,6 +11,7 @@ import cn.bunny.services.mapper.system.RoleMapper; import cn.bunny.services.utils.JwtHelper; import cn.bunny.services.utils.system.RoleUtil; import com.alibaba.fastjson2.JSON; +import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; @@ -34,17 +35,14 @@ import java.util.function.Supplier; @Slf4j public class CustomAuthorizationManagerServiceImpl implements AuthorizationManager { - private final PowerMapper powerMapper; + @Resource + private PowerMapper powerMapper; - private final RoleMapper roleMapper; + @Resource + private RoleMapper roleMapper; - private final RedisTemplate redisTemplate; - - public CustomAuthorizationManagerServiceImpl(PowerMapper powerMapper, RoleMapper roleMapper, RedisTemplate redisTemplate) { - this.powerMapper = powerMapper; - this.roleMapper = roleMapper; - this.redisTemplate = redisTemplate; - } + @Resource + private RedisTemplate redisTemplate; /** * 检查请求的Token是否携带，并判断是否过期 diff --git a/auth-admin/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java b/auth-admin/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java deleted file mode 100644 index d84a898..0000000 --- a/auth-admin/src/main/java/cn/bunny/services/security/filter/TokenLoginFilterService.java +++ /dev/null @@ -1,77 +0,0 @@ -package cn.bunny.services.security.filter; - -import cn.bunny.domain.enums.LoginEnums; -import cn.bunny.domain.system.dto.user.LoginDto; -import cn.bunny.domain.system.vo.user.LoginVo; -import cn.bunny.domain.vo.result.Result; -import cn.bunny.services.security.handelr.SecurityAuthenticationFailureHandler; -import cn.bunny.services.security.handelr.SecurityAuthenticationSuccessHandler; -import cn.bunny.services.service.system.UserService; -import cn.bunny.services.utils.ResponseUtil; -import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.servlet.FilterChain; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.http.HttpMethod; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import org.springframework.security.web.util.matcher.AntPathRequestMatcher; - - -/** - * 自定义登录 - * 自定义登录路径和自定义登录返回数据 - */ -public class TokenLoginFilterService extends UsernamePasswordAuthenticationFilter { - private final UserService userService; - private LoginDto loginDto; - - public TokenLoginFilterService(AuthenticationConfiguration authenticationConfiguration, UserService customUserDetailsService) throws Exception { - this.setAuthenticationSuccessHandler(new SecurityAuthenticationSuccessHandler()); - this.setAuthenticationFailureHandler(new SecurityAuthenticationFailureHandler()); - this.setPostOnly(false); - // 自定义登录路径，自定义登录请求类型 - this.setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher(LoginEnums.LOGIN_REQUEST_API.getValue(), HttpMethod.POST.name())); - this.setAuthenticationManager(authenticationConfiguration.getAuthenticationManager()); - this.userService = customUserDetailsService; - } - - /** - * * 自定义验证 - * 判断邮箱验证码是否正确 - */ - @Override - public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) { - ObjectMapper objectMapper = new ObjectMapper(); - try { - loginDto = objectMapper.readValue(request.getInputStream(), LoginDto.class); - UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(loginDto.getUsername(), loginDto.getPassword()); - return getAuthenticationManager().authenticate(authentication); - } catch (Exception exception) { - throw new UsernameNotFoundException(exception.getMessage()); - } - } - - /** - * 验证成功 - * 在这里用户的账号和密码是对的 - * 此时不要再去解析/转换 request.getInputStream() 因为流已经关闭 - */ - @Override - protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain, Authentication auth) { - LoginVo loginVo = userService.login(loginDto, response); - ResponseUtil.out(response, Result.success(loginVo)); - } - - /** - * 验证失败 - */ - @Override - protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response, AuthenticationException failed) { - ResponseUtil.out(response, Result.error(null, failed.getMessage())); - } -} \ No newline at end of file diff --git a/auth-services/domain/domain-common/pom.xml b/auth-services/domain/domain-common/pom.xml deleted file mode 100644 index 1a2e8bb..0000000 --- a/auth-services/domain/domain-common/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - 4.0.0 - - cn.bunny - domain - 0.0.1-SNAPSHOT - - - domain-common - jar - - domain-common - https://maven.apache.org - - - UTF-8 - - - diff --git a/auth-services/controllers/pom.xml b/auth-system/controllers/pom.xml similarity index 94% rename from auth-services/controllers/pom.xml rename to auth-system/controllers/pom.xml index ada0e98..4d22fda 100644 --- a/auth-services/controllers/pom.xml +++ b/auth-system/controllers/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.bunny - auth-services + auth-system 0.0.1-SNAPSHOT diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/IndexController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/IndexController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/IndexController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/IndexController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/I18nController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/configuration/I18nController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/I18nController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/configuration/I18nController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/message/MessageController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/message/MessageController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/message/MessageController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/message/MessageController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/system/DeptController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/system/DeptController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/system/DeptController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/system/DeptController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/system/FilesController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/system/FilesController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/system/FilesController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/system/FilesController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/system/PowerController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/system/PowerController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/system/PowerController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/system/PowerController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/system/RoleController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/system/RoleController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/system/RoleController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/system/RoleController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/system/RolePowerController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/system/RolePowerController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/system/RolePowerController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/system/RolePowerController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/system/RouterController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/system/RouterController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/system/RouterController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/system/RouterController.java diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java diff --git a/auth-services/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 similarity index 95% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/system/UserController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/system/UserController.java index 36a317c..81f0058 100644 --- a/auth-services/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 @@ -60,6 +60,13 @@ public class UserController { return Result.success(voList); } + @Operation(summary = "用户登录", description = "前端用户登录") + @PostMapping("login") + public Result login(@Valid @RequestBody LoginDto loginDto) { + LoginVo loginVo = userService.login(loginDto); + return Result.success(loginVo); + } + @Operation(summary = "更新用户信息", description = "更新用户信息，需要更新Redis中的内容") @PutMapping("updateAdminUser") public Result updateAdminUser(@Valid @RequestBody AdminUserUpdateDto dto) { diff --git a/auth-services/controllers/src/main/java/cn/bunny/services/controller/system/UserRoleController.java b/auth-system/controllers/src/main/java/cn/bunny/services/controller/system/UserRoleController.java similarity index 100% rename from auth-services/controllers/src/main/java/cn/bunny/services/controller/system/UserRoleController.java rename to auth-system/controllers/src/main/java/cn/bunny/services/controller/system/UserRoleController.java diff --git a/auth-services/domain/domain-system/pom.xml b/auth-system/domain/pom.xml similarity index 81% rename from auth-services/domain/domain-system/pom.xml rename to auth-system/domain/pom.xml index 4225a6b..f2e586c 100644 --- a/auth-services/domain/domain-system/pom.xml +++ b/auth-system/domain/pom.xml @@ -3,16 +3,15 @@ 4.0.0 cn.bunny - domain + auth-system 0.0.1-SNAPSHOT - domain-system + domain jar - domain-system + domain https://maven.apache.org - UTF-8 @@ -20,7 +19,7 @@ cn.bunny - domain-common + common-domain 0.0.1-SNAPSHOT diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/configuration/dto/WebConfigurationDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/configuration/dto/WebConfigurationDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/configuration/dto/WebConfigurationDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/configuration/dto/WebConfigurationDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/configuration/entity/WebConfiguration.java b/auth-system/domain/src/main/java/cn/bunny/domain/configuration/entity/WebConfiguration.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/configuration/entity/WebConfiguration.java rename to auth-system/domain/src/main/java/cn/bunny/domain/configuration/entity/WebConfiguration.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/configuration/vo/WebConfigurationVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/configuration/vo/WebConfigurationVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/configuration/vo/WebConfigurationVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/configuration/vo/WebConfigurationVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailTemplateAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailTemplateAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailTemplateAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailTemplateAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailTemplateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailTemplateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailTemplateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailTemplateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailTemplateUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailTemplateUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailTemplateUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailTemplateUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailUserUpdateStatusDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailUserUpdateStatusDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailUserUpdateStatusDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailUserUpdateStatusDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailUsersAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailUsersAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailUsersAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailUsersAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailUsersDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailUsersDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailUsersDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailUsersDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailUsersUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailUsersUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/dto/EmailUsersUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/email/dto/EmailUsersUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/entity/EmailTemplate.java b/auth-system/domain/src/main/java/cn/bunny/domain/email/entity/EmailTemplate.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/entity/EmailTemplate.java rename to auth-system/domain/src/main/java/cn/bunny/domain/email/entity/EmailTemplate.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/entity/EmailUsers.java b/auth-system/domain/src/main/java/cn/bunny/domain/email/entity/EmailUsers.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/entity/EmailUsers.java rename to auth-system/domain/src/main/java/cn/bunny/domain/email/entity/EmailUsers.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/vo/EmailTemplateVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/email/vo/EmailTemplateVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/vo/EmailTemplateVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/email/vo/EmailTemplateVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/vo/EmailUsersVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/email/vo/EmailUsersVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/email/vo/EmailUsersVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/email/vo/EmailUsersVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/dto/FileUploadDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/files/dto/FileUploadDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/dto/FileUploadDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/files/dto/FileUploadDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/dto/FilesAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/files/dto/FilesAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/dto/FilesAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/files/dto/FilesAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/dto/FilesDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/files/dto/FilesDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/dto/FilesDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/files/dto/FilesDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/dto/FilesUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/files/dto/FilesUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/dto/FilesUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/files/dto/FilesUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/entity/Files.java b/auth-system/domain/src/main/java/cn/bunny/domain/files/entity/Files.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/entity/Files.java rename to auth-system/domain/src/main/java/cn/bunny/domain/files/entity/Files.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/vo/FileInfoVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/files/vo/FileInfoVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/vo/FileInfoVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/files/vo/FileInfoVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/vo/FilesVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/files/vo/FilesVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/files/vo/FilesVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/files/vo/FilesVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nTypeUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nUpdateByFileDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nUpdateByFileDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nUpdateByFileDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nUpdateByFileDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/dto/I18nUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/i18n/dto/I18nUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/entity/I18n.java b/auth-system/domain/src/main/java/cn/bunny/domain/i18n/entity/I18n.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/entity/I18n.java rename to auth-system/domain/src/main/java/cn/bunny/domain/i18n/entity/I18n.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/entity/I18nType.java b/auth-system/domain/src/main/java/cn/bunny/domain/i18n/entity/I18nType.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/entity/I18nType.java rename to auth-system/domain/src/main/java/cn/bunny/domain/i18n/entity/I18nType.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/vo/I18nTypeVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/i18n/vo/I18nTypeVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/vo/I18nTypeVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/i18n/vo/I18nTypeVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/vo/I18nVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/i18n/vo/I18nVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/i18n/vo/I18nVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/i18n/vo/I18nVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/dto/ScheduleExecuteLogDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/log/dto/ScheduleExecuteLogDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/dto/ScheduleExecuteLogDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/log/dto/ScheduleExecuteLogDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/dto/UserLoginLogDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/log/dto/UserLoginLogDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/dto/UserLoginLogDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/log/dto/UserLoginLogDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/dto/UserLoginLogUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/log/dto/UserLoginLogUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/dto/UserLoginLogUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/log/dto/UserLoginLogUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/entity/ScheduleExecuteLog.java b/auth-system/domain/src/main/java/cn/bunny/domain/log/entity/ScheduleExecuteLog.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/entity/ScheduleExecuteLog.java rename to auth-system/domain/src/main/java/cn/bunny/domain/log/entity/ScheduleExecuteLog.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/entity/SystemLog.java b/auth-system/domain/src/main/java/cn/bunny/domain/log/entity/SystemLog.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/entity/SystemLog.java rename to auth-system/domain/src/main/java/cn/bunny/domain/log/entity/SystemLog.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/entity/UserLoginLog.java b/auth-system/domain/src/main/java/cn/bunny/domain/log/entity/UserLoginLog.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/entity/UserLoginLog.java rename to auth-system/domain/src/main/java/cn/bunny/domain/log/entity/UserLoginLog.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/vo/QuartzExecuteLogVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/log/vo/QuartzExecuteLogVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/vo/QuartzExecuteLogVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/log/vo/QuartzExecuteLogVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/vo/UserLoginLogLocalVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogLocalVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/vo/UserLoginLogLocalVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogLocalVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/vo/UserLoginLogVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/log/vo/UserLoginLogVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/log/vo/UserLoginLogVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/menuIcon/dto/MenuIconUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/menuIcon/entity/MenuIcon.java b/auth-system/domain/src/main/java/cn/bunny/domain/menuIcon/entity/MenuIcon.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/menuIcon/entity/MenuIcon.java rename to auth-system/domain/src/main/java/cn/bunny/domain/menuIcon/entity/MenuIcon.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/menuIcon/vo/MenuIconVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/menuIcon/vo/MenuIconVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/menuIcon/vo/MenuIconVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/menuIcon/vo/MenuIconVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageReceivedDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageReceivedDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageReceivedUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageReceivedUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageReceivedUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageTypeAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageTypeAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageTypeAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageTypeAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageTypeDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageTypeDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageTypeDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageTypeDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageTypeUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageTypeUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageTypeUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageTypeUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageUserDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageUserDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/dto/MessageUserDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/dto/MessageUserDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/entity/Message.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/entity/Message.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/entity/Message.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/entity/Message.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/entity/MessageReceived.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/entity/MessageReceived.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/entity/MessageReceived.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/entity/MessageReceived.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/entity/MessageType.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/entity/MessageType.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/entity/MessageType.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/entity/MessageType.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/vo/MessageDetailVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/vo/MessageDetailVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/vo/MessageDetailVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/vo/MessageDetailVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithMessageVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithMessageVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithMessageVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithMessageVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithUserVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithUserVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithUserVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/vo/MessageReceivedWithUserVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/vo/MessageTypeVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/vo/MessageTypeVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/vo/MessageTypeVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/vo/MessageTypeVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/vo/MessageUserVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/vo/MessageUserVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/vo/MessageUserVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/vo/MessageUserVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/vo/MessageVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/message/vo/MessageVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/message/vo/MessageVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/message/vo/MessageVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/dto/SchedulersAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/quartz/dto/SchedulersAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/dto/SchedulersAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/quartz/dto/SchedulersAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/dto/SchedulersDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/quartz/dto/SchedulersDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/dto/SchedulersDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/quartz/dto/SchedulersDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/quartz/dto/SchedulersGroupUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/dto/SchedulersUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/quartz/dto/SchedulersUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/dto/SchedulersUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/quartz/dto/SchedulersUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/entity/Schedulers.java b/auth-system/domain/src/main/java/cn/bunny/domain/quartz/entity/Schedulers.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/entity/Schedulers.java rename to auth-system/domain/src/main/java/cn/bunny/domain/quartz/entity/Schedulers.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/entity/SchedulersGroup.java b/auth-system/domain/src/main/java/cn/bunny/domain/quartz/entity/SchedulersGroup.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/entity/SchedulersGroup.java rename to auth-system/domain/src/main/java/cn/bunny/domain/quartz/entity/SchedulersGroup.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/vo/SchedulersGroupVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/quartz/vo/SchedulersGroupVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/vo/SchedulersGroupVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/quartz/vo/SchedulersGroupVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/vo/SchedulersOperationDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/quartz/vo/SchedulersOperationDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/vo/SchedulersOperationDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/quartz/vo/SchedulersOperationDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/vo/SchedulersVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/quartz/vo/SchedulersVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/quartz/vo/SchedulersVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/quartz/vo/SchedulersVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/AssignPowersToRoleDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/AssignPowersToRoleDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/AssignPowersToRoleDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/AssignPowersToRoleDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/dept/DeptAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/dept/DeptAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/dept/DeptAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/dept/DeptAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/dept/DeptDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/dept/DeptDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/dept/DeptDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/dept/DeptDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/dept/DeptUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/dept/DeptUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/dept/DeptUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/dept/DeptUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/power/PowerAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/power/PowerAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/power/PowerAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/power/PowerAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/power/PowerDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/power/PowerDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/power/PowerDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/power/PowerDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/power/PowerUpdateBatchByParentIdDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/power/PowerUpdateBatchByParentIdDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/power/PowerUpdateBatchByParentIdDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/power/PowerUpdateBatchByParentIdDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/power/PowerUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/power/PowerUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/power/PowerUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/power/PowerUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/role/RoleAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/role/RoleAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/role/RoleAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/role/RoleAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/role/RoleDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/role/RoleDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/role/RoleDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/role/RoleDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/role/RoleUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/role/RoleUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/role/RoleUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/role/RoleUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/router/AssignRolesToRoutersDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/router/AssignRolesToRoutersDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/router/AssignRolesToRoutersDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/router/AssignRolesToRoutersDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/router/RouterAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/router/RouterAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/router/RouterAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/router/RouterAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/router/RouterManageDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/router/RouterManageDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/router/RouterManageDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/router/RouterManageDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/router/RouterUpdateByIdWithRankDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/router/RouterUpdateByIdWithRankDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/router/RouterUpdateByIdWithRankDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/router/RouterUpdateByIdWithRankDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/router/RouterUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/router/RouterUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/router/RouterUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/router/RouterUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AdminUserAddDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserAddDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AdminUserAddDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserAddDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AdminUserDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AdminUserDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateUserStatusDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateUserStatusDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateUserStatusDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateUserStatusDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateWithPasswordDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateWithPasswordDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateWithPasswordDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AdminUserUpdateWithPasswordDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AssignRolesToUsersDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AssignRolesToUsersDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/AssignRolesToUsersDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/AssignRolesToUsersDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java similarity index 82% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java index 3ea7497..255bdd9 100644 --- a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java +++ b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/LoginDto.java @@ -24,14 +24,11 @@ public class LoginDto { @Schema(name = "password", title = "密码") @NotBlank(message = "密码不能为空") @NotNull(message = "密码不能为空") - @Pattern( - regexp = "^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)]|[()])+$)(?!^.*[\\u4E00-\\u9FA5].*$)([^(0-9a-zA-Z)]|[()]|[a-z]|[A-Z]|[0-9]){8,18}$", + @Pattern(regexp = "^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)]|[()])+$)(?!^.*[\\u4E00-\\u9FA5].*$)([^(0-9a-zA-Z)]|[()]|[a-z]|[A-Z]|[0-9]){8,18}$", message = "密码格式应为8-18位数字、字母、符号的任意两种组合") private String password; @Schema(name = "emailCode", title = "邮箱验证码") - @NotBlank(message = "邮箱验证码不能为空") - @NotNull(message = "邮箱验证码不能为空") private String emailCode; @Schema(name = "type", title = "登录类型") diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/RefreshTokenDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/RefreshTokenDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/RefreshTokenDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/RefreshTokenDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/UserUpdateWithAvatarDto.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/UserUpdateWithAvatarDto.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/dto/user/UserUpdateWithAvatarDto.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/dto/user/UserUpdateWithAvatarDto.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/AdminUser.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/entity/AdminUser.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/AdminUser.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/entity/AdminUser.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/Dept.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/entity/Dept.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/Dept.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/entity/Dept.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/Power.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/entity/Power.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/Power.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/entity/Power.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/Role.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/entity/Role.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/Role.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/entity/Role.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/RolePower.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/entity/RolePower.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/RolePower.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/entity/RolePower.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/Router.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/entity/Router.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/Router.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/entity/Router.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/RouterRole.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/entity/RouterRole.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/RouterRole.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/entity/RouterRole.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/UserDept.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/entity/UserDept.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/UserDept.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/entity/UserDept.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/UserRole.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/entity/UserRole.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/entity/UserRole.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/entity/UserRole.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/DeptVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/DeptVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/DeptVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/vo/DeptVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/PowerVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/PowerVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/PowerVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/vo/PowerVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/RoleVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/RoleVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/RoleVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/vo/RoleVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/router/RouterManageVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/router/RouterManageVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/router/RouterManageVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/vo/router/RouterManageVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/router/RouterMeta.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/router/RouterMeta.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/router/RouterMeta.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/vo/router/RouterMeta.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/router/UserRouterVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/router/UserRouterVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/router/UserRouterVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/vo/router/UserRouterVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/user/AdminUserVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/AdminUserVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/user/AdminUserVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/AdminUserVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/user/LoginVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/LoginVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/user/LoginVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/LoginVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/user/RefreshTokenVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/RefreshTokenVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/user/RefreshTokenVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/RefreshTokenVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/user/SearchUserinfoVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/SearchUserinfoVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/user/SearchUserinfoVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/SearchUserinfoVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/user/UserVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/UserVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/user/UserVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/UserVo.java diff --git a/auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/user/ValidateCodeVo.java b/auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/ValidateCodeVo.java similarity index 100% rename from auth-services/domain/domain-system/src/main/java/cn/bunny/domain/system/vo/user/ValidateCodeVo.java rename to auth-system/domain/src/main/java/cn/bunny/domain/system/vo/user/ValidateCodeVo.java diff --git a/auth-services/mappers/pom.xml b/auth-system/mappers/pom.xml similarity index 88% rename from auth-services/mappers/pom.xml rename to auth-system/mappers/pom.xml index a750ae2..4bef4ac 100644 --- a/auth-services/mappers/pom.xml +++ b/auth-system/mappers/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.bunny - auth-services + auth-system 0.0.1-SNAPSHOT @@ -20,7 +20,7 @@ cn.bunny - domain-system + domain 0.0.1-SNAPSHOT diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/FilesMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/FilesMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/FilesMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/FilesMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/PowerMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/PowerMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/PowerMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/PowerMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/RolePowerMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/RolePowerMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/RolePowerMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/RolePowerMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/UserMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/UserMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/UserMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/UserMapper.java diff --git a/auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java b/auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java similarity index 100% rename from auth-services/mappers/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java rename to auth-system/mappers/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java diff --git a/auth-services/mappers/src/main/resources/mapper/configuration/EmailTemplateMapper.xml b/auth-system/mappers/src/main/resources/mapper/configuration/EmailTemplateMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/configuration/EmailTemplateMapper.xml rename to auth-system/mappers/src/main/resources/mapper/configuration/EmailTemplateMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/configuration/EmailUsersMapper.xml b/auth-system/mappers/src/main/resources/mapper/configuration/EmailUsersMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/configuration/EmailUsersMapper.xml rename to auth-system/mappers/src/main/resources/mapper/configuration/EmailUsersMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/configuration/I18nMapper.xml b/auth-system/mappers/src/main/resources/mapper/configuration/I18nMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/configuration/I18nMapper.xml rename to auth-system/mappers/src/main/resources/mapper/configuration/I18nMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/configuration/I18nTypeMapper.xml b/auth-system/mappers/src/main/resources/mapper/configuration/I18nTypeMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/configuration/I18nTypeMapper.xml rename to auth-system/mappers/src/main/resources/mapper/configuration/I18nTypeMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/configuration/MenuIconMapper.xml b/auth-system/mappers/src/main/resources/mapper/configuration/MenuIconMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/configuration/MenuIconMapper.xml rename to auth-system/mappers/src/main/resources/mapper/configuration/MenuIconMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml b/auth-system/mappers/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml rename to auth-system/mappers/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/log/UserLoginLogMapper.xml b/auth-system/mappers/src/main/resources/mapper/log/UserLoginLogMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/log/UserLoginLogMapper.xml rename to auth-system/mappers/src/main/resources/mapper/log/UserLoginLogMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/message/MessageMapper.xml b/auth-system/mappers/src/main/resources/mapper/message/MessageMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/message/MessageMapper.xml rename to auth-system/mappers/src/main/resources/mapper/message/MessageMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/message/MessageReceivedMapper.xml b/auth-system/mappers/src/main/resources/mapper/message/MessageReceivedMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/message/MessageReceivedMapper.xml rename to auth-system/mappers/src/main/resources/mapper/message/MessageReceivedMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/message/MessageTypeMapper.xml b/auth-system/mappers/src/main/resources/mapper/message/MessageTypeMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/message/MessageTypeMapper.xml rename to auth-system/mappers/src/main/resources/mapper/message/MessageTypeMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml b/auth-system/mappers/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml rename to auth-system/mappers/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/schedule/SchedulersMapper.xml b/auth-system/mappers/src/main/resources/mapper/schedule/SchedulersMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/schedule/SchedulersMapper.xml rename to auth-system/mappers/src/main/resources/mapper/schedule/SchedulersMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/system/DeptMapper.xml b/auth-system/mappers/src/main/resources/mapper/system/DeptMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/system/DeptMapper.xml rename to auth-system/mappers/src/main/resources/mapper/system/DeptMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/system/FilesMapper.xml b/auth-system/mappers/src/main/resources/mapper/system/FilesMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/system/FilesMapper.xml rename to auth-system/mappers/src/main/resources/mapper/system/FilesMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/system/PowerMapper.xml b/auth-system/mappers/src/main/resources/mapper/system/PowerMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/system/PowerMapper.xml rename to auth-system/mappers/src/main/resources/mapper/system/PowerMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/system/RoleMapper.xml b/auth-system/mappers/src/main/resources/mapper/system/RoleMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/system/RoleMapper.xml rename to auth-system/mappers/src/main/resources/mapper/system/RoleMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/system/RolePowerMapper.xml b/auth-system/mappers/src/main/resources/mapper/system/RolePowerMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/system/RolePowerMapper.xml rename to auth-system/mappers/src/main/resources/mapper/system/RolePowerMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/system/RouterMapper.xml b/auth-system/mappers/src/main/resources/mapper/system/RouterMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/system/RouterMapper.xml rename to auth-system/mappers/src/main/resources/mapper/system/RouterMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/system/RouterRoleMapper.xml b/auth-system/mappers/src/main/resources/mapper/system/RouterRoleMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/system/RouterRoleMapper.xml rename to auth-system/mappers/src/main/resources/mapper/system/RouterRoleMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/system/UserDeptMapper.xml b/auth-system/mappers/src/main/resources/mapper/system/UserDeptMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/system/UserDeptMapper.xml rename to auth-system/mappers/src/main/resources/mapper/system/UserDeptMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/system/UserMapper.xml b/auth-system/mappers/src/main/resources/mapper/system/UserMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/system/UserMapper.xml rename to auth-system/mappers/src/main/resources/mapper/system/UserMapper.xml diff --git a/auth-services/mappers/src/main/resources/mapper/system/UserRoleMapper.xml b/auth-system/mappers/src/main/resources/mapper/system/UserRoleMapper.xml similarity index 100% rename from auth-services/mappers/src/main/resources/mapper/system/UserRoleMapper.xml rename to auth-system/mappers/src/main/resources/mapper/system/UserRoleMapper.xml diff --git a/auth-services/pom.xml b/auth-system/pom.xml similarity index 91% rename from auth-services/pom.xml rename to auth-system/pom.xml index 96270e3..6703be6 100644 --- a/auth-services/pom.xml +++ b/auth-system/pom.xml @@ -7,10 +7,10 @@ 0.0.1-SNAPSHOT - auth-services + auth-system pom - auth-services + auth-system https://maven.apache.org diff --git a/auth-services/services/pom.xml b/auth-system/services/pom.xml similarity index 98% rename from auth-services/services/pom.xml rename to auth-system/services/pom.xml index 6b5b751..8ea89e4 100644 --- a/auth-services/services/pom.xml +++ b/auth-system/services/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.bunny - auth-services + auth-system 0.0.1-SNAPSHOT @@ -110,7 +110,6 @@ mysql-connector-j - com.fasterxml.jackson.datatype jackson-datatype-jsr310 diff --git a/auth-services/services/src/main/java/cn/bunny/services/aop/AnnotationScanner.java b/auth-system/services/src/main/java/cn/bunny/services/aop/AnnotationScanner.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/aop/AnnotationScanner.java rename to auth-system/services/src/main/java/cn/bunny/services/aop/AnnotationScanner.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java b/auth-system/services/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java rename to auth-system/services/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java b/auth-system/services/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java rename to auth-system/services/src/main/java/cn/bunny/services/aop/annotation/QuartzSchedulers.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/configuration/I18nService.java b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/I18nService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/configuration/I18nService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/configuration/I18nService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java b/auth-system/services/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java b/auth-system/services/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java b/auth-system/services/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/message/MessageService.java b/auth-system/services/src/main/java/cn/bunny/services/service/message/MessageService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/message/MessageService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/message/MessageService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/message/MessageTypeService.java b/auth-system/services/src/main/java/cn/bunny/services/service/message/MessageTypeService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/message/MessageTypeService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/message/MessageTypeService.java diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java b/auth-system/services/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java b/auth-system/services/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/system/DeptService.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/DeptService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/DeptService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/DeptService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/system/FilesService.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/FilesService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/FilesService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/FilesService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/system/PowerService.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/PowerService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/PowerService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/PowerService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/system/RolePowerService.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/RolePowerService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/RolePowerService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/RolePowerService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/system/RoleService.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/RoleService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/RoleService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/RoleService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/system/RouterRoleService.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/RouterRoleService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/RouterRoleService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/RouterRoleService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/system/RouterService.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/RouterService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/RouterService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/RouterService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/system/UserDeptService.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/UserDeptService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/UserDeptService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/UserDeptService.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/system/UserRoleService.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/UserRoleService.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/UserRoleService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/UserRoleService.java diff --git a/auth-services/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 similarity index 96% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/UserService.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/UserService.java index 922215b..8717a99 100644 --- a/auth-services/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 @@ -6,7 +6,6 @@ import cn.bunny.domain.system.vo.user.*; import cn.bunny.domain.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import org.jetbrains.annotations.NotNull; @@ -28,7 +27,7 @@ public interface UserService extends IService { * @param loginDto 登录参数 * @return 登录后结果返回 */ - LoginVo login(LoginDto loginDto, HttpServletResponse response); + LoginVo login(LoginDto loginDto); /** * * 获取用户信息列表 diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/impl/PowerServiceImpl.java diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RolePowerServiceImpl.java diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java b/auth-system/services/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/impl/UserDeptServiceImpl.java diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java diff --git a/auth-services/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 similarity index 98% rename from auth-services/services/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java rename to auth-system/services/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java index 87a791b..bce76f0 100644 --- a/auth-services/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 @@ -9,8 +9,8 @@ import cn.bunny.domain.files.dto.FileUploadDto; import cn.bunny.domain.files.vo.FileInfoVo; import cn.bunny.domain.log.entity.UserLoginLog; import cn.bunny.domain.system.dto.user.*; -import cn.bunny.domain.system.entity.Role; 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.views.ViewUserDept; @@ -41,12 +41,11 @@ 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.servlet.http.HttpServletResponse; +import jakarta.annotation.Resource; import jakarta.validation.Valid; import lombok.SneakyThrows; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.crypto.password.PasswordEncoder; @@ -70,27 +69,27 @@ import java.util.concurrent.TimeUnit; @Transactional public class UserServiceImpl extends ServiceImpl implements UserService { - @Autowired + @Resource private UserUtil userUtil; - @Autowired + @Resource private ConcreteSenderEmailTemplate concreteSenderEmailTemplate; - @Autowired + @Resource private RedisTemplate redisTemplate; - @Autowired + @Resource private FilesService filesService; - @Autowired + @Resource private UserDeptMapper userDeptMapper; - @Autowired + @Resource private UserRoleMapper userRoleMapper; - @Autowired + @Resource private UserLoginLogMapper userLoginLogMapper; - @Autowired + @Resource private EmailTemplateMapper emailTemplateMapper; - @Autowired + @Resource private RoleMapper roleMapper; - @Autowired + @Resource private UserMapper userMapper; - @Autowired + @Resource private PasswordEncoder passwordEncoder; /** @@ -105,7 +104,7 @@ public class UserServiceImpl extends ServiceImpl implemen * @return 登录后结果返回 */ @Override - public LoginVo login(LoginDto loginDto, HttpServletResponse response) { + public LoginVo login(LoginDto loginDto) { Long readMeDay = loginDto.getReadMeDay(); // 初始化登录策略，如果有需要添加策略放在这里 diff --git a/auth-services/services/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java b/auth-system/services/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java rename to auth-system/services/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java b/auth-system/services/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java rename to auth-system/services/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplate.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java b/auth-system/services/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java rename to auth-system/services/src/main/java/cn/bunny/services/utils/email/ConcreteSenderEmailTemplateTest.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java b/auth-system/services/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java rename to auth-system/services/src/main/java/cn/bunny/services/utils/login/DefaultLoginStrategy.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java b/auth-system/services/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java rename to auth-system/services/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/utils/login/LoginContext.java b/auth-system/services/src/main/java/cn/bunny/services/utils/login/LoginContext.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/utils/login/LoginContext.java rename to auth-system/services/src/main/java/cn/bunny/services/utils/login/LoginContext.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java b/auth-system/services/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java rename to auth-system/services/src/main/java/cn/bunny/services/utils/login/LoginStrategy.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/utils/system/FileUtil.java b/auth-system/services/src/main/java/cn/bunny/services/utils/system/FileUtil.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/utils/system/FileUtil.java rename to auth-system/services/src/main/java/cn/bunny/services/utils/system/FileUtil.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/utils/system/I18nUtil.java b/auth-system/services/src/main/java/cn/bunny/services/utils/system/I18nUtil.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/utils/system/I18nUtil.java rename to auth-system/services/src/main/java/cn/bunny/services/utils/system/I18nUtil.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/utils/system/RoleUtil.java b/auth-system/services/src/main/java/cn/bunny/services/utils/system/RoleUtil.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/utils/system/RoleUtil.java rename to auth-system/services/src/main/java/cn/bunny/services/utils/system/RoleUtil.java diff --git a/auth-services/services/src/main/java/cn/bunny/services/utils/system/RouterServiceUtil.java b/auth-system/services/src/main/java/cn/bunny/services/utils/system/RouterServiceUtil.java similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/utils/system/RouterServiceUtil.java rename to auth-system/services/src/main/java/cn/bunny/services/utils/system/RouterServiceUtil.java diff --git a/auth-services/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 similarity index 100% rename from auth-services/services/src/main/java/cn/bunny/services/utils/system/UserUtil.java rename to auth-system/services/src/main/java/cn/bunny/services/utils/system/UserUtil.java diff --git a/common/common-config/pom.xml b/common/common-config/pom.xml index 34068b1..150f681 100644 --- a/common/common-config/pom.xml +++ b/common/common-config/pom.xml @@ -3,7 +3,7 @@ 4.0.0 cn.bunny - auth-server + common 0.0.1-SNAPSHOT @@ -20,7 +20,7 @@ cn.bunny - domain-system + domain 0.0.1-SNAPSHOT diff --git a/auth-services/domain/pom.xml b/common/common-domain/pom.xml similarity index 88% rename from auth-services/domain/pom.xml rename to common/common-domain/pom.xml index ec5b8ff..be0557e 100644 --- a/auth-services/domain/pom.xml +++ b/common/common-domain/pom.xml @@ -3,41 +3,31 @@ 4.0.0 cn.bunny - auth-services + common 0.0.1-SNAPSHOT - domain - pom + common-domain + jar - domain + common-domain https://maven.apache.org - - domain-common - domain-system - UTF-8 - - - org.projectlombok - lombok - - org.springframework.boot spring-boot-starter-security - + - com.baomidou - mybatis-plus-spring-boot3-starter + org.projectlombok + lombok @@ -56,10 +46,17 @@ 1.6.14 + + + com.baomidou + mybatis-plus-spring-boot3-starter + + com.alibaba.fastjson2 fastjson2 + diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/LocalDateTimeConstant.java b/common/common-domain/src/main/java/cn/bunny/domain/constant/LocalDateTimeConstant.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/LocalDateTimeConstant.java rename to common/common-domain/src/main/java/cn/bunny/domain/constant/LocalDateTimeConstant.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/MinioConstant.java b/common/common-domain/src/main/java/cn/bunny/domain/constant/MinioConstant.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/MinioConstant.java rename to common/common-domain/src/main/java/cn/bunny/domain/constant/MinioConstant.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/RedisUserConstant.java b/common/common-domain/src/main/java/cn/bunny/domain/constant/RedisUserConstant.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/RedisUserConstant.java rename to common/common-domain/src/main/java/cn/bunny/domain/constant/RedisUserConstant.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/SecurityConfigConstant.java b/common/common-domain/src/main/java/cn/bunny/domain/constant/SecurityConfigConstant.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/SecurityConfigConstant.java rename to common/common-domain/src/main/java/cn/bunny/domain/constant/SecurityConfigConstant.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/UserConstant.java b/common/common-domain/src/main/java/cn/bunny/domain/constant/UserConstant.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/constant/UserConstant.java rename to common/common-domain/src/main/java/cn/bunny/domain/constant/UserConstant.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/entity/BaseEntity.java b/common/common-domain/src/main/java/cn/bunny/domain/entity/BaseEntity.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/entity/BaseEntity.java rename to common/common-domain/src/main/java/cn/bunny/domain/entity/BaseEntity.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/entity/BaseUserEntity.java b/common/common-domain/src/main/java/cn/bunny/domain/entity/BaseUserEntity.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/entity/BaseUserEntity.java rename to common/common-domain/src/main/java/cn/bunny/domain/entity/BaseUserEntity.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/enums/EmailTemplateEnums.java b/common/common-domain/src/main/java/cn/bunny/domain/enums/EmailTemplateEnums.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/enums/EmailTemplateEnums.java rename to common/common-domain/src/main/java/cn/bunny/domain/enums/EmailTemplateEnums.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/enums/JobEnums.java b/common/common-domain/src/main/java/cn/bunny/domain/enums/JobEnums.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/enums/JobEnums.java rename to common/common-domain/src/main/java/cn/bunny/domain/enums/JobEnums.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/enums/LoginEnums.java b/common/common-domain/src/main/java/cn/bunny/domain/enums/LoginEnums.java similarity index 83% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/enums/LoginEnums.java rename to common/common-domain/src/main/java/cn/bunny/domain/enums/LoginEnums.java index 54ddc7d..d27c239 100644 --- a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/enums/LoginEnums.java +++ b/common/common-domain/src/main/java/cn/bunny/domain/enums/LoginEnums.java @@ -9,8 +9,6 @@ public enum LoginEnums { EMAIL_STRATEGY("email"), // 默认登录请求 default_STRATEGY("default"), - // 登良路请求API - LOGIN_REQUEST_API("/api/login"), ; private final String value; diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/model/email/EmailSend.java b/common/common-domain/src/main/java/cn/bunny/domain/model/email/EmailSend.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/model/email/EmailSend.java rename to common/common-domain/src/main/java/cn/bunny/domain/model/email/EmailSend.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/model/email/EmailSendInit.java b/common/common-domain/src/main/java/cn/bunny/domain/model/email/EmailSendInit.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/model/email/EmailSendInit.java rename to common/common-domain/src/main/java/cn/bunny/domain/model/email/EmailSendInit.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/model/file/MinioFilePath.java b/common/common-domain/src/main/java/cn/bunny/domain/model/file/MinioFilePath.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/model/file/MinioFilePath.java rename to common/common-domain/src/main/java/cn/bunny/domain/model/file/MinioFilePath.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/model/quartz/ScheduleExecuteLogJson.java b/common/common-domain/src/main/java/cn/bunny/domain/model/quartz/ScheduleExecuteLogJson.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/model/quartz/ScheduleExecuteLogJson.java rename to common/common-domain/src/main/java/cn/bunny/domain/model/quartz/ScheduleExecuteLogJson.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/views/ViewRolePower.java b/common/common-domain/src/main/java/cn/bunny/domain/views/ViewRolePower.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/views/ViewRolePower.java rename to common/common-domain/src/main/java/cn/bunny/domain/views/ViewRolePower.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/views/ViewRouterRole.java b/common/common-domain/src/main/java/cn/bunny/domain/views/ViewRouterRole.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/views/ViewRouterRole.java rename to common/common-domain/src/main/java/cn/bunny/domain/views/ViewRouterRole.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/views/ViewUserDept.java b/common/common-domain/src/main/java/cn/bunny/domain/views/ViewUserDept.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/views/ViewUserDept.java rename to common/common-domain/src/main/java/cn/bunny/domain/views/ViewUserDept.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/BaseUserVo.java b/common/common-domain/src/main/java/cn/bunny/domain/vo/BaseUserVo.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/BaseUserVo.java rename to common/common-domain/src/main/java/cn/bunny/domain/vo/BaseUserVo.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/BaseVo.java b/common/common-domain/src/main/java/cn/bunny/domain/vo/BaseVo.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/BaseVo.java rename to common/common-domain/src/main/java/cn/bunny/domain/vo/BaseVo.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/result/PageResult.java b/common/common-domain/src/main/java/cn/bunny/domain/vo/result/PageResult.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/result/PageResult.java rename to common/common-domain/src/main/java/cn/bunny/domain/vo/result/PageResult.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/result/Result.java b/common/common-domain/src/main/java/cn/bunny/domain/vo/result/Result.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/result/Result.java rename to common/common-domain/src/main/java/cn/bunny/domain/vo/result/Result.java diff --git a/auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/result/ResultCodeEnum.java b/common/common-domain/src/main/java/cn/bunny/domain/vo/result/ResultCodeEnum.java similarity index 100% rename from auth-services/domain/domain-common/src/main/java/cn/bunny/domain/vo/result/ResultCodeEnum.java rename to common/common-domain/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 f3acc0a..5da18f5 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 bac86e6..85ff8c6 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -11,9 +11,10 @@ pom common - http://maven.apache.org + https://maven.apache.org + common-domain common-config generator-code diff --git a/pom.xml b/pom.xml index ed873c6..65855e8 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ common auth-admin - auth-services + auth-system