From 13307a6b9ecbd8e0557483363102e3bc04e9c5af Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Thu, 22 May 2025 12:13:41 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20feat:=20=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigurationController.java | 4 +- .../EmailTemplateController.java | 15 +++--- .../configuration/EmailUsersController.java | 15 +++--- .../configuration/I18nController.java | 12 ++--- .../configuration/I18nTypeController.java | 8 ++-- .../configuration/MenuIconController.java | 10 ++-- .../controller/file/FilesController.java | 12 ++--- .../file/FilesParDetailController.java | 6 +-- .../log/ScheduleExecuteLogController.java | 6 +-- .../log/UserLoginLogController.java | 8 ++-- .../controller/message/MessageController.java | 14 +++--- .../message/MessageReceivedController.java | 12 ++--- .../message/MessageTypeController.java | 10 ++-- .../schedule/SchedulersController.java | 10 ++-- .../schedule/SchedulersGroupController.java | 10 ++-- .../controller/system/DeptController.java | 10 ++-- .../system/PermissionController.java | 12 ++--- .../controller/system/RoleController.java | 10 ++-- .../system/RolePermissionController.java | 2 +- .../controller/system/RouterController.java | 8 ++-- .../controller/system/UserController.java | 12 ++--- .../system/UserLoginController.java | 8 ++-- .../controller/system/UserRoleController.java | 2 +- .../java/impl/BuildPermissionApiTest.java | 2 +- .../domain/common/ValidationGroups.java | 12 +++++ .../dto/WebConfigurationDto.java | 2 +- .../entity/WebConfiguration.java | 2 +- .../domain/email/dto/EmailTemplateDto.java | 47 +++++++++++++++++++ .../dto/EmailUsersDto.java} | 22 ++++----- .../email/entity/EmailTemplate.java | 2 +- .../{system => }/email/entity/EmailUsers.java | 2 +- .../email/vo/EmailTemplateVo.java | 2 +- .../{system => }/email/vo/EmailUsersVo.java | 2 +- .../{system => }/files/dto/FileUploadDto.java | 2 +- .../files/dto/FilesAddOrUpdateDto.java | 2 +- .../{system => }/files/dto/FilesDto.java | 2 +- .../files/dto/FilesParDetailDto.java | 2 +- .../files/dto/UploadThumbnail.java | 2 +- .../{system => }/files/entity/Files.java | 2 +- .../files/entity/FilesParDetail.java | 2 +- .../{system => }/files/vo/FileInfoVo.java | 2 +- .../files/vo/FilesParDetailVo.java | 2 +- .../domain/{system => }/files/vo/FilesVo.java | 2 +- .../{system => }/i18n/dto/I18nAddDto.java | 2 +- .../domain/{system => }/i18n/dto/I18nDto.java | 2 +- .../{system => }/i18n/dto/I18nTypeAddDto.java | 2 +- .../{system => }/i18n/dto/I18nTypeDto.java | 2 +- .../i18n/dto/I18nTypeUpdateDto.java | 2 +- .../i18n/dto/I18nUpdateByFileDto.java | 2 +- .../{system => }/i18n/dto/I18nUpdateDto.java | 2 +- .../domain/{system => }/i18n/entity/I18n.java | 2 +- .../{system => }/i18n/entity/I18nType.java | 2 +- .../{system => }/i18n/vo/I18nTypeVo.java | 2 +- .../domain/{system => }/i18n/vo/I18nVo.java | 2 +- .../log/dto/ScheduleExecuteLogDto.java | 2 +- .../{system => }/log/dto/UserLoginLogDto.java | 2 +- .../log/entity/ScheduleExecuteLog.java | 2 +- .../{system => }/log/entity/UserLoginLog.java | 2 +- .../log/vo/ScheduleExecuteLogVo.java | 2 +- .../log/vo/UserLoginLogLocalVo.java | 2 +- .../{system => }/log/vo/UserLoginLogVo.java | 2 +- .../menuIcon/dto/MenuIconAddDto.java | 2 +- .../menuIcon/dto/MenuIconDto.java | 2 +- .../menuIcon/dto/MenuIconUpdateDto.java | 2 +- .../menuIcon/entity/MenuIcon.java | 2 +- .../{system => }/menuIcon/vo/MenuIconVo.java | 2 +- .../message/dto/MessageAddDto.java | 2 +- .../{system => }/message/dto/MessageDto.java | 2 +- .../message/dto/MessageReceivedDto.java | 2 +- .../message/dto/MessageReceivedUpdateDto.java | 2 +- .../message/dto/MessageTypeAddDto.java | 2 +- .../message/dto/MessageTypeDto.java | 2 +- .../message/dto/MessageTypeUpdateDto.java | 2 +- .../message/dto/MessageUpdateDto.java | 2 +- .../message/dto/MessageUserDto.java | 2 +- .../{system => }/message/entity/Message.java | 2 +- .../message/entity/MessageReceived.java | 2 +- .../message/entity/MessageType.java | 2 +- .../message/vo/MessageDetailVo.java | 2 +- .../vo/MessageReceivedWithMessageVo.java | 2 +- .../message/vo/MessageReceivedWithUserVo.java | 2 +- .../message/vo/MessageTypeVo.java | 2 +- .../message/vo/MessageUserVo.java | 2 +- .../{system => }/message/vo/MessageVo.java | 2 +- .../quartz/dto/SchedulersAddDto.java | 2 +- .../quartz/dto/SchedulersDto.java | 2 +- .../quartz/dto/SchedulersGroupAddDto.java | 2 +- .../quartz/dto/SchedulersGroupDto.java | 2 +- .../quartz/dto/SchedulersGroupUpdateDto.java | 2 +- .../quartz/dto/SchedulersUpdateDto.java | 2 +- .../quartz/entity/Schedulers.java | 2 +- .../quartz/entity/SchedulersGroup.java | 2 +- .../quartz/vo/SchedulersGroupVo.java | 2 +- .../{system => }/quartz/vo/SchedulersVo.java | 2 +- .../dto/AssignPowersToRoleDto.java | 2 +- .../{system => }/dto/dept/DeptAddDto.java | 2 +- .../system/{system => }/dto/dept/DeptDto.java | 2 +- .../{system => }/dto/dept/DeptUpdateDto.java | 2 +- .../dto/power/PermissionAddDto.java | 2 +- .../{system => }/dto/power/PermissionDto.java | 2 +- .../PermissionUpdateBatchByParentIdDto.java | 2 +- .../dto/power/PermissionUpdateDto.java | 2 +- .../{system => }/dto/role/RoleAddDto.java | 2 +- .../system/{system => }/dto/role/RoleDto.java | 2 +- .../{system => }/dto/role/RoleUpdateDto.java | 2 +- .../{system => }/dto/router/RouterAddDto.java | 4 +- .../dto/router/RouterUpdateDto.java | 4 +- .../dto/user/AdminUserAddDto.java | 2 +- .../{system => }/dto/user/AdminUserDto.java | 2 +- .../user/AdminUserUpdateByLocalUserDto.java | 2 +- .../dto/user/AdminUserUpdateDto.java | 2 +- .../dto/user/AssignRolesToUsersDto.java | 2 +- .../{system => }/dto/user/LoginDto.java | 2 +- .../dto/user/RefreshTokenDto.java | 2 +- .../system/email/dto/EmailTemplateAddDto.java | 41 ---------------- .../system/email/dto/EmailTemplateDto.java | 32 ------------- .../email/dto/EmailTemplateUpdateDto.java | 45 ------------------ .../system/email/dto/EmailUsersAddDto.java | 41 ---------------- .../system/email/dto/EmailUsersDto.java | 33 ------------- .../system/{system => }/entity/AdminUser.java | 2 +- .../system/{system => }/entity/Dept.java | 2 +- .../{system => }/entity/Permission.java | 2 +- .../system/{system => }/entity/Role.java | 2 +- .../{system => }/entity/RolePermission.java | 2 +- .../{system => }/entity/RouterRole.java | 2 +- .../system/{system => }/entity/UserDept.java | 2 +- .../system/{system => }/entity/UserRole.java | 2 +- .../{system => }/entity/router/Router.java | 2 +- .../entity/router/RouterMeta.java | 2 +- .../entity/router/RouterMetaTransition.java | 2 +- .../views/ViewRolePermission.java | 2 +- .../{system => }/views/ViewRouterRole.java | 2 +- .../{system => }/views/ViewUserDept.java | 2 +- .../domain/system/{system => }/vo/DeptVo.java | 2 +- .../system/{system => }/vo/PermissionVo.java | 2 +- .../domain/system/{system => }/vo/RoleVo.java | 2 +- .../vo/router/RouterManageVo.java | 2 +- .../{system => }/vo/router/RouterVo.java | 2 +- .../vo/router/WebUserRouterVo.java | 4 +- .../{system => }/vo/user/AdminUserVo.java | 2 +- .../{system => }/vo/user/RefreshTokenVo.java | 2 +- .../system/{system => }/vo/user/UserVo.java | 2 +- .../configuration/EmailTemplateMapper.java | 6 +-- .../configuration/EmailUsersMapper.java | 6 +-- .../mapper/configuration/I18nMapper.java | 6 +-- .../mapper/configuration/I18nTypeMapper.java | 4 +- .../mapper/configuration/MenuIconMapper.java | 6 +-- .../services/mapper/file/FilesMapper.java | 6 +-- .../mapper/file/FilesParDetailMapper.java | 6 +-- .../mapper/log/ScheduleExecuteLogMapper.java | 6 +-- .../mapper/log/UserLoginLogMapper.java | 6 +-- .../mapper/message/MessageMapper.java | 10 ++-- .../mapper/message/MessageReceivedMapper.java | 12 ++--- .../mapper/message/MessageTypeMapper.java | 6 +-- .../schedule/SchedulersGroupMapper.java | 6 +-- .../mapper/schedule/SchedulersMapper.java | 4 +- .../services/mapper/system/DeptMapper.java | 6 +-- .../mapper/system/PermissionMapper.java | 6 +-- .../services/mapper/system/RoleMapper.java | 6 +-- .../mapper/system/RolePermissionMapper.java | 4 +- .../services/mapper/system/RouterMapper.java | 4 +- .../mapper/system/RouterRoleMapper.java | 4 +- .../mapper/system/UserDeptMapper.java | 2 +- .../services/mapper/system/UserMapper.java | 6 +-- .../mapper/system/UserRoleMapper.java | 2 +- .../configuration/EmailTemplateMapper.xml | 4 +- .../mapper/configuration/EmailUsersMapper.xml | 4 +- .../mapper/configuration/I18nMapper.xml | 4 +- .../mapper/configuration/I18nTypeMapper.xml | 4 +- .../mapper/configuration/MenuIconMapper.xml | 4 +- .../resources/mapper/file/FilesMapper.xml | 4 +- .../mapper/file/FilesPardetailMapper.xml | 4 +- .../mapper/log/ScheduleExecuteLogMapper.xml | 4 +- .../mapper/log/UserLoginLogMapper.xml | 6 +-- .../mapper/message/MessageMapper.xml | 8 ++-- .../mapper/message/MessageReceivedMapper.xml | 6 +-- .../mapper/message/MessageTypeMapper.xml | 4 +- .../mapper/schedule/SchedulersGroupMapper.xml | 4 +- .../mapper/schedule/SchedulersMapper.xml | 4 +- .../resources/mapper/system/DeptMapper.xml | 4 +- .../mapper/system/PermissionMapper.xml | 6 +-- .../resources/mapper/system/RoleMapper.xml | 8 ++-- .../mapper/system/RolePermissionMapper.xml | 8 ++-- .../resources/mapper/system/RouterMapper.xml | 4 +- .../mapper/system/RouterRoleMapper.xml | 4 +- .../mapper/system/UserDeptMapper.xml | 2 +- .../resources/mapper/system/UserMapper.xml | 6 +-- .../mapper/system/UserRoleMapper.xml | 4 +- .../services/aop/aspect/JobExecuteAspect.java | 2 +- .../cache/UserAuthorizationCacheService.java | 4 +- .../cache/UserLoginVoBuilderCacheService.java | 6 +-- .../listener/excel/I18nExcelListener.java | 2 +- .../excel/PermissionExcelListener.java | 2 +- .../listener/excel/RoleExcelListener.java | 2 +- .../user/AbstractUserInfoUpdateHandler.java | 2 +- .../listener/user/UserinfoUpdateListener.java | 4 +- .../strategy/login/DefaultLoginStrategy.java | 4 +- .../strategy/login/EmailLoginStrategy.java | 4 +- .../core/strategy/login/LoginContext.java | 4 +- .../core/strategy/login/LoginStrategy.java | 4 +- .../email/AbstractSenderEmailTemplate.java | 4 +- .../email/ConcreteSenderEmailTemplate.java | 2 +- .../bunny/services/core/utils/RoleHelper.java | 2 +- .../core/utils/RouterServiceHelper.java | 12 ++--- .../security/config/MethodSecurityConfig.java | 2 +- .../service/PermissionCheckService.java | 4 +- .../configuration/ConfigurationService.java | 4 +- .../configuration/EmailTemplateService.java | 12 ++--- .../configuration/EmailUsersService.java | 12 ++--- .../service/configuration/I18nService.java | 12 ++--- .../configuration/I18nTypeService.java | 10 ++-- .../configuration/MenuIconService.java | 10 ++-- .../impl/ConfigurationServiceImpl.java | 4 +- .../impl/EmailTemplateServiceImpl.java | 18 +++---- .../impl/EmailUsersServiceImpl.java | 14 +++--- .../configuration/impl/I18nServiceImpl.java | 14 +++--- .../impl/I18nTypeServiceImpl.java | 10 ++-- .../impl/MenuIconServiceImpl.java | 10 ++-- .../service/file/FilesParDetailService.java | 6 +-- .../services/service/file/FilesService.java | 14 +++--- .../service/file/impl/FileDetailService.java | 4 +- .../file/impl/FilesParDetailServiceImpl.java | 6 +-- .../service/file/impl/FilesServiceImpl.java | 14 +++--- .../log/ScheduleExecuteLogService.java | 6 +-- .../service/log/UserLoginLogService.java | 8 ++-- .../impl/ScheduleExecuteLogServiceImpl.java | 6 +-- .../log/impl/UserLoginLogServiceImpl.java | 8 ++-- .../message/MessageReceivedService.java | 14 +++--- .../service/message/MessageService.java | 14 +++--- .../service/message/MessageTypeService.java | 10 ++-- .../impl/MessageReceivedServiceImpl.java | 14 +++--- .../message/impl/MessageServiceImpl.java | 18 +++---- .../message/impl/MessageTypeServiceImpl.java | 10 ++-- .../schedule/SchedulersGroupService.java | 10 ++-- .../service/schedule/SchedulersService.java | 10 ++-- .../impl/SchedulersGroupServiceImpl.java | 10 ++-- .../schedule/impl/SchedulersServiceImpl.java | 10 ++-- .../services/service/system/DeptService.java | 10 ++-- .../service/system/PermissionService.java | 12 ++--- .../service/system/RolePermissionService.java | 4 +- .../services/service/system/RoleService.java | 10 ++-- .../service/system/RouterRoleService.java | 2 +- .../service/system/RouterService.java | 10 ++-- .../service/system/UserDeptService.java | 2 +- .../service/system/UserLoginService.java | 10 ++-- .../service/system/UserRoleService.java | 4 +- .../services/service/system/UserService.java | 12 ++--- .../service/system/impl/DeptServiceImpl.java | 10 ++-- .../system/impl/PermissionServiceImpl.java | 12 ++--- .../impl/RolePermissionServiceImpl.java | 8 ++-- .../service/system/impl/RoleServiceImpl.java | 10 ++-- .../system/impl/RouterRoleServiceImpl.java | 2 +- .../system/impl/RouterServiceImpl.java | 20 ++++---- .../system/impl/UserDeptServiceImpl.java | 2 +- .../system/impl/UserLoginServiceImpl.java | 14 +++--- .../system/impl/UserRoleServiceImpl.java | 6 +-- .../service/system/impl/UserServiceImpl.java | 24 +++++----- 257 files changed, 694 insertions(+), 835 deletions(-) create mode 100644 auth-core/src/main/java/cn/bunny/services/domain/common/ValidationGroups.java rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/configuration/dto/WebConfigurationDto.java (98%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/configuration/entity/WebConfiguration.java (98%) create mode 100644 auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailTemplateDto.java rename auth-core/src/main/java/cn/bunny/services/domain/{system/email/dto/EmailUsersUpdateDto.java => email/dto/EmailUsersDto.java} (56%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/email/entity/EmailTemplate.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/email/entity/EmailUsers.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/email/vo/EmailTemplateVo.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/email/vo/EmailUsersVo.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/files/dto/FileUploadDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/files/dto/FilesAddOrUpdateDto.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/files/dto/FilesDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/files/dto/FilesParDetailDto.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/files/dto/UploadThumbnail.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/files/entity/Files.java (98%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/files/entity/FilesParDetail.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/files/vo/FileInfoVo.java (97%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/files/vo/FilesParDetailVo.java (97%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/files/vo/FilesVo.java (98%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/i18n/dto/I18nAddDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/i18n/dto/I18nDto.java (92%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/i18n/dto/I18nTypeAddDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/i18n/dto/I18nTypeDto.java (91%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/i18n/dto/I18nTypeUpdateDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/i18n/dto/I18nUpdateByFileDto.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/i18n/dto/I18nUpdateDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/i18n/entity/I18n.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/i18n/entity/I18nType.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/i18n/vo/I18nTypeVo.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/i18n/vo/I18nVo.java (92%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/log/dto/ScheduleExecuteLogDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/log/dto/UserLoginLogDto.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/log/entity/ScheduleExecuteLog.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/log/entity/UserLoginLog.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/log/vo/ScheduleExecuteLogVo.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/log/vo/UserLoginLogLocalVo.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/log/vo/UserLoginLogVo.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/menuIcon/dto/MenuIconAddDto.java (92%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/menuIcon/dto/MenuIconDto.java (90%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/menuIcon/dto/MenuIconUpdateDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/menuIcon/entity/MenuIcon.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/menuIcon/vo/MenuIconVo.java (90%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/dto/MessageAddDto.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/dto/MessageDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/dto/MessageReceivedDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/dto/MessageReceivedUpdateDto.java (91%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/dto/MessageTypeAddDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/dto/MessageTypeDto.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/dto/MessageTypeUpdateDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/dto/MessageUpdateDto.java (97%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/dto/MessageUserDto.java (92%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/entity/Message.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/entity/MessageReceived.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/entity/MessageType.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/vo/MessageDetailVo.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/vo/MessageReceivedWithMessageVo.java (97%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/vo/MessageReceivedWithUserVo.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/vo/MessageTypeVo.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/vo/MessageUserVo.java (97%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/message/vo/MessageVo.java (97%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/quartz/dto/SchedulersAddDto.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/quartz/dto/SchedulersDto.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/quartz/dto/SchedulersGroupAddDto.java (92%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/quartz/dto/SchedulersGroupDto.java (91%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/quartz/dto/SchedulersGroupUpdateDto.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/quartz/dto/SchedulersUpdateDto.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/quartz/entity/Schedulers.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/quartz/entity/SchedulersGroup.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/quartz/vo/SchedulersGroupVo.java (91%) rename auth-core/src/main/java/cn/bunny/services/domain/{system => }/quartz/vo/SchedulersVo.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/AssignPowersToRoleDto.java (92%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/dept/DeptAddDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/dept/DeptDto.java (89%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/dept/DeptUpdateDto.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/power/PermissionAddDto.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/power/PermissionDto.java (92%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/power/PermissionUpdateBatchByParentIdDto.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/power/PermissionUpdateDto.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/role/RoleAddDto.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/role/RoleDto.java (89%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/role/RoleUpdateDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/router/RouterAddDto.java (90%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/router/RouterUpdateDto.java (90%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/user/AdminUserAddDto.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/user/AdminUserDto.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/user/AdminUserUpdateByLocalUserDto.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/user/AdminUserUpdateDto.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/user/AssignRolesToUsersDto.java (90%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/user/LoginDto.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/dto/user/RefreshTokenDto.java (92%) delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailTemplateAddDto.java delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailTemplateDto.java delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailTemplateUpdateDto.java delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailUsersAddDto.java delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailUsersDto.java rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/entity/AdminUser.java (97%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/entity/Dept.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/entity/Permission.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/entity/Role.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/entity/RolePermission.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/entity/RouterRole.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/entity/UserDept.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/entity/UserRole.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/entity/router/Router.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/entity/router/RouterMeta.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/entity/router/RouterMetaTransition.java (90%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/views/ViewRolePermission.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/views/ViewRouterRole.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/views/ViewUserDept.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/vo/DeptVo.java (92%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/vo/PermissionVo.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/vo/RoleVo.java (91%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/vo/router/RouterManageVo.java (98%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/vo/router/RouterVo.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/vo/router/WebUserRouterVo.java (92%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/vo/user/AdminUserVo.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/vo/user/RefreshTokenVo.java (91%) rename auth-core/src/main/java/cn/bunny/services/domain/system/{system => }/vo/user/UserVo.java (94%) diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java index 92cffc9..8ac8da1 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java @@ -3,8 +3,8 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.configuration.dto.WebConfigurationDto; -import cn.bunny.services.domain.system.configuration.entity.WebConfiguration; +import cn.bunny.services.domain.configuration.dto.WebConfigurationDto; +import cn.bunny.services.domain.configuration.entity.WebConfiguration; import cn.bunny.services.service.configuration.ConfigurationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java index 815aa4c..39a9e5e 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java @@ -1,21 +1,20 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; +import cn.bunny.services.domain.common.ValidationGroups; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.email.dto.EmailTemplateAddDto; -import cn.bunny.services.domain.system.email.dto.EmailTemplateDto; -import cn.bunny.services.domain.system.email.dto.EmailTemplateUpdateDto; -import cn.bunny.services.domain.system.email.entity.EmailTemplate; -import cn.bunny.services.domain.system.email.vo.EmailTemplateVo; +import cn.bunny.services.domain.email.dto.EmailTemplateDto; +import cn.bunny.services.domain.email.entity.EmailTemplate; +import cn.bunny.services.domain.email.vo.EmailTemplateVo; import cn.bunny.services.service.configuration.EmailTemplateService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -55,7 +54,7 @@ public class EmailTemplateController { @Operation(summary = "添加邮件模板", description = "添加邮件模板") @PermissionTag(permission = "emailTemplate:add") @PostMapping() - public Result addEmailTemplate(@Valid @RequestBody EmailTemplateAddDto dto) { + public Result addEmailTemplate(@Validated(ValidationGroups.Add.class) @RequestBody EmailTemplateDto dto) { emailTemplateService.addEmailTemplate(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @@ -63,7 +62,7 @@ public class EmailTemplateController { @Operation(summary = "更新邮件模板", description = "更新邮件模板") @PermissionTag(permission = "emailTemplate:update") @PutMapping() - public Result updateEmailTemplate(@Valid @RequestBody EmailTemplateUpdateDto dto) { + public Result updateEmailTemplate(@Validated(ValidationGroups.Update.class) @RequestBody EmailTemplateDto dto) { emailTemplateService.updateEmailTemplate(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java index be88799..afd6eca 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java @@ -1,21 +1,20 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; +import cn.bunny.services.domain.common.ValidationGroups; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.email.dto.EmailUsersAddDto; -import cn.bunny.services.domain.system.email.dto.EmailUsersDto; -import cn.bunny.services.domain.system.email.dto.EmailUsersUpdateDto; -import cn.bunny.services.domain.system.email.entity.EmailUsers; -import cn.bunny.services.domain.system.email.vo.EmailUsersVo; +import cn.bunny.services.domain.email.dto.EmailUsersDto; +import cn.bunny.services.domain.email.entity.EmailUsers; +import cn.bunny.services.domain.email.vo.EmailUsersVo; import cn.bunny.services.service.configuration.EmailUsersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -55,7 +54,7 @@ public class EmailUsersController { @Operation(summary = "添加邮箱用户配置", description = "添加邮箱用户配置") @PermissionTag(permission = "emailUsers:add") @PostMapping() - public Result addEmailUsers(@Valid @RequestBody EmailUsersAddDto dto) { + public Result addEmailUsers(@Validated(ValidationGroups.Add.class) @RequestBody EmailUsersDto dto) { emailUsersService.addEmailUsers(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @@ -63,7 +62,7 @@ public class EmailUsersController { @Operation(summary = "更新邮箱用户配置", description = "更新邮箱用户配置") @PermissionTag(permission = "emailUsers:update") @PutMapping() - public Result updateEmailUsers(@Valid @RequestBody EmailUsersUpdateDto dto) { + public Result updateEmailUsers(@Validated(ValidationGroups.Update.class) @RequestBody EmailUsersDto dto) { emailUsersService.updateEmailUsers(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java index 5ed131b..0e48d37 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java @@ -4,12 +4,12 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.i18n.dto.I18nAddDto; -import cn.bunny.services.domain.system.i18n.dto.I18nDto; -import cn.bunny.services.domain.system.i18n.dto.I18nUpdateByFileDto; -import cn.bunny.services.domain.system.i18n.dto.I18nUpdateDto; -import cn.bunny.services.domain.system.i18n.entity.I18n; -import cn.bunny.services.domain.system.i18n.vo.I18nVo; +import cn.bunny.services.domain.i18n.dto.I18nAddDto; +import cn.bunny.services.domain.i18n.dto.I18nDto; +import cn.bunny.services.domain.i18n.dto.I18nUpdateByFileDto; +import cn.bunny.services.domain.i18n.dto.I18nUpdateDto; +import cn.bunny.services.domain.i18n.entity.I18n; +import cn.bunny.services.domain.i18n.vo.I18nVo; import cn.bunny.services.service.configuration.I18nService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java index b34d9cc..21349fd 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java @@ -3,10 +3,10 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.i18n.dto.I18nTypeAddDto; -import cn.bunny.services.domain.system.i18n.dto.I18nTypeDto; -import cn.bunny.services.domain.system.i18n.dto.I18nTypeUpdateDto; -import cn.bunny.services.domain.system.i18n.vo.I18nTypeVo; +import cn.bunny.services.domain.i18n.dto.I18nTypeAddDto; +import cn.bunny.services.domain.i18n.dto.I18nTypeDto; +import cn.bunny.services.domain.i18n.dto.I18nTypeUpdateDto; +import cn.bunny.services.domain.i18n.vo.I18nTypeVo; import cn.bunny.services.service.configuration.I18nTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java index a867532..f5ddf80 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java @@ -4,11 +4,11 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.menuIcon.dto.MenuIconAddDto; -import cn.bunny.services.domain.system.menuIcon.dto.MenuIconDto; -import cn.bunny.services.domain.system.menuIcon.dto.MenuIconUpdateDto; -import cn.bunny.services.domain.system.menuIcon.entity.MenuIcon; -import cn.bunny.services.domain.system.menuIcon.vo.MenuIconVo; +import cn.bunny.services.domain.menuIcon.dto.MenuIconAddDto; +import cn.bunny.services.domain.menuIcon.dto.MenuIconDto; +import cn.bunny.services.domain.menuIcon.dto.MenuIconUpdateDto; +import cn.bunny.services.domain.menuIcon.entity.MenuIcon; +import cn.bunny.services.domain.menuIcon.vo.MenuIconVo; import cn.bunny.services.service.configuration.MenuIconService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/file/FilesController.java b/auth-api/src/main/java/cn/bunny/services/controller/file/FilesController.java index b8ce1a6..17f5b1d 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/file/FilesController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/file/FilesController.java @@ -5,12 +5,12 @@ import cn.bunny.services.domain.common.constant.FileStorageConstant; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.files.dto.FileUploadDto; -import cn.bunny.services.domain.system.files.dto.FilesAddOrUpdateDto; -import cn.bunny.services.domain.system.files.dto.FilesDto; -import cn.bunny.services.domain.system.files.entity.Files; -import cn.bunny.services.domain.system.files.vo.FileInfoVo; -import cn.bunny.services.domain.system.files.vo.FilesVo; +import cn.bunny.services.domain.files.dto.FileUploadDto; +import cn.bunny.services.domain.files.dto.FilesAddOrUpdateDto; +import cn.bunny.services.domain.files.dto.FilesDto; +import cn.bunny.services.domain.files.entity.Files; +import cn.bunny.services.domain.files.vo.FileInfoVo; +import cn.bunny.services.domain.files.vo.FilesVo; import cn.bunny.services.service.file.FilesService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java b/auth-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java index 4b801d9..50f4ca1 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java @@ -4,9 +4,9 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.files.dto.FilesParDetailDto; -import cn.bunny.services.domain.system.files.entity.FilesParDetail; -import cn.bunny.services.domain.system.files.vo.FilesParDetailVo; +import cn.bunny.services.domain.files.dto.FilesParDetailDto; +import cn.bunny.services.domain.files.entity.FilesParDetail; +import cn.bunny.services.domain.files.vo.FilesParDetailVo; import cn.bunny.services.service.file.FilesParDetailService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java b/auth-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java index 978bdce..5acebfd 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java @@ -4,9 +4,9 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.log.dto.ScheduleExecuteLogDto; -import cn.bunny.services.domain.system.log.entity.ScheduleExecuteLog; -import cn.bunny.services.domain.system.log.vo.ScheduleExecuteLogVo; +import cn.bunny.services.domain.log.dto.ScheduleExecuteLogDto; +import cn.bunny.services.domain.log.entity.ScheduleExecuteLog; +import cn.bunny.services.domain.log.vo.ScheduleExecuteLogVo; import cn.bunny.services.service.log.ScheduleExecuteLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java b/auth-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java index 0c25774..59278fc 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java @@ -4,10 +4,10 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.log.dto.UserLoginLogDto; -import cn.bunny.services.domain.system.log.entity.UserLoginLog; -import cn.bunny.services.domain.system.log.vo.UserLoginLogLocalVo; -import cn.bunny.services.domain.system.log.vo.UserLoginLogVo; +import cn.bunny.services.domain.log.dto.UserLoginLogDto; +import cn.bunny.services.domain.log.entity.UserLoginLog; +import cn.bunny.services.domain.log.vo.UserLoginLogLocalVo; +import cn.bunny.services.domain.log.vo.UserLoginLogVo; import cn.bunny.services.service.log.UserLoginLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java index 4d4c949..d954909 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java @@ -4,13 +4,13 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.message.dto.MessageAddDto; -import cn.bunny.services.domain.system.message.dto.MessageDto; -import cn.bunny.services.domain.system.message.dto.MessageUpdateDto; -import cn.bunny.services.domain.system.message.entity.Message; -import cn.bunny.services.domain.system.message.vo.MessageDetailVo; -import cn.bunny.services.domain.system.message.vo.MessageReceivedWithUserVo; -import cn.bunny.services.domain.system.message.vo.MessageVo; +import cn.bunny.services.domain.message.dto.MessageAddDto; +import cn.bunny.services.domain.message.dto.MessageDto; +import cn.bunny.services.domain.message.dto.MessageUpdateDto; +import cn.bunny.services.domain.message.entity.Message; +import cn.bunny.services.domain.message.vo.MessageDetailVo; +import cn.bunny.services.domain.message.vo.MessageReceivedWithUserVo; +import cn.bunny.services.domain.message.vo.MessageVo; import cn.bunny.services.service.message.MessageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java index a053d83..78ab30a 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java @@ -4,12 +4,12 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.message.dto.MessageReceivedDto; -import cn.bunny.services.domain.system.message.dto.MessageReceivedUpdateDto; -import cn.bunny.services.domain.system.message.dto.MessageUserDto; -import cn.bunny.services.domain.system.message.entity.Message; -import cn.bunny.services.domain.system.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.services.domain.system.message.vo.MessageUserVo; +import cn.bunny.services.domain.message.dto.MessageReceivedDto; +import cn.bunny.services.domain.message.dto.MessageReceivedUpdateDto; +import cn.bunny.services.domain.message.dto.MessageUserDto; +import cn.bunny.services.domain.message.entity.Message; +import cn.bunny.services.domain.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.services.domain.message.vo.MessageUserVo; import cn.bunny.services.service.message.MessageReceivedService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java index 39b63bb..23ebd58 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java @@ -4,11 +4,11 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.message.dto.MessageTypeAddDto; -import cn.bunny.services.domain.system.message.dto.MessageTypeDto; -import cn.bunny.services.domain.system.message.dto.MessageTypeUpdateDto; -import cn.bunny.services.domain.system.message.entity.MessageType; -import cn.bunny.services.domain.system.message.vo.MessageTypeVo; +import cn.bunny.services.domain.message.dto.MessageTypeAddDto; +import cn.bunny.services.domain.message.dto.MessageTypeDto; +import cn.bunny.services.domain.message.dto.MessageTypeUpdateDto; +import cn.bunny.services.domain.message.entity.MessageType; +import cn.bunny.services.domain.message.vo.MessageTypeVo; import cn.bunny.services.service.message.MessageTypeService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java b/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java index b190d8e..6d544f7 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java @@ -5,11 +5,11 @@ import cn.bunny.services.aop.scanner.QuartzSchedulersScanner; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.quartz.dto.SchedulersAddDto; -import cn.bunny.services.domain.system.quartz.dto.SchedulersDto; -import cn.bunny.services.domain.system.quartz.dto.SchedulersUpdateDto; -import cn.bunny.services.domain.system.quartz.entity.Schedulers; -import cn.bunny.services.domain.system.quartz.vo.SchedulersVo; +import cn.bunny.services.domain.quartz.dto.SchedulersAddDto; +import cn.bunny.services.domain.quartz.dto.SchedulersDto; +import cn.bunny.services.domain.quartz.dto.SchedulersUpdateDto; +import cn.bunny.services.domain.quartz.entity.Schedulers; +import cn.bunny.services.domain.quartz.vo.SchedulersVo; import cn.bunny.services.service.schedule.SchedulersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java b/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java index c4835b0..4e57a21 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java @@ -4,11 +4,11 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupAddDto; -import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupDto; -import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupUpdateDto; -import cn.bunny.services.domain.system.quartz.entity.SchedulersGroup; -import cn.bunny.services.domain.system.quartz.vo.SchedulersGroupVo; +import cn.bunny.services.domain.quartz.dto.SchedulersGroupAddDto; +import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto; +import cn.bunny.services.domain.quartz.dto.SchedulersGroupUpdateDto; +import cn.bunny.services.domain.quartz.entity.SchedulersGroup; +import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo; import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/DeptController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/DeptController.java index fc2336d..ea5e0b1 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/DeptController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/system/DeptController.java @@ -4,11 +4,11 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.system.dto.dept.DeptAddDto; -import cn.bunny.services.domain.system.system.dto.dept.DeptDto; -import cn.bunny.services.domain.system.system.dto.dept.DeptUpdateDto; -import cn.bunny.services.domain.system.system.entity.Dept; -import cn.bunny.services.domain.system.system.vo.DeptVo; +import cn.bunny.services.domain.system.dto.dept.DeptAddDto; +import cn.bunny.services.domain.system.dto.dept.DeptDto; +import cn.bunny.services.domain.system.dto.dept.DeptUpdateDto; +import cn.bunny.services.domain.system.entity.Dept; +import cn.bunny.services.domain.system.vo.DeptVo; import cn.bunny.services.service.system.DeptService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java index 85d971a..b35df20 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java @@ -6,12 +6,12 @@ import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.dto.scanner.ScannerControllerInfoVo; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.system.dto.power.PermissionAddDto; -import cn.bunny.services.domain.system.system.dto.power.PermissionDto; -import cn.bunny.services.domain.system.system.dto.power.PermissionUpdateBatchByParentIdDto; -import cn.bunny.services.domain.system.system.dto.power.PermissionUpdateDto; -import cn.bunny.services.domain.system.system.entity.Permission; -import cn.bunny.services.domain.system.system.vo.PermissionVo; +import cn.bunny.services.domain.system.dto.power.PermissionAddDto; +import cn.bunny.services.domain.system.dto.power.PermissionDto; +import cn.bunny.services.domain.system.dto.power.PermissionUpdateBatchByParentIdDto; +import cn.bunny.services.domain.system.dto.power.PermissionUpdateDto; +import cn.bunny.services.domain.system.entity.Permission; +import cn.bunny.services.domain.system.vo.PermissionVo; import cn.bunny.services.service.system.PermissionService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/RoleController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/RoleController.java index 3821b7d..cd052fd 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/RoleController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/system/RoleController.java @@ -4,11 +4,11 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.system.dto.role.RoleAddDto; -import cn.bunny.services.domain.system.system.dto.role.RoleDto; -import cn.bunny.services.domain.system.system.dto.role.RoleUpdateDto; -import cn.bunny.services.domain.system.system.entity.Role; -import cn.bunny.services.domain.system.system.vo.RoleVo; +import cn.bunny.services.domain.system.dto.role.RoleAddDto; +import cn.bunny.services.domain.system.dto.role.RoleDto; +import cn.bunny.services.domain.system.dto.role.RoleUpdateDto; +import cn.bunny.services.domain.system.entity.Role; +import cn.bunny.services.domain.system.vo.RoleVo; import cn.bunny.services.service.system.RoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java index 5a62c63..ec609f9 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java @@ -2,7 +2,7 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.system.dto.AssignPowersToRoleDto; +import cn.bunny.services.domain.system.dto.AssignPowersToRoleDto; import cn.bunny.services.service.system.RolePermissionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/RouterController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/RouterController.java index 43899c2..4f34bd6 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/RouterController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/system/RouterController.java @@ -3,10 +3,10 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.system.dto.router.RouterAddDto; -import cn.bunny.services.domain.system.system.dto.router.RouterUpdateDto; -import cn.bunny.services.domain.system.system.vo.router.RouterManageVo; -import cn.bunny.services.domain.system.system.vo.router.WebUserRouterVo; +import cn.bunny.services.domain.system.dto.router.RouterAddDto; +import cn.bunny.services.domain.system.dto.router.RouterUpdateDto; +import cn.bunny.services.domain.system.vo.router.RouterManageVo; +import cn.bunny.services.domain.system.vo.router.WebUserRouterVo; import cn.bunny.services.service.system.RouterService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/UserController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/UserController.java index 187babd..417b910 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/UserController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/system/UserController.java @@ -4,12 +4,12 @@ import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.system.dto.user.AdminUserAddDto; -import cn.bunny.services.domain.system.system.dto.user.AdminUserDto; -import cn.bunny.services.domain.system.system.dto.user.AdminUserUpdateDto; -import cn.bunny.services.domain.system.system.entity.AdminUser; -import cn.bunny.services.domain.system.system.vo.user.AdminUserVo; -import cn.bunny.services.domain.system.system.vo.user.UserVo; +import cn.bunny.services.domain.system.dto.user.AdminUserAddDto; +import cn.bunny.services.domain.system.dto.user.AdminUserDto; +import cn.bunny.services.domain.system.dto.user.AdminUserUpdateDto; +import cn.bunny.services.domain.system.entity.AdminUser; +import cn.bunny.services.domain.system.vo.user.AdminUserVo; +import cn.bunny.services.domain.system.vo.user.UserVo; import cn.bunny.services.service.system.UserService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java index af9e061..63c0abf 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java @@ -4,10 +4,10 @@ import cn.bunny.services.context.BaseContext; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.LoginVo; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.system.dto.user.AdminUserUpdateByLocalUserDto; -import cn.bunny.services.domain.system.system.dto.user.LoginDto; -import cn.bunny.services.domain.system.system.dto.user.RefreshTokenDto; -import cn.bunny.services.domain.system.system.vo.user.RefreshTokenVo; +import cn.bunny.services.domain.system.dto.user.AdminUserUpdateByLocalUserDto; +import cn.bunny.services.domain.system.dto.user.LoginDto; +import cn.bunny.services.domain.system.dto.user.RefreshTokenDto; +import cn.bunny.services.domain.system.vo.user.RefreshTokenVo; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.service.system.UserLoginService; import io.swagger.v3.oas.annotations.Operation; diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java index e1dffd3..f6e2ad8 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java @@ -2,7 +2,7 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.annotation.PermissionTag; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.system.system.dto.user.AssignRolesToUsersDto; +import cn.bunny.services.domain.system.dto.user.AssignRolesToUsersDto; import cn.bunny.services.service.system.UserRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auth-api/src/test/java/impl/BuildPermissionApiTest.java b/auth-api/src/test/java/impl/BuildPermissionApiTest.java index a9eef56..843a766 100644 --- a/auth-api/src/test/java/impl/BuildPermissionApiTest.java +++ b/auth-api/src/test/java/impl/BuildPermissionApiTest.java @@ -3,7 +3,7 @@ package impl; import cn.bunny.services.AuthServiceApplication; import cn.bunny.services.aop.scanner.ControllerApiPermissionScanner; import cn.bunny.services.domain.common.model.dto.scanner.ScannerControllerInfoVo; -import cn.bunny.services.domain.system.system.entity.Permission; +import cn.bunny.services.domain.system.entity.Permission; import cn.bunny.services.service.system.PermissionService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/ValidationGroups.java b/auth-core/src/main/java/cn/bunny/services/domain/common/ValidationGroups.java new file mode 100644 index 0000000..b494fd9 --- /dev/null +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/ValidationGroups.java @@ -0,0 +1,12 @@ +package cn.bunny.services.domain.common; + +public interface ValidationGroups { + interface QUERY { + } + + interface Add { + } + + interface Update { + } +} \ No newline at end of file diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/configuration/dto/WebConfigurationDto.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/WebConfigurationDto.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/domain/system/configuration/dto/WebConfigurationDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/WebConfigurationDto.java index 90c789e..79cf65e 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/configuration/dto/WebConfigurationDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/WebConfigurationDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.configuration.dto; +package cn.bunny.services.domain.configuration.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/configuration/entity/WebConfiguration.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/WebConfiguration.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/domain/system/configuration/entity/WebConfiguration.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/WebConfiguration.java index cc32ebc..598eeb7 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/configuration/entity/WebConfiguration.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/WebConfiguration.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.configuration.entity; +package cn.bunny.services.domain.configuration.entity; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailTemplateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailTemplateDto.java new file mode 100644 index 0000000..a21cc20 --- /dev/null +++ b/auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailTemplateDto.java @@ -0,0 +1,47 @@ +package cn.bunny.services.domain.email.dto; + +import cn.bunny.services.domain.common.ValidationGroups; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "EmailTemplateDto", title = "邮箱模板请求内容", description = "邮箱模板请求内容") +public class EmailTemplateDto { + + @Schema(name = "id", title = "主键") + @NotNull(message = "id不能为空", groups = {ValidationGroups.Update.class}) + private Long id; + + @Schema(name = "templateName", title = "模板名称") + @NotBlank(message = "模板名称不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private String templateName; + + @Schema(name = "emailUser", title = "配置邮件用户") + @NotNull(message = "配置邮件用户不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private Long emailUser; + + @Schema(name = "subject", title = "主题") + @NotBlank(message = "主题不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private String subject; + + @Schema(name = "body", title = "邮件内容") + @NotBlank(message = "邮件内容不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private String body; + + @Schema(name = "type", title = "邮件类型") + private String type; + + @Schema(name = "isDefault", title = "是否默认") + @NotNull(message = "是否默认不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private Boolean isDefault; + +} + diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailUsersUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailUsersDto.java similarity index 56% rename from auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailUsersUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailUsersDto.java index 04afa9c..ed80e97 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailUsersUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailUsersDto.java @@ -1,5 +1,7 @@ -package cn.bunny.services.domain.system.email.dto; +package cn.bunny.services.domain.email.dto; +import cn.bunny.services.domain.common.ValidationGroups.Add; +import cn.bunny.services.domain.common.ValidationGroups.Update; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -12,27 +14,27 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Builder -@Schema(name = "EmailUsersUpdateDto对象", title = "更新邮箱用户发送配置", description = "更新邮箱用户发送配置") -public class EmailUsersUpdateDto { +@Schema(name = "EmailUsersDto对象", title = "邮箱用户发送配置分页查询", description = "邮箱用户发送配置分页查询") +public class EmailUsersDto { @Schema(name = "id", title = "主键") - @NotNull(message = "id不能为空") + @NotNull(message = "id不能为空", groups = {Update.class}) private Long id; @Schema(name = "email", title = "邮箱") - @NotBlank(message = "邮箱不能为空") + @NotBlank(message = "邮箱不能为空", groups = {Add.class, Update.class}) private String email; @Schema(name = "password", title = "密码") - @NotBlank(message = "密码不能为空") + @NotBlank(message = "密码不能为空", groups = {Add.class, Update.class}) private String password; @Schema(name = "host", title = "Host地址") - @NotBlank(message = "Host地址不能为空") + @NotBlank(message = "Host地址不能为空", groups = {Add.class, Update.class}) private String host; @Schema(name = "port", title = "端口号") - @NotNull(message = "端口号不能为空") + @NotNull(message = "端口号不能为空", groups = {Add.class, Update.class}) private Integer port; @Schema(name = "smtpAgreement", title = "邮箱协议") @@ -44,6 +46,4 @@ public class EmailUsersUpdateDto { @Schema(name = "openSSL", description = "启用SSL") private Boolean openSSL; -} - - +} \ No newline at end of file diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailTemplate.java b/auth-core/src/main/java/cn/bunny/services/domain/email/entity/EmailTemplate.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailTemplate.java rename to auth-core/src/main/java/cn/bunny/services/domain/email/entity/EmailTemplate.java index ab2cc38..274c6ec 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailTemplate.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/email/entity/EmailTemplate.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.email.entity; +package cn.bunny.services.domain.email.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailUsers.java b/auth-core/src/main/java/cn/bunny/services/domain/email/entity/EmailUsers.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailUsers.java rename to auth-core/src/main/java/cn/bunny/services/domain/email/entity/EmailUsers.java index 8358121..3f1e620 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailUsers.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/email/entity/EmailUsers.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.email.entity; +package cn.bunny.services.domain.email.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailTemplateVo.java b/auth-core/src/main/java/cn/bunny/services/domain/email/vo/EmailTemplateVo.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailTemplateVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/email/vo/EmailTemplateVo.java index 786ae88..0d240da 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailTemplateVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/email/vo/EmailTemplateVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.email.vo; +package cn.bunny.services.domain.email.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailUsersVo.java b/auth-core/src/main/java/cn/bunny/services/domain/email/vo/EmailUsersVo.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailUsersVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/email/vo/EmailUsersVo.java index f9604db..385772f 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailUsersVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/email/vo/EmailUsersVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.email.vo; +package cn.bunny.services.domain.email.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/FileUploadDto.java b/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FileUploadDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/FileUploadDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/files/dto/FileUploadDto.java index 1f6686e..b4c4bdc 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/FileUploadDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FileUploadDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.files.dto; +package cn.bunny.services.domain.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/FilesAddOrUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesAddOrUpdateDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/FilesAddOrUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesAddOrUpdateDto.java index 08dcbbf..bddbd37 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/FilesAddOrUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesAddOrUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.files.dto; +package cn.bunny.services.domain.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/FilesDto.java b/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/FilesDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesDto.java index 3ae2cbb..78efbd0 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/FilesDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.files.dto; +package cn.bunny.services.domain.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/FilesParDetailDto.java b/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesParDetailDto.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/FilesParDetailDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesParDetailDto.java index 7d15bfe..dcf3795 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/FilesParDetailDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesParDetailDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.files.dto; +package cn.bunny.services.domain.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/UploadThumbnail.java b/auth-core/src/main/java/cn/bunny/services/domain/files/dto/UploadThumbnail.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/UploadThumbnail.java rename to auth-core/src/main/java/cn/bunny/services/domain/files/dto/UploadThumbnail.java index 3c73354..6afc41e 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/dto/UploadThumbnail.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/files/dto/UploadThumbnail.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.files.dto; +package cn.bunny.services.domain.files.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/entity/Files.java b/auth-core/src/main/java/cn/bunny/services/domain/files/entity/Files.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/domain/system/files/entity/Files.java rename to auth-core/src/main/java/cn/bunny/services/domain/files/entity/Files.java index f7b26d3..57f918c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/entity/Files.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/files/entity/Files.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.files.entity; +package cn.bunny.services.domain.files.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/entity/FilesParDetail.java b/auth-core/src/main/java/cn/bunny/services/domain/files/entity/FilesParDetail.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/files/entity/FilesParDetail.java rename to auth-core/src/main/java/cn/bunny/services/domain/files/entity/FilesParDetail.java index 7109fd0..7431c96 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/entity/FilesParDetail.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/files/entity/FilesParDetail.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.files.entity; +package cn.bunny.services.domain.files.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FileInfoVo.java b/auth-core/src/main/java/cn/bunny/services/domain/files/vo/FileInfoVo.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FileInfoVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/files/vo/FileInfoVo.java index 7dadd5e..8936591 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FileInfoVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/files/vo/FileInfoVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.files.vo; +package cn.bunny.services.domain.files.vo; import cn.bunny.services.domain.common.model.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FilesParDetailVo.java b/auth-core/src/main/java/cn/bunny/services/domain/files/vo/FilesParDetailVo.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FilesParDetailVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/files/vo/FilesParDetailVo.java index 473a97e..618db49 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FilesParDetailVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/files/vo/FilesParDetailVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.files.vo; +package cn.bunny.services.domain.files.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FilesVo.java b/auth-core/src/main/java/cn/bunny/services/domain/files/vo/FilesVo.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FilesVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/files/vo/FilesVo.java index e655efa..974b8d6 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FilesVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/files/vo/FilesVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.files.vo; +package cn.bunny.services.domain.files.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nAddDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nAddDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nAddDto.java index fd7fbcc..8a51b70 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nAddDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.i18n.dto; +package cn.bunny.services.domain.i18n.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nDto.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nDto.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nDto.java index e92f1b6..f3832b2 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.i18n.dto; +package cn.bunny.services.domain.i18n.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nTypeAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeAddDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nTypeAddDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeAddDto.java index 436e449..f435e64 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nTypeAddDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.i18n.dto; +package cn.bunny.services.domain.i18n.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nTypeDto.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeDto.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nTypeDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeDto.java index dea945b..d57f543 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nTypeDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.i18n.dto; +package cn.bunny.services.domain.i18n.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nTypeUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeUpdateDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nTypeUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeUpdateDto.java index e6fc8fd..2a6d85c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nTypeUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.i18n.dto; +package cn.bunny.services.domain.i18n.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nUpdateByFileDto.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateByFileDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nUpdateByFileDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateByFileDto.java index c6f908a..034d2e1 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nUpdateByFileDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateByFileDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.i18n.dto; +package cn.bunny.services.domain.i18n.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateDto.java index fbafb4a..bd366b5 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.i18n.dto; +package cn.bunny.services.domain.i18n.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18n.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/entity/I18n.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18n.java rename to auth-core/src/main/java/cn/bunny/services/domain/i18n/entity/I18n.java index 3c512ea..f73d72c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18n.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/i18n/entity/I18n.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.i18n.entity; +package cn.bunny.services.domain.i18n.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18nType.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/entity/I18nType.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18nType.java rename to auth-core/src/main/java/cn/bunny/services/domain/i18n/entity/I18nType.java index a52b916..ac24676 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18nType.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/i18n/entity/I18nType.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.i18n.entity; +package cn.bunny.services.domain.i18n.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nTypeVo.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/vo/I18nTypeVo.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nTypeVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/i18n/vo/I18nTypeVo.java index 61d6cc2..468d029 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nTypeVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/i18n/vo/I18nTypeVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.i18n.vo; +package cn.bunny.services.domain.i18n.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nVo.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/vo/I18nVo.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/i18n/vo/I18nVo.java index f705f0a..331e8e9 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/i18n/vo/I18nVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.i18n.vo; +package cn.bunny.services.domain.i18n.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/log/dto/ScheduleExecuteLogDto.java b/auth-core/src/main/java/cn/bunny/services/domain/log/dto/ScheduleExecuteLogDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/log/dto/ScheduleExecuteLogDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/log/dto/ScheduleExecuteLogDto.java index 76ad6bb..a6571ab 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/log/dto/ScheduleExecuteLogDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/log/dto/ScheduleExecuteLogDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.log.dto; +package cn.bunny.services.domain.log.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/log/dto/UserLoginLogDto.java b/auth-core/src/main/java/cn/bunny/services/domain/log/dto/UserLoginLogDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/log/dto/UserLoginLogDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/log/dto/UserLoginLogDto.java index 784fadf..e541c84 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/log/dto/UserLoginLogDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/log/dto/UserLoginLogDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.log.dto; +package cn.bunny.services.domain.log.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/ScheduleExecuteLog.java b/auth-core/src/main/java/cn/bunny/services/domain/log/entity/ScheduleExecuteLog.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/ScheduleExecuteLog.java rename to auth-core/src/main/java/cn/bunny/services/domain/log/entity/ScheduleExecuteLog.java index 13b777b..5c96d74 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/ScheduleExecuteLog.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/log/entity/ScheduleExecuteLog.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.log.entity; +package cn.bunny.services.domain.log.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/UserLoginLog.java b/auth-core/src/main/java/cn/bunny/services/domain/log/entity/UserLoginLog.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/UserLoginLog.java rename to auth-core/src/main/java/cn/bunny/services/domain/log/entity/UserLoginLog.java index 736d7f7..db48947 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/UserLoginLog.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/log/entity/UserLoginLog.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.log.entity; +package cn.bunny.services.domain.log.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/ScheduleExecuteLogVo.java b/auth-core/src/main/java/cn/bunny/services/domain/log/vo/ScheduleExecuteLogVo.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/ScheduleExecuteLogVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/log/vo/ScheduleExecuteLogVo.java index 40cb56c..d4b1686 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/ScheduleExecuteLogVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/log/vo/ScheduleExecuteLogVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.log.vo; +package cn.bunny.services.domain.log.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogLocalVo.java b/auth-core/src/main/java/cn/bunny/services/domain/log/vo/UserLoginLogLocalVo.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogLocalVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/log/vo/UserLoginLogLocalVo.java index 596a086..f5eda03 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogLocalVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/log/vo/UserLoginLogLocalVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.log.vo; +package cn.bunny.services.domain.log.vo; import cn.bunny.services.domain.common.model.vo.BaseVo; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogVo.java b/auth-core/src/main/java/cn/bunny/services/domain/log/vo/UserLoginLogVo.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/log/vo/UserLoginLogVo.java index b7cbc21..186191c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/log/vo/UserLoginLogVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.log.vo; +package cn.bunny.services.domain.log.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/dto/MenuIconAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconAddDto.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/dto/MenuIconAddDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconAddDto.java index cb9dc11..9fc93d6 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/dto/MenuIconAddDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.menuIcon.dto; +package cn.bunny.services.domain.menuIcon.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/dto/MenuIconDto.java b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconDto.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/dto/MenuIconDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconDto.java index ef1c12c..b6877c2 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/dto/MenuIconDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.menuIcon.dto; +package cn.bunny.services.domain.menuIcon.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/dto/MenuIconUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconUpdateDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/dto/MenuIconUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconUpdateDto.java index 4296f3e..19d442a 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/dto/MenuIconUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.menuIcon.dto; +package cn.bunny.services.domain.menuIcon.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/entity/MenuIcon.java b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/entity/MenuIcon.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/entity/MenuIcon.java rename to auth-core/src/main/java/cn/bunny/services/domain/menuIcon/entity/MenuIcon.java index d2f7313..517ecc9 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/entity/MenuIcon.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/entity/MenuIcon.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.menuIcon.entity; +package cn.bunny.services.domain.menuIcon.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/vo/MenuIconVo.java b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/vo/MenuIconVo.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/vo/MenuIconVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/menuIcon/vo/MenuIconVo.java index 31fe0e1..853ef8b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/vo/MenuIconVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/vo/MenuIconVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.menuIcon.vo; +package cn.bunny.services.domain.menuIcon.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageAddDto.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageAddDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageAddDto.java index 70afc9d..9adaf1e 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageAddDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.dto; +package cn.bunny.services.domain.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageDto.java index 13186de..43bfdbf 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.dto; +package cn.bunny.services.domain.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageReceivedDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageReceivedDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageReceivedDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageReceivedDto.java index b56e9ca..b50ee6e 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageReceivedDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageReceivedDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.dto; +package cn.bunny.services.domain.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageReceivedUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageReceivedUpdateDto.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageReceivedUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageReceivedUpdateDto.java index c0a2c5e..2f5fb35 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageReceivedUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageReceivedUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.dto; +package cn.bunny.services.domain.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageTypeAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeAddDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageTypeAddDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeAddDto.java index 2e72ecc..5909127 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageTypeAddDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.dto; +package cn.bunny.services.domain.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageTypeDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeDto.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageTypeDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeDto.java index b9c5617..249a9db 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageTypeDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.dto; +package cn.bunny.services.domain.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageTypeUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeUpdateDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageTypeUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeUpdateDto.java index 1a3a8a8..b14cb8b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageTypeUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.dto; +package cn.bunny.services.domain.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageUpdateDto.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageUpdateDto.java index 8d8b7f7..5a49bef 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.dto; +package cn.bunny.services.domain.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageUserDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageUserDto.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageUserDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageUserDto.java index ca5c041..e66c401 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/dto/MessageUserDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageUserDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.dto; +package cn.bunny.services.domain.message.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/Message.java b/auth-core/src/main/java/cn/bunny/services/domain/message/entity/Message.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/Message.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/entity/Message.java index 57a829a..c0e948d 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/Message.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/entity/Message.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.entity; +package cn.bunny.services.domain.message.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageReceived.java b/auth-core/src/main/java/cn/bunny/services/domain/message/entity/MessageReceived.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageReceived.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/entity/MessageReceived.java index 15d75da..dca19a7 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageReceived.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/entity/MessageReceived.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.entity; +package cn.bunny.services.domain.message.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageType.java b/auth-core/src/main/java/cn/bunny/services/domain/message/entity/MessageType.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageType.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/entity/MessageType.java index eb5775a..66f0a5b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageType.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/entity/MessageType.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.entity; +package cn.bunny.services.domain.message.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageDetailVo.java b/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageDetailVo.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageDetailVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageDetailVo.java index aad8e57..81add2d 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageDetailVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageDetailVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.vo; +package cn.bunny.services.domain.message.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageReceivedWithMessageVo.java b/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageReceivedWithMessageVo.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageReceivedWithMessageVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageReceivedWithMessageVo.java index 8bc58a1..4ac0af0 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageReceivedWithMessageVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageReceivedWithMessageVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.vo; +package cn.bunny.services.domain.message.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageReceivedWithUserVo.java b/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageReceivedWithUserVo.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageReceivedWithUserVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageReceivedWithUserVo.java index 2816c76..0ae7932 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageReceivedWithUserVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageReceivedWithUserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.vo; +package cn.bunny.services.domain.message.vo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageTypeVo.java b/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageTypeVo.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageTypeVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageTypeVo.java index 84666d3..a0636ac 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageTypeVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageTypeVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.vo; +package cn.bunny.services.domain.message.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageUserVo.java b/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageUserVo.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageUserVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageUserVo.java index 4df9ee1..aad6268 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageUserVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageUserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.vo; +package cn.bunny.services.domain.message.vo; import cn.bunny.services.domain.common.model.vo.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageVo.java b/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageVo.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageVo.java index b9da6dd..bccb65b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/vo/MessageVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.message.vo; +package cn.bunny.services.domain.message.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersAddDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersAddDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersAddDto.java index bc787f9..78c0082 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersAddDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.quartz.dto; +package cn.bunny.services.domain.quartz.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersDto.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersDto.java index 30465d8..1d3c1b0 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.quartz.dto; +package cn.bunny.services.domain.quartz.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersGroupAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupAddDto.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersGroupAddDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupAddDto.java index 01835de..dae4133 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersGroupAddDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.quartz.dto; +package cn.bunny.services.domain.quartz.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersGroupDto.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupDto.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersGroupDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupDto.java index a229c9d..78fd91a 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersGroupDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.quartz.dto; +package cn.bunny.services.domain.quartz.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersGroupUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupUpdateDto.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersGroupUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupUpdateDto.java index 443933f..1dcb2ed 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersGroupUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersGroupUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.quartz.dto; +package cn.bunny.services.domain.quartz.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersUpdateDto.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersUpdateDto.java index 4347e4b..181d2f7 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/dto/SchedulersUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/quartz/dto/SchedulersUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.quartz.dto; +package cn.bunny.services.domain.quartz.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/entity/Schedulers.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/entity/Schedulers.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/quartz/entity/Schedulers.java rename to auth-core/src/main/java/cn/bunny/services/domain/quartz/entity/Schedulers.java index 655a6dc..127845a 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/entity/Schedulers.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/quartz/entity/Schedulers.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.quartz.entity; +package cn.bunny.services.domain.quartz.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/entity/SchedulersGroup.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/entity/SchedulersGroup.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/quartz/entity/SchedulersGroup.java rename to auth-core/src/main/java/cn/bunny/services/domain/quartz/entity/SchedulersGroup.java index cef5c10..0c52848 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/entity/SchedulersGroup.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/quartz/entity/SchedulersGroup.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.quartz.entity; +package cn.bunny.services.domain.quartz.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/vo/SchedulersGroupVo.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/vo/SchedulersGroupVo.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/system/quartz/vo/SchedulersGroupVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/quartz/vo/SchedulersGroupVo.java index 2c4bf37..b7e5362 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/vo/SchedulersGroupVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/quartz/vo/SchedulersGroupVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.quartz.vo; +package cn.bunny.services.domain.quartz.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/vo/SchedulersVo.java b/auth-core/src/main/java/cn/bunny/services/domain/quartz/vo/SchedulersVo.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/quartz/vo/SchedulersVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/quartz/vo/SchedulersVo.java index b493832..4b0f5cf 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/vo/SchedulersVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/quartz/vo/SchedulersVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.quartz.vo; +package cn.bunny.services.domain.quartz.vo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/AssignPowersToRoleDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/AssignPowersToRoleDto.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/AssignPowersToRoleDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/AssignPowersToRoleDto.java index 9cb2bd7..ca53bae 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/AssignPowersToRoleDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/AssignPowersToRoleDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto; +package cn.bunny.services.domain.system.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/dept/DeptAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/dept/DeptAddDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/dept/DeptAddDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/dept/DeptAddDto.java index 8febe81..50e62b2 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/dept/DeptAddDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/dept/DeptAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.dept; +package cn.bunny.services.domain.system.dto.dept; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/dept/DeptDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/dept/DeptDto.java similarity index 89% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/dept/DeptDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/dept/DeptDto.java index 95ce9f1..4891b31 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/dept/DeptDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/dept/DeptDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.dept; +package cn.bunny.services.domain.system.dto.dept; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/dept/DeptUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/dept/DeptUpdateDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/dept/DeptUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/dept/DeptUpdateDto.java index 9d919e9..6ce01e9 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/dept/DeptUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/dept/DeptUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.dept; +package cn.bunny.services.domain.system.dto.dept; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/power/PermissionAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/power/PermissionAddDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/power/PermissionAddDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/power/PermissionAddDto.java index 583de34..0e97804 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/power/PermissionAddDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/power/PermissionAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.power; +package cn.bunny.services.domain.system.dto.power; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/power/PermissionDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/power/PermissionDto.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/power/PermissionDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/power/PermissionDto.java index b447e44..a309afb 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/power/PermissionDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/power/PermissionDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.power; +package cn.bunny.services.domain.system.dto.power; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/power/PermissionUpdateBatchByParentIdDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/power/PermissionUpdateBatchByParentIdDto.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/power/PermissionUpdateBatchByParentIdDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/power/PermissionUpdateBatchByParentIdDto.java index 006dfe3..2a16414 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/power/PermissionUpdateBatchByParentIdDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/power/PermissionUpdateBatchByParentIdDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.power; +package cn.bunny.services.domain.system.dto.power; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/power/PermissionUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/power/PermissionUpdateDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/power/PermissionUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/power/PermissionUpdateDto.java index ba19250..cc2f0d9 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/power/PermissionUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/power/PermissionUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.power; +package cn.bunny.services.domain.system.dto.power; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/role/RoleAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/role/RoleAddDto.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/role/RoleAddDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/role/RoleAddDto.java index b58c728..461dbaf 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/role/RoleAddDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/role/RoleAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.role; +package cn.bunny.services.domain.system.dto.role; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/role/RoleDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/role/RoleDto.java similarity index 89% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/role/RoleDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/role/RoleDto.java index d5cb4a5..69023b4 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/role/RoleDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/role/RoleDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.role; +package cn.bunny.services.domain.system.dto.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/role/RoleUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/role/RoleUpdateDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/role/RoleUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/role/RoleUpdateDto.java index dfd5089..c94adc2 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/role/RoleUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/role/RoleUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.role; +package cn.bunny.services.domain.system.dto.role; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/router/RouterAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/router/RouterAddDto.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/router/RouterAddDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/router/RouterAddDto.java index d72c4ae..1dbb7d2 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/router/RouterAddDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/router/RouterAddDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.system.dto.router; +package cn.bunny.services.domain.system.dto.router; -import cn.bunny.services.domain.system.system.entity.router.RouterMeta; +import cn.bunny.services.domain.system.entity.router.RouterMeta; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/router/RouterUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/router/RouterUpdateDto.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/router/RouterUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/router/RouterUpdateDto.java index fcb7d2e..33da362 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/router/RouterUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/router/RouterUpdateDto.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.system.dto.router; +package cn.bunny.services.domain.system.dto.router; -import cn.bunny.services.domain.system.system.entity.router.RouterMeta; +import cn.bunny.services.domain.system.entity.router.RouterMeta; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AdminUserAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserAddDto.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AdminUserAddDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserAddDto.java index 04dbada..9ff8297 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AdminUserAddDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.user; +package cn.bunny.services.domain.system.dto.user; import cn.bunny.services.domain.common.constant.UserConstant; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AdminUserDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserDto.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AdminUserDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserDto.java index 8b91cc7..cfe2a65 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AdminUserDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.user; +package cn.bunny.services.domain.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AdminUserUpdateByLocalUserDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AdminUserUpdateByLocalUserDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java index bb2c08d..c6affdb 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AdminUserUpdateByLocalUserDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserUpdateByLocalUserDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.user; +package cn.bunny.services.domain.system.dto.user; import cn.bunny.services.domain.common.constant.UserConstant; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AdminUserUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserUpdateDto.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AdminUserUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserUpdateDto.java index dc639f2..946a2e5 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AdminUserUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AdminUserUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.user; +package cn.bunny.services.domain.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AssignRolesToUsersDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AssignRolesToUsersDto.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AssignRolesToUsersDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AssignRolesToUsersDto.java index ada85ba..86707a3 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/AssignRolesToUsersDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/AssignRolesToUsersDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.user; +package cn.bunny.services.domain.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/LoginDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/LoginDto.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/LoginDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/LoginDto.java index aade463..77d5297 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/LoginDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/LoginDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.user; +package cn.bunny.services.domain.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/RefreshTokenDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/RefreshTokenDto.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/RefreshTokenDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/RefreshTokenDto.java index 97669ea..6f352e5 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/dto/user/RefreshTokenDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/dto/user/RefreshTokenDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.dto.user; +package cn.bunny.services.domain.system.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailTemplateAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailTemplateAddDto.java deleted file mode 100644 index e0c178c..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailTemplateAddDto.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.bunny.services.domain.system.email.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "EmailTemplateAddDto对象", title = "添加邮箱模板", description = "添加邮箱模板") -public class EmailTemplateAddDto { - - @Schema(name = "templateName", title = "模板名称") - @NotBlank(message = "模板名称不能为空") - private String templateName; - - @Schema(name = "emailUser", title = "配置邮件用户") - @NotNull(message = "配置邮件用户不能为空") - private Long emailUser; - - @Schema(name = "subject", title = "主题") - @NotBlank(message = "主题不能为空") - private String subject; - - @Schema(name = "body", title = "邮件内容") - @NotBlank(message = "邮件内容不能为空") - private String body; - - @Schema(name = "type", title = "邮件类型") - private String type; - - @Schema(name = "isDefault", title = "是否默认") - @NotNull(message = "是否默认不能为空") - private Boolean isDefault; - -} diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailTemplateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailTemplateDto.java deleted file mode 100644 index 280d6aa..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailTemplateDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.bunny.services.domain.system.email.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "EmailTemplateDto", title = "邮箱模板请求内容", description = "邮箱模板请求内容") -public class EmailTemplateDto { - - @Schema(name = "templateName", title = "模板名称") - private String templateName; - - @Schema(name = "subject", title = "主题") - private String subject; - - @Schema(name = "body", title = "邮件内容") - private String body; - - @Schema(name = "type", title = "邮件类型") - private String type; - - @Schema(name = "isDefault", title = "是否默认") - private Boolean isDefault; - -} - diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailTemplateUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailTemplateUpdateDto.java deleted file mode 100644 index 83152e2..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailTemplateUpdateDto.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.bunny.services.domain.system.email.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "EmailTemplateUpdateDto对象", title = "更新邮箱模板", description = "更新邮箱模板") -public class EmailTemplateUpdateDto { - - @Schema(name = "id", title = "主键") - @NotNull(message = "id不能为空") - private Long id; - - @Schema(name = "templateName", title = "模板名称") - @NotBlank(message = "模板名称不能为空") - private String templateName; - - @Schema(name = "emailUser", title = "配置邮件用户") - @NotNull(message = "配置邮件用户不能为空") - private Long emailUser; - - @Schema(name = "subject", title = "主题") - @NotBlank(message = "主题不能为空") - private String subject; - - @Schema(name = "body", title = "邮件内容") - @NotBlank(message = "邮件内容不能为空") - private String body; - - @Schema(name = "type", title = "邮件类型") - private String type; - - @Schema(name = "isDefault", title = "是否默认") - @NotNull(message = "是否默认不能为空") - private Boolean isDefault; - -} \ No newline at end of file diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailUsersAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailUsersAddDto.java deleted file mode 100644 index 8ada0d0..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailUsersAddDto.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.bunny.services.domain.system.email.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Schema(name = "EmailUsersAddDto对象", title = "添加邮箱用户发送配置", description = "添加邮箱用户发送配置") -public class EmailUsersAddDto { - - @Schema(name = "email", title = "邮箱") - @NotBlank(message = "邮箱不能为空") - private String email; - - @Schema(name = "password", title = "密码") - @NotBlank(message = "密码不能为空") - private String password; - - @Schema(name = "host", title = "Host地址") - @NotBlank(message = "Host地址不能为空") - private String host; - - @Schema(name = "port", title = "端口号") - @NotNull(message = "端口号不能为空") - private Integer port; - - @Schema(name = "smtpAgreement", title = "邮箱协议") - private String smtpAgreement; - - @Schema(name = "isDefault", title = "是否为默认邮件") - private Boolean isDefault = false; - - @Schema(name = "openSSL", description = "启用SSL") - private Boolean openSSL; - -} diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailUsersDto.java b/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailUsersDto.java deleted file mode 100644 index 6bc45a6..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/dto/EmailUsersDto.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.bunny.services.domain.system.email.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "EmailUsersDto对象", title = "邮箱用户发送配置分页查询", description = "邮箱用户发送配置分页查询") -public class EmailUsersDto { - - @Schema(name = "email", title = "邮箱") - private String email; - - @Schema(name = "host", title = "Host地址") - private String host; - - @Schema(name = "port", title = "端口号") - private Integer port; - - @Schema(name = "smtpAgreement", title = "邮箱协议") - private String smtpAgreement; - - @Schema(name = "openSSL", description = "启用SSL") - private Boolean openSSL; - -} - - diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/AdminUser.java b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/AdminUser.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/AdminUser.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/entity/AdminUser.java index 9456ac9..4029abf 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/AdminUser.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/AdminUser.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.entity; +package cn.bunny.services.domain.system.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Dept.java b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/Dept.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Dept.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/entity/Dept.java index 2d64d84..87b8397 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Dept.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/Dept.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.entity; +package cn.bunny.services.domain.system.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Permission.java b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/Permission.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Permission.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/entity/Permission.java index 0677c8b..ec11a64 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Permission.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/Permission.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.entity; +package cn.bunny.services.domain.system.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Role.java b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/Role.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Role.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/entity/Role.java index d802eca..e6271bc 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Role.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/Role.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.entity; +package cn.bunny.services.domain.system.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RolePermission.java b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/RolePermission.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RolePermission.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/entity/RolePermission.java index e3a36b4..85933dd 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RolePermission.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/RolePermission.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.entity; +package cn.bunny.services.domain.system.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RouterRole.java b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/RouterRole.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RouterRole.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/entity/RouterRole.java index 98a51c1..7253c38 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RouterRole.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/RouterRole.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.entity; +package cn.bunny.services.domain.system.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserDept.java b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/UserDept.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserDept.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/entity/UserDept.java index 93dc1e5..f507525 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserDept.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/UserDept.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.entity; +package cn.bunny.services.domain.system.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserRole.java b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/UserRole.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserRole.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/entity/UserRole.java index 42ce0cb..4be0bc1 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserRole.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/UserRole.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.entity; +package cn.bunny.services.domain.system.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/Router.java b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/Router.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/Router.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/Router.java index 2731060..d5e1636 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/Router.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/Router.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.entity.router; +package cn.bunny.services.domain.system.entity.router; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/RouterMeta.java b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/RouterMeta.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/RouterMeta.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/RouterMeta.java index cdb67a3..2411866 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/RouterMeta.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/RouterMeta.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.entity.router; +package cn.bunny.services.domain.system.entity.router; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/RouterMetaTransition.java b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/RouterMetaTransition.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/RouterMetaTransition.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/RouterMetaTransition.java index af8e206..06c348d 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/RouterMetaTransition.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/entity/router/RouterMetaTransition.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.entity.router; +package cn.bunny.services.domain.system.entity.router; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewRolePermission.java b/auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewRolePermission.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewRolePermission.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewRolePermission.java index bd34440..4a50533 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewRolePermission.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewRolePermission.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.views; +package cn.bunny.services.domain.system.views; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewRouterRole.java b/auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewRouterRole.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewRouterRole.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewRouterRole.java index 437fef7..c1db23e 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewRouterRole.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewRouterRole.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.views; +package cn.bunny.services.domain.system.views; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewUserDept.java b/auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewUserDept.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewUserDept.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewUserDept.java index 5133b41..432f4af 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewUserDept.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/views/ViewUserDept.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.views; +package cn.bunny.services.domain.system.views; import cn.bunny.services.domain.common.model.entity.BaseUserEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/DeptVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/DeptVo.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/DeptVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/vo/DeptVo.java index 90b6d59..dbd890e 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/DeptVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/DeptVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.vo; +package cn.bunny.services.domain.system.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/PermissionVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/PermissionVo.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/PermissionVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/vo/PermissionVo.java index f4d62c0..19d1b5c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/PermissionVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/PermissionVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.vo; +package cn.bunny.services.domain.system.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/RoleVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/RoleVo.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/RoleVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/vo/RoleVo.java index 7f8606a..a5119d4 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/RoleVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/RoleVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.vo; +package cn.bunny.services.domain.system.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterManageVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/RouterManageVo.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterManageVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/RouterManageVo.java index 85ba1de..8497f6e 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterManageVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/RouterManageVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.vo.router; +package cn.bunny.services.domain.system.vo.router; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/RouterVo.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/RouterVo.java index dfdff15..9750e80 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/RouterVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.vo.router; +package cn.bunny.services.domain.system.vo.router; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/WebUserRouterVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/WebUserRouterVo.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/WebUserRouterVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/WebUserRouterVo.java index 5531d63..0125193 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/WebUserRouterVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/router/WebUserRouterVo.java @@ -1,6 +1,6 @@ -package cn.bunny.services.domain.system.system.vo.router; +package cn.bunny.services.domain.system.vo.router; -import cn.bunny.services.domain.system.system.entity.router.RouterMeta; +import cn.bunny.services.domain.system.entity.router.RouterMeta; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/AdminUserVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/AdminUserVo.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/AdminUserVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/AdminUserVo.java index 25bd8b1..bf2420f 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/AdminUserVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/AdminUserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.vo.user; +package cn.bunny.services.domain.system.vo.user; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/RefreshTokenVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/RefreshTokenVo.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/RefreshTokenVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/RefreshTokenVo.java index 6211a85..251e7cf 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/RefreshTokenVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/RefreshTokenVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.vo.user; +package cn.bunny.services.domain.system.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/UserVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/UserVo.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/UserVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/UserVo.java index cb82625..3c9bf16 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/UserVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/vo/user/UserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.system.system.vo.user; +package cn.bunny.services.domain.system.vo.user; import cn.bunny.services.domain.common.model.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java b/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java index 773d1e1..f7f56eb 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.system.email.dto.EmailTemplateDto; -import cn.bunny.services.domain.system.email.entity.EmailTemplate; -import cn.bunny.services.domain.system.email.vo.EmailTemplateVo; +import cn.bunny.services.domain.email.dto.EmailTemplateDto; +import cn.bunny.services.domain.email.entity.EmailTemplate; +import cn.bunny.services.domain.email.vo.EmailTemplateVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java b/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java index 97c2b97..c30d37d 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.system.email.dto.EmailUsersDto; -import cn.bunny.services.domain.system.email.entity.EmailUsers; -import cn.bunny.services.domain.system.email.vo.EmailUsersVo; +import cn.bunny.services.domain.email.dto.EmailUsersDto; +import cn.bunny.services.domain.email.entity.EmailUsers; +import cn.bunny.services.domain.email.vo.EmailUsersVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java b/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java index 5532ae8..003e1ef 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.system.i18n.dto.I18nDto; -import cn.bunny.services.domain.system.i18n.entity.I18n; -import cn.bunny.services.domain.system.i18n.vo.I18nVo; +import cn.bunny.services.domain.i18n.dto.I18nDto; +import cn.bunny.services.domain.i18n.entity.I18n; +import cn.bunny.services.domain.i18n.vo.I18nVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java b/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java index a0233f4..dcf7c5c 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.system.i18n.dto.I18nTypeDto; -import cn.bunny.services.domain.system.i18n.entity.I18nType; +import cn.bunny.services.domain.i18n.dto.I18nTypeDto; +import cn.bunny.services.domain.i18n.entity.I18nType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java b/dao/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java index 688e25a..1dbc561 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.system.menuIcon.dto.MenuIconDto; -import cn.bunny.services.domain.system.menuIcon.entity.MenuIcon; -import cn.bunny.services.domain.system.menuIcon.vo.MenuIconVo; +import cn.bunny.services.domain.menuIcon.dto.MenuIconDto; +import cn.bunny.services.domain.menuIcon.entity.MenuIcon; +import cn.bunny.services.domain.menuIcon.vo.MenuIconVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java b/dao/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java index 1d83dad..eafcdfd 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/file/FilesMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.file; -import cn.bunny.services.domain.system.files.dto.FilesDto; -import cn.bunny.services.domain.system.files.entity.Files; -import cn.bunny.services.domain.system.files.vo.FilesVo; +import cn.bunny.services.domain.files.dto.FilesDto; +import cn.bunny.services.domain.files.entity.Files; +import cn.bunny.services.domain.files.vo.FilesVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java b/dao/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java index a4063a2..124d2a6 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/file/FilesParDetailMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.file; -import cn.bunny.services.domain.system.files.dto.FilesParDetailDto; -import cn.bunny.services.domain.system.files.entity.FilesParDetail; -import cn.bunny.services.domain.system.files.vo.FilesParDetailVo; +import cn.bunny.services.domain.files.dto.FilesParDetailDto; +import cn.bunny.services.domain.files.entity.FilesParDetail; +import cn.bunny.services.domain.files.vo.FilesParDetailVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java b/dao/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java index 914c452..b7a4580 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/log/ScheduleExecuteLogMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.log; -import cn.bunny.services.domain.system.log.dto.ScheduleExecuteLogDto; -import cn.bunny.services.domain.system.log.entity.ScheduleExecuteLog; -import cn.bunny.services.domain.system.log.vo.ScheduleExecuteLogVo; +import cn.bunny.services.domain.log.dto.ScheduleExecuteLogDto; +import cn.bunny.services.domain.log.entity.ScheduleExecuteLog; +import cn.bunny.services.domain.log.vo.ScheduleExecuteLogVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java b/dao/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java index caec5d4..c02223b 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/log/UserLoginLogMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.log; -import cn.bunny.services.domain.system.log.dto.UserLoginLogDto; -import cn.bunny.services.domain.system.log.entity.UserLoginLog; -import cn.bunny.services.domain.system.log.vo.UserLoginLogVo; +import cn.bunny.services.domain.log.dto.UserLoginLogDto; +import cn.bunny.services.domain.log.entity.UserLoginLog; +import cn.bunny.services.domain.log.vo.UserLoginLogVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java b/dao/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java index 0317e03..c2030b8 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/message/MessageMapper.java @@ -1,10 +1,10 @@ package cn.bunny.services.mapper.message; -import cn.bunny.services.domain.system.message.dto.MessageDto; -import cn.bunny.services.domain.system.message.entity.Message; -import cn.bunny.services.domain.system.message.vo.MessageDetailVo; -import cn.bunny.services.domain.system.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.services.domain.system.message.vo.MessageReceivedWithUserVo; +import cn.bunny.services.domain.message.dto.MessageDto; +import cn.bunny.services.domain.message.entity.Message; +import cn.bunny.services.domain.message.vo.MessageDetailVo; +import cn.bunny.services.domain.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.services.domain.message.vo.MessageReceivedWithUserVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java b/dao/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java index 40c6955..f23758a 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/message/MessageReceivedMapper.java @@ -1,11 +1,11 @@ package cn.bunny.services.mapper.message; -import cn.bunny.services.domain.system.message.dto.MessageReceivedDto; -import cn.bunny.services.domain.system.message.dto.MessageUserDto; -import cn.bunny.services.domain.system.message.entity.Message; -import cn.bunny.services.domain.system.message.entity.MessageReceived; -import cn.bunny.services.domain.system.message.vo.MessageReceivedWithMessageVo; -import cn.bunny.services.domain.system.message.vo.MessageUserVo; +import cn.bunny.services.domain.message.dto.MessageReceivedDto; +import cn.bunny.services.domain.message.dto.MessageUserDto; +import cn.bunny.services.domain.message.entity.Message; +import cn.bunny.services.domain.message.entity.MessageReceived; +import cn.bunny.services.domain.message.vo.MessageReceivedWithMessageVo; +import cn.bunny.services.domain.message.vo.MessageUserVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java b/dao/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java index 858edbf..f2949f7 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/message/MessageTypeMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.message; -import cn.bunny.services.domain.system.message.dto.MessageTypeDto; -import cn.bunny.services.domain.system.message.entity.MessageType; -import cn.bunny.services.domain.system.message.vo.MessageTypeVo; +import cn.bunny.services.domain.message.dto.MessageTypeDto; +import cn.bunny.services.domain.message.entity.MessageType; +import cn.bunny.services.domain.message.vo.MessageTypeVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java b/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java index 3ee16dd..7532e5d 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersGroupMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.schedule; -import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupDto; -import cn.bunny.services.domain.system.quartz.entity.SchedulersGroup; -import cn.bunny.services.domain.system.quartz.vo.SchedulersGroupVo; +import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto; +import cn.bunny.services.domain.quartz.entity.SchedulersGroup; +import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java b/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java index 9be1f92..471c960 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/schedule/SchedulersMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.schedule; -import cn.bunny.services.domain.system.quartz.dto.SchedulersDto; -import cn.bunny.services.domain.system.quartz.entity.Schedulers; +import cn.bunny.services.domain.quartz.dto.SchedulersDto; +import cn.bunny.services.domain.quartz.entity.Schedulers; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java b/dao/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java index 3981fc9..62bd639 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/system/DeptMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.system.dto.dept.DeptDto; -import cn.bunny.services.domain.system.system.entity.Dept; -import cn.bunny.services.domain.system.system.vo.DeptVo; +import cn.bunny.services.domain.system.dto.dept.DeptDto; +import cn.bunny.services.domain.system.entity.Dept; +import cn.bunny.services.domain.system.vo.DeptVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java b/dao/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java index fb64f48..c20c9e0 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/system/PermissionMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.system.dto.power.PermissionDto; -import cn.bunny.services.domain.system.system.entity.Permission; -import cn.bunny.services.domain.system.system.vo.PermissionVo; +import cn.bunny.services.domain.system.dto.power.PermissionDto; +import cn.bunny.services.domain.system.entity.Permission; +import cn.bunny.services.domain.system.vo.PermissionVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java b/dao/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java index 9c8c7df..dfcfcc3 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/system/RoleMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.system.dto.role.RoleDto; -import cn.bunny.services.domain.system.system.entity.Role; -import cn.bunny.services.domain.system.system.vo.RoleVo; +import cn.bunny.services.domain.system.dto.role.RoleDto; +import cn.bunny.services.domain.system.entity.Role; +import cn.bunny.services.domain.system.vo.RoleVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java b/dao/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java index 73f6411..f2a1cc1 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/system/RolePermissionMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.system.entity.RolePermission; -import cn.bunny.services.domain.system.system.views.ViewRolePermission; +import cn.bunny.services.domain.system.entity.RolePermission; +import cn.bunny.services.domain.system.views.ViewRolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java b/dao/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java index e791b94..d92dc39 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/system/RouterMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.system.entity.router.Router; -import cn.bunny.services.domain.system.system.vo.router.RouterVo; +import cn.bunny.services.domain.system.entity.router.Router; +import cn.bunny.services.domain.system.vo.router.RouterVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java b/dao/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java index 43573ec..d0a404e 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/system/RouterRoleMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.system.entity.RouterRole; -import cn.bunny.services.domain.system.system.views.ViewRouterRole; +import cn.bunny.services.domain.system.entity.RouterRole; +import cn.bunny.services.domain.system.views.ViewRouterRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java b/dao/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java index 95721d9..84b5a5b 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/system/UserDeptMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.system.entity.UserDept; +import cn.bunny.services.domain.system.entity.UserDept; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/UserMapper.java b/dao/src/main/java/cn/bunny/services/mapper/system/UserMapper.java index 252ed11..506c819 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/UserMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/system/UserMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.system.dto.user.AdminUserDto; -import cn.bunny.services.domain.system.system.entity.AdminUser; -import cn.bunny.services.domain.system.system.views.ViewUserDept; +import cn.bunny.services.domain.system.dto.user.AdminUserDto; +import cn.bunny.services.domain.system.entity.AdminUser; +import cn.bunny.services.domain.system.views.ViewUserDept; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java b/dao/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java index 08c87f6..566f686 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/system/UserRoleMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper.system; -import cn.bunny.services.domain.system.system.entity.UserRole; +import cn.bunny.services.domain.system.entity.UserRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/dao/src/main/resources/mapper/configuration/EmailTemplateMapper.xml b/dao/src/main/resources/mapper/configuration/EmailTemplateMapper.xml index 2fc78cf..3cfd2c6 100644 --- a/dao/src/main/resources/mapper/configuration/EmailTemplateMapper.xml +++ b/dao/src/main/resources/mapper/configuration/EmailTemplateMapper.xml @@ -3,7 +3,7 @@ - + @@ -25,7 +25,7 @@ - select template.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/configuration/EmailUsersMapper.xml b/dao/src/main/resources/mapper/configuration/EmailUsersMapper.xml index da40f3a..2e78ab3 100644 --- a/dao/src/main/resources/mapper/configuration/EmailUsersMapper.xml +++ b/dao/src/main/resources/mapper/configuration/EmailUsersMapper.xml @@ -3,7 +3,7 @@ - + @@ -26,7 +26,7 @@ - select email_user.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/configuration/I18nMapper.xml b/dao/src/main/resources/mapper/configuration/I18nMapper.xml index 284c32d..6a565a7 100644 --- a/dao/src/main/resources/mapper/configuration/I18nMapper.xml +++ b/dao/src/main/resources/mapper/configuration/I18nMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select i18n.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/configuration/I18nTypeMapper.xml b/dao/src/main/resources/mapper/configuration/I18nTypeMapper.xml index 39a25b8..f874132 100644 --- a/dao/src/main/resources/mapper/configuration/I18nTypeMapper.xml +++ b/dao/src/main/resources/mapper/configuration/I18nTypeMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select i18n_type.*, create_user.username as createUsername, diff --git a/dao/src/main/resources/mapper/configuration/MenuIconMapper.xml b/dao/src/main/resources/mapper/configuration/MenuIconMapper.xml index 72c4a63..02be11d 100644 --- a/dao/src/main/resources/mapper/configuration/MenuIconMapper.xml +++ b/dao/src/main/resources/mapper/configuration/MenuIconMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select icon.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/file/FilesMapper.xml b/dao/src/main/resources/mapper/file/FilesMapper.xml index d126729..8a8baed 100644 --- a/dao/src/main/resources/mapper/file/FilesMapper.xml +++ b/dao/src/main/resources/mapper/file/FilesMapper.xml @@ -3,7 +3,7 @@ - + @@ -42,7 +42,7 @@ - select files.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/file/FilesPardetailMapper.xml b/dao/src/main/resources/mapper/file/FilesPardetailMapper.xml index d608107..3f7c3c1 100644 --- a/dao/src/main/resources/mapper/file/FilesPardetailMapper.xml +++ b/dao/src/main/resources/mapper/file/FilesPardetailMapper.xml @@ -3,7 +3,7 @@ - + @@ -19,7 +19,7 @@ - select base.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml b/dao/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml index fce6543..2b12d1c 100644 --- a/dao/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml +++ b/dao/src/main/resources/mapper/log/ScheduleExecuteLogMapper.xml @@ -3,7 +3,7 @@ - + @@ -25,7 +25,7 @@ - select log.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/log/UserLoginLogMapper.xml b/dao/src/main/resources/mapper/log/UserLoginLogMapper.xml index 20dfd45..7229f18 100644 --- a/dao/src/main/resources/mapper/log/UserLoginLogMapper.xml +++ b/dao/src/main/resources/mapper/log/UserLoginLogMapper.xml @@ -3,7 +3,7 @@ - + @@ -26,7 +26,7 @@ - select user_login.*, create_user.username as create_username, @@ -55,7 +55,7 @@ - select from log_user_login where user_id = #{id} diff --git a/dao/src/main/resources/mapper/message/MessageMapper.xml b/dao/src/main/resources/mapper/message/MessageMapper.xml index df52290..bc8c755 100644 --- a/dao/src/main/resources/mapper/message/MessageMapper.xml +++ b/dao/src/main/resources/mapper/message/MessageMapper.xml @@ -3,7 +3,7 @@ - + @@ -28,7 +28,7 @@ - SELECT message.id, message.create_time, @@ -83,7 +83,7 @@ - SELECT message.*, send_user.nickname AS send_nickname FROM sys_message message @@ -95,7 +95,7 @@ + resultType="cn.bunny.services.domain.message.vo.MessageReceivedWithMessageVo"> SELECT message_received.status AS status, message_received.received_user_id AS received_user_id, @@ -86,7 +86,7 @@ - SELECT message.id, message.title, diff --git a/dao/src/main/resources/mapper/message/MessageTypeMapper.xml b/dao/src/main/resources/mapper/message/MessageTypeMapper.xml index 3ec2791..b233753 100644 --- a/dao/src/main/resources/mapper/message/MessageTypeMapper.xml +++ b/dao/src/main/resources/mapper/message/MessageTypeMapper.xml @@ -3,7 +3,7 @@ - + @@ -22,7 +22,7 @@ - select message_type.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml b/dao/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml index dea8f54..2013afc 100644 --- a/dao/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml +++ b/dao/src/main/resources/mapper/schedule/SchedulersGroupMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select schedulers_group.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/schedule/SchedulersMapper.xml b/dao/src/main/resources/mapper/schedule/SchedulersMapper.xml index a8fe1b7..4079e75 100644 --- a/dao/src/main/resources/mapper/schedule/SchedulersMapper.xml +++ b/dao/src/main/resources/mapper/schedule/SchedulersMapper.xml @@ -3,7 +3,7 @@ - + @@ -19,7 +19,7 @@ - select from view_qrtz_schedulers diff --git a/dao/src/main/resources/mapper/system/DeptMapper.xml b/dao/src/main/resources/mapper/system/DeptMapper.xml index 4d12a51..f7aa780 100644 --- a/dao/src/main/resources/mapper/system/DeptMapper.xml +++ b/dao/src/main/resources/mapper/system/DeptMapper.xml @@ -3,7 +3,7 @@ - + @@ -22,7 +22,7 @@ - select dept.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/system/PermissionMapper.xml b/dao/src/main/resources/mapper/system/PermissionMapper.xml index d53a638..2d095f3 100644 --- a/dao/src/main/resources/mapper/system/PermissionMapper.xml +++ b/dao/src/main/resources/mapper/system/PermissionMapper.xml @@ -3,7 +3,7 @@ - + @@ -24,7 +24,7 @@ - select permission.*, create_user.username as create_username, @@ -51,7 +51,7 @@ - SELECT p.* FROM sys_permission p INNER JOIN sys_role_permission rp ON p.id = rp.power_id diff --git a/dao/src/main/resources/mapper/system/RoleMapper.xml b/dao/src/main/resources/mapper/system/RoleMapper.xml index edff789..ec6a6ee 100644 --- a/dao/src/main/resources/mapper/system/RoleMapper.xml +++ b/dao/src/main/resources/mapper/system/RoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select role.*, create_user.username as create_username, @@ -41,7 +41,7 @@ - SELECT r.* FROM sys_user u INNER JOIN sys_user_role ur ON u.id = ur.user_id @@ -51,7 +51,7 @@ - SELECT r.* FROM sys_role r, sys_user_role ur diff --git a/dao/src/main/resources/mapper/system/RolePermissionMapper.xml b/dao/src/main/resources/mapper/system/RolePermissionMapper.xml index f4930a3..60071b5 100644 --- a/dao/src/main/resources/mapper/system/RolePermissionMapper.xml +++ b/dao/src/main/resources/mapper/system/RolePermissionMapper.xml @@ -3,7 +3,7 @@ - + @@ -41,14 +41,14 @@ - SELECT rp.power_id, permission.parent_id, permission.power_code, @@ -64,7 +64,7 @@ + + + - select * from sys_user diff --git a/dao/src/main/resources/mapper/system/UserRoleMapper.xml b/dao/src/main/resources/mapper/system/UserRoleMapper.xml index 32fc628..1816c3e 100644 --- a/dao/src/main/resources/mapper/system/UserRoleMapper.xml +++ b/dao/src/main/resources/mapper/system/UserRoleMapper.xml @@ -3,7 +3,7 @@ - + @@ -39,7 +39,7 @@ - SELECT * FROM sys_user_role WHERE role_id IN diff --git a/service/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java b/service/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java index 5fe9d1b..c992fd0 100644 --- a/service/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java +++ b/service/src/main/java/cn/bunny/services/aop/aspect/JobExecuteAspect.java @@ -3,7 +3,7 @@ package cn.bunny.services.aop.aspect; import cn.bunny.services.domain.common.constant.LocalDateTimeConstant; import cn.bunny.services.domain.common.enums.JobEnums; import cn.bunny.services.domain.common.model.dto.quartz.ScheduleExecuteLogJson; -import cn.bunny.services.domain.system.log.entity.ScheduleExecuteLog; +import cn.bunny.services.domain.log.entity.ScheduleExecuteLog; import cn.bunny.services.mapper.log.ScheduleExecuteLogMapper; import com.alibaba.fastjson2.JSON; import jakarta.annotation.Resource; diff --git a/service/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java b/service/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java index 82b094c..dd1c2b4 100644 --- a/service/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java +++ b/service/src/main/java/cn/bunny/services/core/cache/UserAuthorizationCacheService.java @@ -1,8 +1,8 @@ package cn.bunny.services.core.cache; import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.system.system.entity.Permission; -import cn.bunny.services.domain.system.system.entity.Role; +import cn.bunny.services.domain.system.entity.Permission; +import cn.bunny.services.domain.system.entity.Role; import cn.bunny.services.mapper.system.PermissionMapper; import cn.bunny.services.mapper.system.RoleMapper; import com.alibaba.fastjson2.JSON; diff --git a/service/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java b/service/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java index d46aa8a..59997ae 100644 --- a/service/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java +++ b/service/src/main/java/cn/bunny/services/core/cache/UserLoginVoBuilderCacheService.java @@ -4,9 +4,9 @@ import cn.bunny.services.core.utils.RoleHelper; import cn.bunny.services.domain.common.constant.LocalDateTimeConstant; import cn.bunny.services.domain.common.constant.RedisUserConstant; import cn.bunny.services.domain.common.model.vo.LoginVo; -import cn.bunny.services.domain.system.system.entity.AdminUser; -import cn.bunny.services.domain.system.system.entity.Permission; -import cn.bunny.services.domain.system.system.entity.Role; +import cn.bunny.services.domain.system.entity.AdminUser; +import cn.bunny.services.domain.system.entity.Permission; +import cn.bunny.services.domain.system.entity.Role; import cn.bunny.services.mapper.system.PermissionMapper; import cn.bunny.services.mapper.system.RoleMapper; import cn.bunny.services.utils.JwtTokenUtil; diff --git a/service/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java b/service/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java index 6017ff6..b4845e5 100644 --- a/service/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java +++ b/service/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.event.listener.excel; import cn.bunny.services.domain.common.model.dto.excel.I18nExcel; -import cn.bunny.services.domain.system.i18n.entity.I18n; +import cn.bunny.services.domain.i18n.entity.I18n; import cn.bunny.services.service.configuration.I18nService; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; diff --git a/service/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java b/service/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java index 87014c8..8a27ed0 100644 --- a/service/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java +++ b/service/src/main/java/cn/bunny/services/core/event/listener/excel/PermissionExcelListener.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.event.listener.excel; import cn.bunny.services.domain.common.model.dto.excel.PermissionExcel; -import cn.bunny.services.domain.system.system.entity.Permission; +import cn.bunny.services.domain.system.entity.Permission; import cn.bunny.services.service.system.PermissionService; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; diff --git a/service/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java b/service/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java index 39f5f85..e91ec29 100644 --- a/service/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java +++ b/service/src/main/java/cn/bunny/services/core/event/listener/excel/RoleExcelListener.java @@ -2,7 +2,7 @@ package cn.bunny.services.core.event.listener.excel; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.dto.excel.RoleExcel; -import cn.bunny.services.domain.system.system.entity.Role; +import cn.bunny.services.domain.system.entity.Role; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.service.system.RoleService; import com.alibaba.excel.context.AnalysisContext; diff --git a/service/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java b/service/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java index 638be36..dc65ec2 100644 --- a/service/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java +++ b/service/src/main/java/cn/bunny/services/core/event/listener/user/AbstractUserInfoUpdateHandler.java @@ -2,7 +2,7 @@ package cn.bunny.services.core.event.listener.user; import cn.bunny.services.core.cache.UserCacheCleaner; import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.system.system.entity.AdminUser; +import cn.bunny.services.domain.system.entity.AdminUser; import cn.bunny.services.mapper.system.UserMapper; import jakarta.annotation.Resource; import org.springframework.data.redis.core.RedisTemplate; diff --git a/service/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java b/service/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java index 710b580..5222269 100644 --- a/service/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java +++ b/service/src/main/java/cn/bunny/services/core/event/listener/user/UserinfoUpdateListener.java @@ -6,8 +6,8 @@ import cn.bunny.services.core.event.event.UpdateUserinfoByPermissionIdsEvent; import cn.bunny.services.core.event.event.UpdateUserinfoByRoleIdsEvent; import cn.bunny.services.core.event.event.UpdateUserinfoByUserIdsEvent; import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.system.system.entity.RolePermission; -import cn.bunny.services.domain.system.system.entity.UserRole; +import cn.bunny.services.domain.system.entity.RolePermission; +import cn.bunny.services.domain.system.entity.UserRole; import cn.bunny.services.mapper.system.RolePermissionMapper; import cn.bunny.services.mapper.system.UserRoleMapper; import jakarta.annotation.Resource; diff --git a/service/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java b/service/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java index a97b2a7..c49ab94 100644 --- a/service/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java +++ b/service/src/main/java/cn/bunny/services/core/strategy/login/DefaultLoginStrategy.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.strategy.login; -import cn.bunny.services.domain.system.system.dto.user.LoginDto; -import cn.bunny.services.domain.system.system.entity.AdminUser; +import cn.bunny.services.domain.system.dto.user.LoginDto; +import cn.bunny.services.domain.system.entity.AdminUser; import cn.bunny.services.mapper.system.UserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/service/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java b/service/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java index cd548a1..1bd14e9 100644 --- a/service/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java +++ b/service/src/main/java/cn/bunny/services/core/strategy/login/EmailLoginStrategy.java @@ -2,8 +2,8 @@ package cn.bunny.services.core.strategy.login; import cn.bunny.services.core.cache.EmailCacheService; import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.system.system.dto.user.LoginDto; -import cn.bunny.services.domain.system.system.entity.AdminUser; +import cn.bunny.services.domain.system.dto.user.LoginDto; +import cn.bunny.services.domain.system.entity.AdminUser; import cn.bunny.services.mapper.system.UserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/service/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java b/service/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java index 1b81486..26c92db 100644 --- a/service/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java +++ b/service/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.strategy.login; -import cn.bunny.services.domain.system.system.dto.user.LoginDto; -import cn.bunny.services.domain.system.system.entity.AdminUser; +import cn.bunny.services.domain.system.dto.user.LoginDto; +import cn.bunny.services.domain.system.entity.AdminUser; import org.springframework.security.core.userdetails.UsernameNotFoundException; import java.util.Map; diff --git a/service/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java b/service/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java index b96ce3f..302d688 100644 --- a/service/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java +++ b/service/src/main/java/cn/bunny/services/core/strategy/login/LoginStrategy.java @@ -1,8 +1,8 @@ package cn.bunny.services.core.strategy.login; -import cn.bunny.services.domain.system.system.dto.user.LoginDto; -import cn.bunny.services.domain.system.system.entity.AdminUser; +import cn.bunny.services.domain.system.dto.user.LoginDto; +import cn.bunny.services.domain.system.entity.AdminUser; /** * 登录策略 diff --git a/service/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java b/service/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java index b3dad97..d180d16 100644 --- a/service/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java +++ b/service/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java @@ -4,8 +4,8 @@ import cn.bunny.services.config.mail.MailSenderConfiguration; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.dto.email.EmailSend; import cn.bunny.services.domain.common.model.dto.email.EmailSendInit; -import cn.bunny.services.domain.system.email.entity.EmailTemplate; -import cn.bunny.services.domain.system.email.entity.EmailUsers; +import cn.bunny.services.domain.email.entity.EmailTemplate; +import cn.bunny.services.domain.email.entity.EmailUsers; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailUsersMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java b/service/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java index 011fd26..0bd8da5 100644 --- a/service/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java +++ b/service/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java @@ -1,6 +1,6 @@ package cn.bunny.services.core.template.email; -import cn.bunny.services.domain.system.email.entity.EmailTemplate; +import cn.bunny.services.domain.email.entity.EmailTemplate; import cn.bunny.services.mapper.configuration.EmailTemplateMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/core/utils/RoleHelper.java b/service/src/main/java/cn/bunny/services/core/utils/RoleHelper.java index 72d0839..99866d9 100644 --- a/service/src/main/java/cn/bunny/services/core/utils/RoleHelper.java +++ b/service/src/main/java/cn/bunny/services/core/utils/RoleHelper.java @@ -2,7 +2,7 @@ package cn.bunny.services.core.utils; import cn.bunny.services.context.BaseContext; import cn.bunny.services.domain.common.constant.SecurityConfigConstant; -import cn.bunny.services.domain.system.system.entity.AdminUser; +import cn.bunny.services.domain.system.entity.AdminUser; import java.util.List; diff --git a/service/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java b/service/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java index 9186864..4b41f53 100644 --- a/service/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java +++ b/service/src/main/java/cn/bunny/services/core/utils/RouterServiceHelper.java @@ -1,12 +1,12 @@ package cn.bunny.services.core.utils; import cn.bunny.services.context.BaseContext; -import cn.bunny.services.domain.system.system.entity.RouterRole; -import cn.bunny.services.domain.system.system.entity.router.Router; -import cn.bunny.services.domain.system.system.entity.router.RouterMeta; -import cn.bunny.services.domain.system.system.views.ViewRolePermission; -import cn.bunny.services.domain.system.system.views.ViewRouterRole; -import cn.bunny.services.domain.system.system.vo.router.WebUserRouterVo; +import cn.bunny.services.domain.system.entity.RouterRole; +import cn.bunny.services.domain.system.entity.router.Router; +import cn.bunny.services.domain.system.entity.router.RouterMeta; +import cn.bunny.services.domain.system.views.ViewRolePermission; +import cn.bunny.services.domain.system.views.ViewRouterRole; +import cn.bunny.services.domain.system.vo.router.WebUserRouterVo; import cn.bunny.services.service.system.RouterRoleService; import com.alibaba.fastjson2.JSON; import jakarta.annotation.Resource; diff --git a/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java b/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java index 355e494..68c87de 100644 --- a/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java +++ b/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java @@ -1,7 +1,7 @@ package cn.bunny.services.security.config; import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.system.system.entity.AdminUser; +import cn.bunny.services.domain.system.entity.AdminUser; import cn.bunny.services.mapper.system.UserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.context.annotation.Bean; diff --git a/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java b/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java index 99fc8c3..83f3e13 100644 --- a/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java +++ b/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java @@ -3,8 +3,8 @@ package cn.bunny.services.security.service; import cn.bunny.services.context.BaseContext; import cn.bunny.services.core.cache.UserAuthorizationCacheService; import cn.bunny.services.core.utils.RoleHelper; -import cn.bunny.services.domain.system.system.entity.Permission; -import cn.bunny.services.domain.system.system.entity.Role; +import cn.bunny.services.domain.system.entity.Permission; +import cn.bunny.services.domain.system.entity.Role; import cn.bunny.services.security.config.WebSecurityConfig; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java b/service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java index c560a1e..365cfa5 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/ConfigurationService.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.system.configuration.dto.WebConfigurationDto; -import cn.bunny.services.domain.system.configuration.entity.WebConfiguration; +import cn.bunny.services.domain.configuration.dto.WebConfigurationDto; +import cn.bunny.services.domain.configuration.entity.WebConfiguration; public interface ConfigurationService { diff --git a/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java b/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java index 13a72e2..e8bc1d4 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java @@ -1,11 +1,9 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.system.email.dto.EmailTemplateAddDto; -import cn.bunny.services.domain.system.email.dto.EmailTemplateDto; -import cn.bunny.services.domain.system.email.dto.EmailTemplateUpdateDto; -import cn.bunny.services.domain.system.email.entity.EmailTemplate; -import cn.bunny.services.domain.system.email.vo.EmailTemplateVo; import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.email.dto.EmailTemplateDto; +import cn.bunny.services.domain.email.entity.EmailTemplate; +import cn.bunny.services.domain.email.vo.EmailTemplateVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; @@ -35,14 +33,14 @@ public interface EmailTemplateService extends IService { * * @param dto 添加表单 */ - void addEmailTemplate(@Valid EmailTemplateAddDto dto); + void addEmailTemplate(@Valid EmailTemplateDto dto); /** * 更新邮件模板表 * * @param dto 更新表单 */ - void updateEmailTemplate(@Valid EmailTemplateUpdateDto dto); + void updateEmailTemplate(@Valid EmailTemplateDto dto); /** * 删除|批量删除邮件模板表类型 diff --git a/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java b/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java index 148148b..a7db809 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java @@ -1,11 +1,9 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.system.email.dto.EmailUsersAddDto; -import cn.bunny.services.domain.system.email.dto.EmailUsersDto; -import cn.bunny.services.domain.system.email.dto.EmailUsersUpdateDto; -import cn.bunny.services.domain.system.email.entity.EmailUsers; -import cn.bunny.services.domain.system.email.vo.EmailUsersVo; import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.email.dto.EmailUsersDto; +import cn.bunny.services.domain.email.entity.EmailUsers; +import cn.bunny.services.domain.email.vo.EmailUsersVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; @@ -35,14 +33,14 @@ public interface EmailUsersService extends IService { * * @param dto 添加表单 */ - void addEmailUsers(@Valid EmailUsersAddDto dto); + void addEmailUsers(@Valid EmailUsersDto dto); /** * 更新邮箱用户发送配置 * * @param dto 更新表单 */ - void updateEmailUsers(@Valid EmailUsersUpdateDto dto); + void updateEmailUsers(@Valid EmailUsersDto dto); /** * 删除|批量删除邮箱用户发送配置类型 diff --git a/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java b/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java index 2f1e419..8b7c5f8 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java @@ -1,13 +1,13 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.system.i18n.dto.I18nDto; -import cn.bunny.services.domain.system.i18n.dto.I18nUpdateByFileDto; -import cn.bunny.services.domain.system.i18n.dto.I18nUpdateDto; -import cn.bunny.services.domain.system.i18n.entity.I18n; -import cn.bunny.services.domain.system.i18n.vo.I18nVo; +import cn.bunny.services.domain.i18n.dto.I18nDto; +import cn.bunny.services.domain.i18n.dto.I18nUpdateByFileDto; +import cn.bunny.services.domain.i18n.dto.I18nUpdateDto; +import cn.bunny.services.domain.i18n.entity.I18n; +import cn.bunny.services.domain.i18n.vo.I18nVo; import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.system.i18n.dto.I18nAddDto; +import cn.bunny.services.domain.i18n.dto.I18nAddDto; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java b/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java index bac94e4..b79c297 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.system.i18n.dto.I18nTypeAddDto; -import cn.bunny.services.domain.system.i18n.dto.I18nTypeDto; -import cn.bunny.services.domain.system.i18n.dto.I18nTypeUpdateDto; -import cn.bunny.services.domain.system.i18n.entity.I18nType; -import cn.bunny.services.domain.system.i18n.vo.I18nTypeVo; +import cn.bunny.services.domain.i18n.dto.I18nTypeAddDto; +import cn.bunny.services.domain.i18n.dto.I18nTypeDto; +import cn.bunny.services.domain.i18n.dto.I18nTypeUpdateDto; +import cn.bunny.services.domain.i18n.entity.I18nType; +import cn.bunny.services.domain.i18n.vo.I18nTypeVo; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java b/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java index 797cd39..5be85b6 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.system.menuIcon.dto.MenuIconAddDto; -import cn.bunny.services.domain.system.menuIcon.dto.MenuIconDto; -import cn.bunny.services.domain.system.menuIcon.dto.MenuIconUpdateDto; -import cn.bunny.services.domain.system.menuIcon.entity.MenuIcon; -import cn.bunny.services.domain.system.menuIcon.vo.MenuIconVo; +import cn.bunny.services.domain.menuIcon.dto.MenuIconAddDto; +import cn.bunny.services.domain.menuIcon.dto.MenuIconDto; +import cn.bunny.services.domain.menuIcon.dto.MenuIconUpdateDto; +import cn.bunny.services.domain.menuIcon.entity.MenuIcon; +import cn.bunny.services.domain.menuIcon.vo.MenuIconVo; import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java index 5f34b98..9fbda9d 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.configuration.impl; -import cn.bunny.services.domain.system.configuration.dto.WebConfigurationDto; -import cn.bunny.services.domain.system.configuration.entity.WebConfiguration; +import cn.bunny.services.domain.configuration.dto.WebConfigurationDto; +import cn.bunny.services.domain.configuration.entity.WebConfiguration; import cn.bunny.services.domain.common.constant.RedisUserConstant; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java index 2cfab02..7bdc282 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java @@ -1,13 +1,11 @@ package cn.bunny.services.service.configuration.impl; -import cn.bunny.services.domain.system.email.dto.EmailTemplateAddDto; -import cn.bunny.services.domain.system.email.dto.EmailTemplateDto; -import cn.bunny.services.domain.system.email.dto.EmailTemplateUpdateDto; -import cn.bunny.services.domain.system.email.entity.EmailTemplate; -import cn.bunny.services.domain.system.email.vo.EmailTemplateVo; import cn.bunny.services.domain.common.enums.EmailTemplateEnums; -import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.email.dto.EmailTemplateDto; +import cn.bunny.services.domain.email.entity.EmailTemplate; +import cn.bunny.services.domain.email.vo.EmailTemplateVo; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailTemplateMapper; import cn.bunny.services.service.configuration.EmailTemplateService; @@ -73,7 +71,7 @@ public class EmailTemplateServiceImpl extends ServiceImpl emailTemplates = list(Wrappers.lambdaQuery().eq(EmailTemplate::getType, type)); - List isEmailTemplateListEmpty = emailTemplates.stream().filter(template -> template.getIsDefault().equals(true)).toList(); + List isEmailTemplateListEmpty = emailTemplates.stream() + .filter(template -> template.getIsDefault().equals(true)) + .toList(); if (isEmailTemplateListEmpty.isEmpty()) { EmailTemplate template = emailTemplates.get(0); template.setIsDefault(Boolean.TRUE); diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java index 9684761..de562a2 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java @@ -1,12 +1,10 @@ package cn.bunny.services.service.configuration.impl; -import cn.bunny.services.domain.system.email.dto.EmailUsersAddDto; -import cn.bunny.services.domain.system.email.dto.EmailUsersDto; -import cn.bunny.services.domain.system.email.dto.EmailUsersUpdateDto; -import cn.bunny.services.domain.system.email.entity.EmailUsers; -import cn.bunny.services.domain.system.email.vo.EmailUsersVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.email.dto.EmailUsersDto; +import cn.bunny.services.domain.email.entity.EmailUsers; +import cn.bunny.services.domain.email.vo.EmailUsersVo; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailUsersMapper; import cn.bunny.services.service.configuration.EmailUsersService; @@ -64,7 +62,7 @@ public class EmailUsersServiceImpl extends ServiceImpl