From f9e9dbcedd20f02868328578120703896698a4ae Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Sat, 31 Aug 2024 01:36:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=A1=B9=E7=9B=AE=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- ...cation.java => YouLaiBootApplication.java} | 10 +- .../boot/common/annotation/LogAnnotation.java | 2 +- .../boot/common/enums/DataScopeEnum.java | 2 +- .../boot/common/enums/FormTypeEnum.java | 2 +- .../youlai/boot/common/enums/GenderEnum.java | 2 +- .../boot/common/enums/MenuTypeEnum.java | 2 +- .../boot/common/enums/QueryTypeEnum.java | 2 +- .../youlai/boot/common/enums/StatusEnum.java | 2 +- .../exception/GlobalExceptionHandler.java | 4 +- .../com/youlai/boot/config/MybatisConfig.java | 4 +- .../youlai/boot/config/SecurityConfig.java | 14 ++- .../com/youlai/boot/config/SwaggerConfig.java | 2 +- .../com/youlai/boot/config/WebMvcConfig.java | 2 - .../youlai/boot/config/WebSocketConfig.java | 6 +- .../{framework => core}/aspect/LogAspect.java | 8 +- .../aspect/NoRepeatAspect.java | 2 +- .../filter/RateLimiterFilter.java | 4 +- .../filter/RequestLogFilter.java | 2 +- .../core/handler/MyDataPermissionHandler.java | 100 ++++++++++++++++++ .../core/handler/MyMetaObjectHandler.java | 39 +++++++ .../exception/MyAccessDeniedHandler.java | 4 +- .../exception/MyAuthenticationEntryPoint.java | 4 +- .../filter/CaptchaValidationFilter.java | 2 +- .../security/filter/JwtValidationFilter.java | 4 +- .../security/model/SysUserDetails.java | 4 +- .../security/service/PermissionService.java | 6 +- .../service/SysUserDetailsService.java | 8 +- .../security/util/JwtUtils.java | 6 +- .../security/util/SecurityUtils.java | 6 +- .../auth}/controller/AuthController.java | 12 +-- .../auth}/service/AuthService.java | 6 +- .../auth}/service/impl/AuthServiceImpl.java | 14 +-- .../file}/controller/FileController.java | 14 +-- .../file/service/FileService.java} | 6 +- .../file/service/impl/AliyunFileService.java} | 8 +- .../file/service/impl/MinioFileService.java} | 11 +- .../controller/GeneratorController.java | 18 ++-- .../generator/mapper/DatabaseMapper.java | 12 +-- .../generator/mapper/GenConfigMapper.java | 4 +- .../mapper/GenFieldConfigMapper.java | 4 +- .../generator}/model/entity/GenConfig.java | 4 +- .../model/entity/GenFieldConfig.java | 9 +- .../generator}/model/form/GenConfigForm.java | 6 +- .../generator/service/GenConfigService.java | 4 +- .../service/GenFieldConfigService.java | 4 +- .../generator/service/GeneratorService.java | 10 +- .../service/impl/GenConfigServiceImpl.java | 8 +- .../impl/GenFieldConfigServiceImpl.java | 8 +- .../service/impl/GeneratorServiceImpl.java | 40 +++---- .../mail}/service/MailService.java | 2 +- .../mail}/service/impl/MailServiceImpl.java | 4 +- .../sms}/service/SmsService.java | 2 +- .../sms}/service/impl/AliyunSmsService.java | 4 +- .../controller/SysConfigController.java | 10 +- .../system/controller/SysDeptController.java | 16 +-- .../system/controller/SysDictController.java | 18 ++-- .../system/controller/SysLogController.java | 16 +-- .../system/controller/SysMenuController.java | 20 ++-- .../system/controller/SysRoleController.java | 18 ++-- .../system/controller/SysUserController.java | 31 +++--- .../controller/WebsocketController.java | 4 +- .../system/converter/ConfigConverter.java | 8 +- .../system/converter/DeptConverter.java | 8 +- .../system/converter/DictConverter.java | 8 +- .../system/converter/DictItemConverter.java | 10 +- .../system/converter/GenConfigConverter.java | 8 +- .../system/converter/MenuConverter.java | 8 +- .../system/converter/RoleConverter.java | 10 +- .../system/converter/UserConverter.java | 18 ++-- .../system/event/UserConnectionEvent.java | 2 +- .../system/handler/XxlJobSampleHandler.java | 2 +- .../system/listener/UserImportListener.java | 30 +++--- .../system/mapper/SysConfigMapper.java | 4 +- .../system/mapper/SysDeptMapper.java | 4 +- .../system/mapper/SysDictItemMapper.java | 4 +- .../system/mapper/SysDictMapper.java | 8 +- .../system/mapper/SysLogMapper.java | 12 +-- .../system/mapper/SysMenuMapper.java | 6 +- .../system/mapper/SysRoleMapper.java | 4 +- .../system/mapper/SysRoleMenuMapper.java | 6 +- .../system/mapper/SysUserMapper.java | 14 +-- .../system/mapper/SysUserRoleMapper.java | 4 +- .../system/model/bo/ColumnMetaData.java | 2 +- .../system/model/bo/RolePermsBO.java | 2 +- .../{module => }/system/model/bo/RouteBO.java | 4 +- .../system/model/bo/TableMetaData.java | 2 +- .../{module => }/system/model/bo/UserBO.java | 2 +- .../system/model/bo/VisitCount.java | 2 +- .../system/model/dto/CaptchaResult.java | 2 +- .../system/model/dto/ChatMessage.java | 2 +- .../system/model/dto/FileInfo.java | 2 +- .../system/model/dto/LoginResult.java | 2 +- .../system/model/dto/UserAuthInfo.java | 2 +- .../system/model/dto/UserExportDTO.java | 2 +- .../system/model/dto/UserImportDTO.java | 2 +- .../system/model/entity/SysConfig.java | 2 +- .../system/model/entity/SysDept.java | 4 +- .../system/model/entity/SysDict.java | 4 +- .../system/model/entity/SysDictItem.java | 2 +- .../system/model/entity/SysLog.java | 4 +- .../system/model/entity/SysMenu.java | 4 +- .../system/model/entity/SysRole.java | 4 +- .../system/model/entity/SysRoleMenu.java | 2 +- .../system/model/entity/SysUser.java | 4 +- .../system/model/entity/SysUserRole.java | 2 +- .../system/model/form/ConfigForm.java | 2 +- .../system/model/form/DeptForm.java | 2 +- .../system/model/form/DictForm.java | 2 +- .../system/model/form/EmailChangeForm.java | 2 +- .../system/model/form/MenuForm.java | 6 +- .../system/model/form/MobileBindingForm.java | 2 +- .../system/model/form/PasswordChangeForm.java | 2 +- .../system/model/form/PasswordResetForm.java | 2 +- .../system/model/form/RoleForm.java | 2 +- .../system/model/form/UserForm.java | 2 +- .../system/model/form/UserProfileForm.java | 2 +- .../system/model/query/ConfigPageQuery.java | 2 +- .../system/model/query/DeptQuery.java | 2 +- .../system/model/query/DictPageQuery.java | 4 +- .../system/model/query/LogPageQuery.java | 4 +- .../system/model/query/MenuQuery.java | 2 +- .../system/model/query/PermPageQuery.java | 4 +- .../system/model/query/RolePageQuery.java | 4 +- .../system/model/query/TablePageQuery.java | 4 +- .../system/model/query/UserPageQuery.java | 4 +- .../system/model/vo/ConfigVO.java | 2 +- .../{module => }/system/model/vo/DeptVO.java | 2 +- .../system/model/vo/DictPageVO.java | 2 +- .../system/model/vo/GeneratorPreviewVO.java | 2 +- .../system/model/vo/LogPageVO.java | 4 +- .../{module => }/system/model/vo/MenuVO.java | 4 +- .../system/model/vo/RolePageVO.java | 2 +- .../{module => }/system/model/vo/RouteVO.java | 2 +- .../system/model/vo/TablePageVO.java | 2 +- .../system/model/vo/UserInfoVO.java | 2 +- .../system/model/vo/UserPageVO.java | 2 +- .../system/model/vo/UserProfileVO.java | 2 +- .../system/model/vo/VisitStatsVO.java | 2 +- .../system/model/vo/VisitTrendVO.java | 2 +- .../system/service/SysConfigService.java | 10 +- .../system/service/SysDeptService.java | 12 +-- .../system/service/SysDictItemService.java | 4 +- .../system/service/SysDictService.java | 12 +-- .../system/service/SysLogService.java | 12 +-- .../system/service/SysMenuService.java | 16 +-- .../system/service/SysRoleMenuService.java | 4 +- .../system/service/SysRoleService.java | 12 +-- .../system/service/SysUserRoleService.java | 4 +- .../system/service/SysUserService.java | 18 ++-- .../system/service/WebsocketService.java | 2 +- .../service/impl/SysConfigServiceImpl.java | 18 ++-- .../service/impl/SysDeptServiceImpl.java | 24 ++--- .../service/impl/SysDictItemServiceImpl.java | 8 +- .../service/impl/SysDictServiceImpl.java | 24 ++--- .../service/impl/SysLogServiceImpl.java | 18 ++-- .../service/impl/SysMenuServiceImpl.java | 34 +++--- .../service/impl/SysRoleMenuServiceImpl.java | 12 +-- .../service/impl/SysRoleServiceImpl.java | 28 ++--- .../service/impl/SysUserRoleServiceImpl.java | 8 +- .../service/impl/SysUserServiceImpl.java | 39 ++++--- .../service/impl/WebsocketServiceImpl.java | 6 +- src/main/resources/application-dev.yml | 9 +- src/main/resources/application-prod.yml | 6 +- src/main/resources/mapper/DatabaseMapper.xml | 6 +- src/main/resources/mapper/SysConfigMapper.xml | 2 +- src/main/resources/mapper/SysDeptMapper.xml | 2 +- .../resources/mapper/SysDictItemMapper.xml | 4 +- src/main/resources/mapper/SysDictMapper.xml | 6 +- src/main/resources/mapper/SysLogMapper.xml | 12 +-- src/main/resources/mapper/SysMenuMapper.xml | 6 +- src/main/resources/mapper/SysRoleMapper.xml | 2 +- .../resources/mapper/SysRoleMenuMapper.xml | 8 +- src/main/resources/mapper/SysUserMapper.xml | 14 +-- .../resources/mapper/SysUserRoleMapper.xml | 2 +- .../templates/generator/controller.java.vm | 4 +- .../templates/generator/entity.java.vm | 2 +- .../templates/generator/query.java.vm | 2 +- .../generator/FastAutoGeneratorTest.java | 4 +- .../laboratory/ConfigLoadOrderTests.java | 2 +- .../youlai/system/middleware/RedisTests.java | 4 +- 181 files changed, 749 insertions(+), 603 deletions(-) rename src/main/java/com/youlai/boot/{BootApplication.java => YouLaiBootApplication.java} (76%) rename src/main/java/com/youlai/boot/{framework => core}/aspect/LogAspect.java (93%) rename src/main/java/com/youlai/boot/{framework => core}/aspect/NoRepeatAspect.java (98%) rename src/main/java/com/youlai/boot/{framework => core}/filter/RateLimiterFilter.java (96%) rename src/main/java/com/youlai/boot/{framework => core}/filter/RequestLogFilter.java (95%) create mode 100644 src/main/java/com/youlai/boot/core/handler/MyDataPermissionHandler.java create mode 100644 src/main/java/com/youlai/boot/core/handler/MyMetaObjectHandler.java rename src/main/java/com/youlai/boot/{framework => core}/security/exception/MyAccessDeniedHandler.java (88%) rename src/main/java/com/youlai/boot/{framework => core}/security/exception/MyAuthenticationEntryPoint.java (93%) rename src/main/java/com/youlai/boot/{framework => core}/security/filter/CaptchaValidationFilter.java (98%) rename src/main/java/com/youlai/boot/{framework => core}/security/filter/JwtValidationFilter.java (97%) rename src/main/java/com/youlai/boot/{framework => core}/security/model/SysUserDetails.java (95%) rename src/main/java/com/youlai/boot/{framework => core}/security/service/PermissionService.java (94%) rename src/main/java/com/youlai/boot/{framework => core}/security/service/SysUserDetailsService.java (85%) rename src/main/java/com/youlai/boot/{framework => core}/security/util/JwtUtils.java (95%) rename src/main/java/com/youlai/boot/{framework => core}/security/util/SecurityUtils.java (94%) rename src/main/java/com/youlai/boot/{module/system => infrastructure/auth}/controller/AuthController.java (82%) rename src/main/java/com/youlai/boot/{module/system => infrastructure/auth}/service/AuthService.java (72%) rename src/main/java/com/youlai/boot/{module/system => infrastructure/auth}/service/impl/AuthServiceImpl.java (94%) rename src/main/java/com/youlai/boot/{module/system => infrastructure/file}/controller/FileController.java (77%) rename src/main/java/com/youlai/boot/{common/service/OssService.java => infrastructure/file/service/FileService.java} (76%) rename src/main/java/com/youlai/boot/{common/service/impl/AliyunOssService.java => infrastructure/file/service/impl/AliyunFileService.java} (93%) rename src/main/java/com/youlai/boot/{common/service/impl/MinioOssService.java => infrastructure/file/service/impl/MinioFileService.java} (95%) rename src/main/java/com/youlai/boot/{module => infrastructure}/generator/controller/GeneratorController.java (87%) rename src/main/java/com/youlai/boot/{module => infrastructure}/generator/mapper/DatabaseMapper.java (57%) rename src/main/java/com/youlai/boot/{module => infrastructure}/generator/mapper/GenConfigMapper.java (67%) rename src/main/java/com/youlai/boot/{module => infrastructure}/generator/mapper/GenFieldConfigMapper.java (67%) rename src/main/java/com/youlai/boot/{module/system => infrastructure/generator}/model/entity/GenConfig.java (86%) rename src/main/java/com/youlai/boot/{module/system => infrastructure/generator}/model/entity/GenFieldConfig.java (86%) rename src/main/java/com/youlai/boot/{module/system => infrastructure/generator}/model/form/GenConfigForm.java (94%) rename src/main/java/com/youlai/boot/{module => infrastructure}/generator/service/GenConfigService.java (60%) rename src/main/java/com/youlai/boot/{module => infrastructure}/generator/service/GenFieldConfigService.java (60%) rename src/main/java/com/youlai/boot/{module => infrastructure}/generator/service/GeneratorService.java (79%) rename src/main/java/com/youlai/boot/{module => infrastructure}/generator/service/impl/GenConfigServiceImpl.java (57%) rename src/main/java/com/youlai/boot/{module => infrastructure}/generator/service/impl/GenFieldConfigServiceImpl.java (58%) rename src/main/java/com/youlai/boot/{module => infrastructure}/generator/service/impl/GeneratorServiceImpl.java (93%) rename src/main/java/com/youlai/boot/{common => infrastructure/mail}/service/MailService.java (92%) rename src/main/java/com/youlai/boot/{common => infrastructure/mail}/service/impl/MailServiceImpl.java (95%) rename src/main/java/com/youlai/boot/{common => infrastructure/sms}/service/SmsService.java (90%) rename src/main/java/com/youlai/boot/{common => infrastructure/sms}/service/impl/AliyunSmsService.java (95%) rename src/main/java/com/youlai/boot/{module => }/system/controller/SysConfigController.java (89%) rename src/main/java/com/youlai/boot/{module => }/system/controller/SysDeptController.java (86%) rename src/main/java/com/youlai/boot/{module => }/system/controller/SysDictController.java (86%) rename src/main/java/com/youlai/boot/{module => }/system/controller/SysLogController.java (79%) rename src/main/java/com/youlai/boot/{module => }/system/controller/SysMenuController.java (86%) rename src/main/java/com/youlai/boot/{module => }/system/controller/SysRoleController.java (88%) rename src/main/java/com/youlai/boot/{module => }/system/controller/SysUserController.java (90%) rename src/main/java/com/youlai/boot/{module => }/system/controller/WebsocketController.java (94%) rename src/main/java/com/youlai/boot/{module => }/system/converter/ConfigConverter.java (63%) rename src/main/java/com/youlai/boot/{module => }/system/converter/DeptConverter.java (57%) rename src/main/java/com/youlai/boot/{module => }/system/converter/DictConverter.java (62%) rename src/main/java/com/youlai/boot/{module => }/system/converter/DictItemConverter.java (77%) rename src/main/java/com/youlai/boot/{module => }/system/converter/GenConfigConverter.java (81%) rename src/main/java/com/youlai/boot/{module => }/system/converter/MenuConverter.java (65%) rename src/main/java/com/youlai/boot/{module => }/system/converter/RoleConverter.java (72%) rename src/main/java/com/youlai/boot/{module => }/system/converter/UserConverter.java (66%) rename src/main/java/com/youlai/boot/{module => }/system/event/UserConnectionEvent.java (89%) rename src/main/java/com/youlai/boot/{module => }/system/handler/XxlJobSampleHandler.java (88%) rename src/main/java/com/youlai/boot/{module => }/system/listener/UserImportListener.java (88%) rename src/main/java/com/youlai/boot/{module => }/system/mapper/SysConfigMapper.java (70%) rename src/main/java/com/youlai/boot/{module => }/system/mapper/SysDeptMapper.java (84%) rename src/main/java/com/youlai/boot/{module => }/system/mapper/SysDictItemMapper.java (70%) rename src/main/java/com/youlai/boot/{module => }/system/mapper/SysDictMapper.java (70%) rename src/main/java/com/youlai/boot/{module => }/system/mapper/SysLogMapper.java (77%) rename src/main/java/com/youlai/boot/{module => }/system/mapper/SysMenuMapper.java (70%) rename src/main/java/com/youlai/boot/{module => }/system/mapper/SysRoleMapper.java (76%) rename src/main/java/com/youlai/boot/{module => }/system/mapper/SysRoleMenuMapper.java (81%) rename src/main/java/com/youlai/boot/{module => }/system/mapper/SysUserMapper.java (76%) rename src/main/java/com/youlai/boot/{module => }/system/mapper/SysUserRoleMapper.java (78%) rename src/main/java/com/youlai/boot/{module => }/system/model/bo/ColumnMetaData.java (94%) rename src/main/java/com/youlai/boot/{module => }/system/model/bo/RolePermsBO.java (86%) rename src/main/java/com/youlai/boot/{module => }/system/model/bo/RouteBO.java (93%) rename src/main/java/com/youlai/boot/{module => }/system/model/bo/TableMetaData.java (91%) rename src/main/java/com/youlai/boot/{module => }/system/model/bo/UserBO.java (95%) rename src/main/java/com/youlai/boot/{module => }/system/model/bo/VisitCount.java (84%) rename src/main/java/com/youlai/boot/{module => }/system/model/dto/CaptchaResult.java (91%) rename src/main/java/com/youlai/boot/{module => }/system/model/dto/ChatMessage.java (86%) rename src/main/java/com/youlai/boot/{module => }/system/model/dto/FileInfo.java (84%) rename src/main/java/com/youlai/boot/{module => }/system/model/dto/LoginResult.java (91%) rename src/main/java/com/youlai/boot/{module => }/system/model/dto/UserAuthInfo.java (89%) rename src/main/java/com/youlai/boot/{module => }/system/model/dto/UserExportDTO.java (94%) rename src/main/java/com/youlai/boot/{module => }/system/model/dto/UserImportDTO.java (92%) rename src/main/java/com/youlai/boot/{module => }/system/model/entity/SysConfig.java (94%) rename src/main/java/com/youlai/boot/{module => }/system/model/entity/SysDept.java (87%) rename src/main/java/com/youlai/boot/{module => }/system/model/entity/SysDict.java (79%) rename src/main/java/com/youlai/boot/{module => }/system/model/entity/SysDictItem.java (93%) rename src/main/java/com/youlai/boot/{module => }/system/model/entity/SysLog.java (92%) rename src/main/java/com/youlai/boot/{module => }/system/model/entity/SysMenu.java (95%) rename src/main/java/com/youlai/boot/{module => }/system/model/entity/SysRole.java (86%) rename src/main/java/com/youlai/boot/{module => }/system/model/entity/SysRoleMenu.java (89%) rename src/main/java/com/youlai/boot/{module => }/system/model/entity/SysUser.java (89%) rename src/main/java/com/youlai/boot/{module => }/system/model/entity/SysUserRole.java (90%) rename src/main/java/com/youlai/boot/{module => }/system/model/form/ConfigForm.java (95%) rename src/main/java/com/youlai/boot/{module => }/system/model/form/DeptForm.java (94%) rename src/main/java/com/youlai/boot/{module => }/system/model/form/DictForm.java (96%) rename src/main/java/com/youlai/boot/{module => }/system/model/form/EmailChangeForm.java (87%) rename src/main/java/com/youlai/boot/{module => }/system/model/form/MenuForm.java (91%) rename src/main/java/com/youlai/boot/{module => }/system/model/form/MobileBindingForm.java (87%) rename src/main/java/com/youlai/boot/{module => }/system/model/form/PasswordChangeForm.java (88%) rename src/main/java/com/youlai/boot/{module => }/system/model/form/PasswordResetForm.java (87%) rename src/main/java/com/youlai/boot/{module => }/system/model/form/RoleForm.java (94%) rename src/main/java/com/youlai/boot/{module => }/system/model/form/UserForm.java (96%) rename src/main/java/com/youlai/boot/{module => }/system/model/form/UserProfileForm.java (93%) rename src/main/java/com/youlai/boot/{module => }/system/model/query/ConfigPageQuery.java (89%) rename src/main/java/com/youlai/boot/{module => }/system/model/query/DeptQuery.java (88%) rename src/main/java/com/youlai/boot/{module => }/system/model/query/DictPageQuery.java (77%) rename src/main/java/com/youlai/boot/{module => }/system/model/query/LogPageQuery.java (83%) rename src/main/java/com/youlai/boot/{module => }/system/model/query/MenuQuery.java (88%) rename src/main/java/com/youlai/boot/{module => }/system/model/query/PermPageQuery.java (77%) rename src/main/java/com/youlai/boot/{module => }/system/model/query/RolePageQuery.java (87%) rename src/main/java/com/youlai/boot/{module => }/system/model/query/TablePageQuery.java (84%) rename src/main/java/com/youlai/boot/{module => }/system/model/query/UserPageQuery.java (85%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/ConfigVO.java (94%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/DeptVO.java (95%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/DictPageVO.java (95%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/GeneratorPreviewVO.java (89%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/LogPageVO.java (93%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/MenuVO.java (93%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/RolePageVO.java (93%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/RouteVO.java (97%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/TablePageVO.java (94%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/UserInfoVO.java (93%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/UserPageVO.java (95%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/UserProfileVO.java (95%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/VisitStatsVO.java (93%) rename src/main/java/com/youlai/boot/{module => }/system/model/vo/VisitTrendVO.java (91%) rename src/main/java/com/youlai/boot/{module => }/system/service/SysConfigService.java (82%) rename src/main/java/com/youlai/boot/{module => }/system/service/SysDeptService.java (77%) rename src/main/java/com/youlai/boot/{module => }/system/service/SysDictItemService.java (64%) rename src/main/java/com/youlai/boot/{module => }/system/service/SysDictService.java (80%) rename src/main/java/com/youlai/boot/{module => }/system/service/SysLogService.java (69%) rename src/main/java/com/youlai/boot/{module => }/system/service/SysMenuService.java (75%) rename src/main/java/com/youlai/boot/{module => }/system/service/SysRoleMenuService.java (90%) rename src/main/java/com/youlai/boot/{module => }/system/service/SysRoleService.java (84%) rename src/main/java/com/youlai/boot/{module => }/system/service/SysUserRoleService.java (82%) rename src/main/java/com/youlai/boot/{module => }/system/service/SysUserService.java (83%) rename src/main/java/com/youlai/boot/{module => }/system/service/WebsocketService.java (70%) rename src/main/java/com/youlai/boot/{module => }/system/service/impl/SysConfigServiceImpl.java (89%) rename src/main/java/com/youlai/boot/{module => }/system/service/impl/SysDeptServiceImpl.java (92%) rename src/main/java/com/youlai/boot/{module => }/system/service/impl/SysDictItemServiceImpl.java (63%) rename src/main/java/com/youlai/boot/{module => }/system/service/impl/SysDictServiceImpl.java (91%) rename src/main/java/com/youlai/boot/{module => }/system/service/impl/SysLogServiceImpl.java (87%) rename src/main/java/com/youlai/boot/{module => }/system/service/impl/SysMenuServiceImpl.java (94%) rename src/main/java/com/youlai/boot/{module => }/system/service/impl/SysRoleMenuServiceImpl.java (91%) rename src/main/java/com/youlai/boot/{module => }/system/service/impl/SysRoleServiceImpl.java (90%) rename src/main/java/com/youlai/boot/{module => }/system/service/impl/SysUserRoleServiceImpl.java (91%) rename src/main/java/com/youlai/boot/{module => }/system/service/impl/SysUserServiceImpl.java (91%) rename src/main/java/com/youlai/boot/{module => }/system/service/impl/WebsocketServiceImpl.java (90%) diff --git a/pom.xml b/pom.xml index edb3d2ca..5aa9a62f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.youlai youlai-boot - 2.9.0 + 2.10.0 基于 Java 17 + SpringBoot 3 + Spring Security 构建的权限管理系统。 diff --git a/src/main/java/com/youlai/boot/BootApplication.java b/src/main/java/com/youlai/boot/YouLaiBootApplication.java similarity index 76% rename from src/main/java/com/youlai/boot/BootApplication.java rename to src/main/java/com/youlai/boot/YouLaiBootApplication.java index 0cadb649..f0313509 100644 --- a/src/main/java/com/youlai/boot/BootApplication.java +++ b/src/main/java/com/youlai/boot/YouLaiBootApplication.java @@ -5,11 +5,17 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; import org.springframework.scheduling.annotation.EnableScheduling; +/** + * + * @author Ray + */ @SpringBootApplication @ConfigurationPropertiesScan @EnableScheduling -public class BootApplication { +public class YouLaiBootApplication { + public static void main(String[] args) { - SpringApplication.run(BootApplication.class, args); + SpringApplication.run(YouLaiBootApplication.class, args); } + } diff --git a/src/main/java/com/youlai/boot/common/annotation/LogAnnotation.java b/src/main/java/com/youlai/boot/common/annotation/LogAnnotation.java index c60cd3e9..049581e8 100644 --- a/src/main/java/com/youlai/boot/common/annotation/LogAnnotation.java +++ b/src/main/java/com/youlai/boot/common/annotation/LogAnnotation.java @@ -1,6 +1,6 @@ package com.youlai.boot.common.annotation; -import com.youlai.system.enums.LogModuleEnum; +import com.youlai.boot.common.enums.LogModuleEnum; import java.lang.annotation.*; diff --git a/src/main/java/com/youlai/boot/common/enums/DataScopeEnum.java b/src/main/java/com/youlai/boot/common/enums/DataScopeEnum.java index b71ea866..46373d1b 100644 --- a/src/main/java/com/youlai/boot/common/enums/DataScopeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/DataScopeEnum.java @@ -1,6 +1,6 @@ package com.youlai.boot.common.enums; -import com.youlai.system.common.base.IBaseEnum; +import com.youlai.boot.common.base.IBaseEnum; import lombok.Getter; /** diff --git a/src/main/java/com/youlai/boot/common/enums/FormTypeEnum.java b/src/main/java/com/youlai/boot/common/enums/FormTypeEnum.java index cece51e3..cad7f245 100644 --- a/src/main/java/com/youlai/boot/common/enums/FormTypeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/FormTypeEnum.java @@ -3,7 +3,7 @@ package com.youlai.boot.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.youlai.system.common.base.IBaseEnum; +import com.youlai.boot.common.base.IBaseEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/common/enums/GenderEnum.java b/src/main/java/com/youlai/boot/common/enums/GenderEnum.java index c5c03313..94a565ae 100644 --- a/src/main/java/com/youlai/boot/common/enums/GenderEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/GenderEnum.java @@ -1,6 +1,6 @@ package com.youlai.boot.common.enums; -import com.youlai.system.common.base.IBaseEnum; +import com.youlai.boot.common.base.IBaseEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/com/youlai/boot/common/enums/MenuTypeEnum.java b/src/main/java/com/youlai/boot/common/enums/MenuTypeEnum.java index f3d333f2..66c533cb 100644 --- a/src/main/java/com/youlai/boot/common/enums/MenuTypeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/MenuTypeEnum.java @@ -1,7 +1,7 @@ package com.youlai.boot.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; -import com.youlai.system.common.base.IBaseEnum; +import com.youlai.boot.common.base.IBaseEnum; import lombok.Getter; /** diff --git a/src/main/java/com/youlai/boot/common/enums/QueryTypeEnum.java b/src/main/java/com/youlai/boot/common/enums/QueryTypeEnum.java index 986fc67b..0428f4f0 100644 --- a/src/main/java/com/youlai/boot/common/enums/QueryTypeEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/QueryTypeEnum.java @@ -3,7 +3,7 @@ package com.youlai.boot.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.youlai.system.common.base.IBaseEnum; +import com.youlai.boot.common.base.IBaseEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/common/enums/StatusEnum.java b/src/main/java/com/youlai/boot/common/enums/StatusEnum.java index 59a12126..4d767c83 100644 --- a/src/main/java/com/youlai/boot/common/enums/StatusEnum.java +++ b/src/main/java/com/youlai/boot/common/enums/StatusEnum.java @@ -1,6 +1,6 @@ package com.youlai.boot.common.enums; -import com.youlai.system.common.base.IBaseEnum; +import com.youlai.boot.common.base.IBaseEnum; import lombok.Getter; /** diff --git a/src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java b/src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java index 9f6bb028..513aec40 100644 --- a/src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/youlai/boot/common/exception/GlobalExceptionHandler.java @@ -2,8 +2,8 @@ package com.youlai.boot.common.exception; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.core.JsonProcessingException; -import com.youlai.system.common.result.Result; -import com.youlai.system.common.result.ResultCode; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.common.result.ResultCode; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.TypeMismatchException; import org.springframework.context.support.DefaultMessageSourceResolvable; diff --git a/src/main/java/com/youlai/boot/config/MybatisConfig.java b/src/main/java/com/youlai/boot/config/MybatisConfig.java index 586fb6b7..e6cb1dac 100644 --- a/src/main/java/com/youlai/boot/config/MybatisConfig.java +++ b/src/main/java/com/youlai/boot/config/MybatisConfig.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.youlai.system.plugin.mybatis.handler.MyDataPermissionHandler; -import com.youlai.system.plugin.mybatis.handler.MyMetaObjectHandler; +import com.youlai.boot.core.handler.MyDataPermissionHandler; +import com.youlai.boot.core.handler.MyMetaObjectHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; diff --git a/src/main/java/com/youlai/boot/config/SecurityConfig.java b/src/main/java/com/youlai/boot/config/SecurityConfig.java index f66e9e4e..42c23aef 100644 --- a/src/main/java/com/youlai/boot/config/SecurityConfig.java +++ b/src/main/java/com/youlai/boot/config/SecurityConfig.java @@ -4,12 +4,12 @@ import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.collection.CollectionUtil; import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.config.property.SecurityProperties; -import com.youlai.boot.framework.filter.RateLimiterFilter; -import com.youlai.boot.framework.security.exception.MyAccessDeniedHandler; -import com.youlai.boot.framework.security.exception.MyAuthenticationEntryPoint; -import com.youlai.boot.framework.security.filter.JwtValidationFilter; -import com.youlai.boot.framework.security.filter.CaptchaValidationFilter; -import com.youlai.boot.module.system.service.SysConfigService; +import com.youlai.boot.core.filter.RateLimiterFilter; +import com.youlai.boot.core.security.exception.MyAccessDeniedHandler; +import com.youlai.boot.core.security.exception.MyAuthenticationEntryPoint; +import com.youlai.boot.core.security.filter.JwtValidationFilter; +import com.youlai.boot.core.security.filter.CaptchaValidationFilter; +import com.youlai.boot.system.service.SysConfigService; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -47,8 +47,6 @@ public class SecurityConfig { private final SecurityProperties securityProperties; private final SysConfigService sysConfigService; - - @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http diff --git a/src/main/java/com/youlai/boot/config/SwaggerConfig.java b/src/main/java/com/youlai/boot/config/SwaggerConfig.java index 829b59b6..2c4b0b93 100644 --- a/src/main/java/com/youlai/boot/config/SwaggerConfig.java +++ b/src/main/java/com/youlai/boot/config/SwaggerConfig.java @@ -68,7 +68,7 @@ public class SwaggerConfig { if (openApi.getPaths() != null) { openApi.getPaths().forEach((s, pathItem) -> { // 登录接口/验证码不需要添加鉴权参数 - if (s.equals("/api/v1/auth/login") || s.equals("/api/v1/auth/captcha")) { + if ("/api/v1/auth/login".equals(s) || "/api/v1/auth/captcha".equals(s)) { return; } // 接口添加鉴权参数 diff --git a/src/main/java/com/youlai/boot/config/WebMvcConfig.java b/src/main/java/com/youlai/boot/config/WebMvcConfig.java index 6bf75f30..59aa3716 100644 --- a/src/main/java/com/youlai/boot/config/WebMvcConfig.java +++ b/src/main/java/com/youlai/boot/config/WebMvcConfig.java @@ -21,9 +21,7 @@ import org.springframework.validation.beanvalidation.SpringConstraintValidatorFa import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.math.BigInteger; -import java.text.SimpleDateFormat; import java.util.List; -import java.util.TimeZone; /** * WebMvc 自动装配配置 diff --git a/src/main/java/com/youlai/boot/config/WebSocketConfig.java b/src/main/java/com/youlai/boot/config/WebSocketConfig.java index ae416dc8..a3add524 100644 --- a/src/main/java/com/youlai/boot/config/WebSocketConfig.java +++ b/src/main/java/com/youlai/boot/config/WebSocketConfig.java @@ -3,9 +3,9 @@ package com.youlai.boot.config; import cn.hutool.core.util.StrUtil; import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.JWTUtil; -import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.boot.module.system.event.UserConnectionEvent; -import com.youlai.system.service.WebsocketService; +import com.youlai.boot.common.constant.SecurityConstants; +import com.youlai.boot.system.event.UserConnectionEvent; +import com.youlai.boot.system.service.WebsocketService; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.context.ApplicationEventPublisher; diff --git a/src/main/java/com/youlai/boot/framework/aspect/LogAspect.java b/src/main/java/com/youlai/boot/core/aspect/LogAspect.java similarity index 93% rename from src/main/java/com/youlai/boot/framework/aspect/LogAspect.java rename to src/main/java/com/youlai/boot/core/aspect/LogAspect.java index 74082a73..4d3528a7 100644 --- a/src/main/java/com/youlai/boot/framework/aspect/LogAspect.java +++ b/src/main/java/com/youlai/boot/core/aspect/LogAspect.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.aspect; +package com.youlai.boot.core.aspect; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.TimeInterval; @@ -7,10 +7,10 @@ import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.common.util.IPUtils; -import com.youlai.boot.module.system.model.entity.SysLog; +import com.youlai.boot.system.model.entity.SysLog; import com.youlai.boot.common.annotation.LogAnnotation; -import com.youlai.boot.framework.security.util.SecurityUtils; -import com.youlai.boot.module.system.service.SysLogService; +import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.system.service.SysLogService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/framework/aspect/NoRepeatAspect.java b/src/main/java/com/youlai/boot/core/aspect/NoRepeatAspect.java similarity index 98% rename from src/main/java/com/youlai/boot/framework/aspect/NoRepeatAspect.java rename to src/main/java/com/youlai/boot/core/aspect/NoRepeatAspect.java index cfb4a4ea..076368a7 100644 --- a/src/main/java/com/youlai/boot/framework/aspect/NoRepeatAspect.java +++ b/src/main/java/com/youlai/boot/core/aspect/NoRepeatAspect.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.aspect; +package com.youlai.boot.core.aspect; import cn.hutool.core.util.StrUtil; import cn.hutool.jwt.JWTUtil; diff --git a/src/main/java/com/youlai/boot/framework/filter/RateLimiterFilter.java b/src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java similarity index 96% rename from src/main/java/com/youlai/boot/framework/filter/RateLimiterFilter.java rename to src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java index 3d80d284..2393acf6 100644 --- a/src/main/java/com/youlai/boot/framework/filter/RateLimiterFilter.java +++ b/src/main/java/com/youlai/boot/core/filter/RateLimiterFilter.java @@ -1,10 +1,10 @@ -package com.youlai.boot.framework.filter; +package com.youlai.boot.core.filter; import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.result.ResultCode; import com.youlai.boot.common.util.IPUtils; import com.youlai.boot.common.util.ResponseUtils; -import com.youlai.boot.module.system.service.SysConfigService; +import com.youlai.boot.system.service.SysConfigService; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/youlai/boot/framework/filter/RequestLogFilter.java b/src/main/java/com/youlai/boot/core/filter/RequestLogFilter.java similarity index 95% rename from src/main/java/com/youlai/boot/framework/filter/RequestLogFilter.java rename to src/main/java/com/youlai/boot/core/filter/RequestLogFilter.java index 4a33b190..d8942efa 100644 --- a/src/main/java/com/youlai/boot/framework/filter/RequestLogFilter.java +++ b/src/main/java/com/youlai/boot/core/filter/RequestLogFilter.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.filter; +package com.youlai.boot.core.filter; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/core/handler/MyDataPermissionHandler.java b/src/main/java/com/youlai/boot/core/handler/MyDataPermissionHandler.java new file mode 100644 index 00000000..6995b0c0 --- /dev/null +++ b/src/main/java/com/youlai/boot/core/handler/MyDataPermissionHandler.java @@ -0,0 +1,100 @@ +package com.youlai.boot.core.handler; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; +import com.youlai.boot.common.annotation.DataPermission; +import com.youlai.boot.common.base.IBaseEnum; +import com.youlai.boot.common.enums.DataScopeEnum; +import com.youlai.boot.core.security.util.SecurityUtils; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.expression.operators.conditional.AndExpression; +import net.sf.jsqlparser.parser.CCJSqlParserUtil; + +import java.lang.reflect.Method; + +/** + * 数据权限控制器 + * + * @author zc + * @since 2021-12-10 13:28 + */ +@Slf4j +public class MyDataPermissionHandler implements DataPermissionHandler { + + @Override + @SneakyThrows + public Expression getSqlSegment(Expression where, String mappedStatementId) { + + Class clazz = Class.forName(mappedStatementId.substring(0, mappedStatementId.lastIndexOf(StringPool.DOT))); + String methodName = mappedStatementId.substring(mappedStatementId.lastIndexOf(StringPool.DOT) + 1); + Method[] methods = clazz.getDeclaredMethods(); + for (Method method : methods) { + if (method.getName().equals(methodName)) { + DataPermission annotation = method.getAnnotation(DataPermission.class); + // 如果没有注解或者是超级管理员，直接返回 + if (annotation == null || SecurityUtils.isRoot() ) { + return where; + } + return dataScopeFilter(annotation.deptAlias(), annotation.deptIdColumnName(), annotation.userAlias(), annotation.userIdColumnName(), where); + } + } + return where; + } + + /** + * 构建过滤条件 + * + * @param where 当前查询条件 + * @return 构建后查询条件 + */ + @SneakyThrows + public static Expression dataScopeFilter(String deptAlias, String deptIdColumnName, String userAlias, String userIdColumnName, Expression where) { + + + String deptColumnName = StrUtil.isNotBlank(deptAlias) ? (deptAlias + StringPool.DOT + deptIdColumnName) : deptIdColumnName; + String userColumnName = StrUtil.isNotBlank(userAlias) ? (userAlias + StringPool.DOT + userIdColumnName) : userIdColumnName; + + // 获取当前用户的数据权限 + Integer dataScope = SecurityUtils.getDataScope(); + + DataScopeEnum dataScopeEnum = IBaseEnum.getEnumByValue(dataScope, DataScopeEnum.class); + + Long deptId, userId; + String appendSqlStr; + switch (dataScopeEnum) { + case ALL: + return where; + case DEPT: + deptId = SecurityUtils.getDeptId(); + appendSqlStr = deptColumnName + StringPool.EQUALS + deptId; + break; + case SELF: + userId = SecurityUtils.getUserId(); + appendSqlStr = userColumnName + StringPool.EQUALS + userId; + break; + // 默认部门及子部门数据权限 + default: + deptId = SecurityUtils.getDeptId(); + appendSqlStr = deptColumnName + " IN ( SELECT id FROM sys_dept WHERE id = " + deptId + " OR FIND_IN_SET( " + deptId + " , tree_path ) )"; + break; + } + + if (StrUtil.isBlank(appendSqlStr)) { + return where; + } + + Expression appendExpression = CCJSqlParserUtil.parseCondExpression(appendSqlStr); + + if (where == null) { + return appendExpression; + } + + return new AndExpression(where, appendExpression); + } + + +} + diff --git a/src/main/java/com/youlai/boot/core/handler/MyMetaObjectHandler.java b/src/main/java/com/youlai/boot/core/handler/MyMetaObjectHandler.java new file mode 100644 index 00000000..22973a52 --- /dev/null +++ b/src/main/java/com/youlai/boot/core/handler/MyMetaObjectHandler.java @@ -0,0 +1,39 @@ +package com.youlai.boot.core.handler; + +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import org.apache.ibatis.reflection.MetaObject; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +/** + * mybatis-plus 字段自动填充 + * + * @author haoxr + * @since 2022/10/14 + */ +@Component +public class MyMetaObjectHandler implements MetaObjectHandler { + + /** + * 新增填充创建时间 + * + * @param metaObject 元数据 + */ + @Override + public void insertFill(MetaObject metaObject) { + this.strictInsertFill(metaObject, "createTime", LocalDateTime::now, LocalDateTime.class); + this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); + } + + /** + * 更新填充更新时间 + * + * @param metaObject 元数据 + */ + @Override + public void updateFill(MetaObject metaObject) { + this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); + } + +} diff --git a/src/main/java/com/youlai/boot/framework/security/exception/MyAccessDeniedHandler.java b/src/main/java/com/youlai/boot/core/security/exception/MyAccessDeniedHandler.java similarity index 88% rename from src/main/java/com/youlai/boot/framework/security/exception/MyAccessDeniedHandler.java rename to src/main/java/com/youlai/boot/core/security/exception/MyAccessDeniedHandler.java index 67df64a6..60f9041b 100644 --- a/src/main/java/com/youlai/boot/framework/security/exception/MyAccessDeniedHandler.java +++ b/src/main/java/com/youlai/boot/core/security/exception/MyAccessDeniedHandler.java @@ -1,6 +1,6 @@ -package com.youlai.boot.framework.security.exception; +package com.youlai.boot.core.security.exception; -import com.youlai.system.common.result.ResultCode; +import com.youlai.boot.common.result.ResultCode; import com.youlai.boot.common.util.ResponseUtils; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; diff --git a/src/main/java/com/youlai/boot/framework/security/exception/MyAuthenticationEntryPoint.java b/src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java similarity index 93% rename from src/main/java/com/youlai/boot/framework/security/exception/MyAuthenticationEntryPoint.java rename to src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java index 78d88ee3..9f3c144e 100644 --- a/src/main/java/com/youlai/boot/framework/security/exception/MyAuthenticationEntryPoint.java +++ b/src/main/java/com/youlai/boot/core/security/exception/MyAuthenticationEntryPoint.java @@ -1,6 +1,6 @@ -package com.youlai.boot.framework.security.exception; +package com.youlai.boot.core.security.exception; -import com.youlai.system.common.result.ResultCode; +import com.youlai.boot.common.result.ResultCode; import com.youlai.boot.common.util.ResponseUtils; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.AuthenticationException; diff --git a/src/main/java/com/youlai/boot/framework/security/filter/CaptchaValidationFilter.java b/src/main/java/com/youlai/boot/core/security/filter/CaptchaValidationFilter.java similarity index 98% rename from src/main/java/com/youlai/boot/framework/security/filter/CaptchaValidationFilter.java rename to src/main/java/com/youlai/boot/core/security/filter/CaptchaValidationFilter.java index 5700fa05..095be092 100644 --- a/src/main/java/com/youlai/boot/framework/security/filter/CaptchaValidationFilter.java +++ b/src/main/java/com/youlai/boot/core/security/filter/CaptchaValidationFilter.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.security.filter; +package com.youlai.boot.core.security.filter; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.util.StrUtil; diff --git a/src/main/java/com/youlai/boot/framework/security/filter/JwtValidationFilter.java b/src/main/java/com/youlai/boot/core/security/filter/JwtValidationFilter.java similarity index 97% rename from src/main/java/com/youlai/boot/framework/security/filter/JwtValidationFilter.java rename to src/main/java/com/youlai/boot/core/security/filter/JwtValidationFilter.java index c2f56e85..17403cc7 100644 --- a/src/main/java/com/youlai/boot/framework/security/filter/JwtValidationFilter.java +++ b/src/main/java/com/youlai/boot/core/security/filter/JwtValidationFilter.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.security.filter; +package com.youlai.boot.core.security.filter; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; @@ -7,7 +7,7 @@ import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.JWTUtil; import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.common.result.ResultCode; -import com.youlai.boot.framework.security.util.JwtUtils; +import com.youlai.boot.core.security.util.JwtUtils; import com.youlai.boot.common.util.ResponseUtils; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/src/main/java/com/youlai/boot/framework/security/model/SysUserDetails.java b/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java similarity index 95% rename from src/main/java/com/youlai/boot/framework/security/model/SysUserDetails.java rename to src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java index 6c604b89..e7801e8e 100644 --- a/src/main/java/com/youlai/boot/framework/security/model/SysUserDetails.java +++ b/src/main/java/com/youlai/boot/core/security/model/SysUserDetails.java @@ -1,8 +1,8 @@ -package com.youlai.boot.framework.security.model; +package com.youlai.boot.core.security.model; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -import com.youlai.boot.module.system.model.dto.UserAuthInfo; +import com.youlai.boot.system.model.dto.UserAuthInfo; import lombok.Data; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/youlai/boot/framework/security/service/PermissionService.java b/src/main/java/com/youlai/boot/core/security/service/PermissionService.java similarity index 94% rename from src/main/java/com/youlai/boot/framework/security/service/PermissionService.java rename to src/main/java/com/youlai/boot/core/security/service/PermissionService.java index 0b149970..363bcd6c 100644 --- a/src/main/java/com/youlai/boot/framework/security/service/PermissionService.java +++ b/src/main/java/com/youlai/boot/core/security/service/PermissionService.java @@ -1,9 +1,9 @@ -package com.youlai.boot.framework.security.service; +package com.youlai.boot.core.security.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.boot.framework.security.util.SecurityUtils; +import com.youlai.boot.common.constant.SecurityConstants; +import com.youlai.boot.core.security.util.SecurityUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/com/youlai/boot/framework/security/service/SysUserDetailsService.java b/src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java similarity index 85% rename from src/main/java/com/youlai/boot/framework/security/service/SysUserDetailsService.java rename to src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java index fa60bfc0..9b3271ed 100644 --- a/src/main/java/com/youlai/boot/framework/security/service/SysUserDetailsService.java +++ b/src/main/java/com/youlai/boot/core/security/service/SysUserDetailsService.java @@ -1,8 +1,8 @@ -package com.youlai.boot.framework.security.service; +package com.youlai.boot.core.security.service; -import com.youlai.boot.framework.security.model.SysUserDetails; -import com.youlai.boot.module.system.model.dto.UserAuthInfo; -import com.youlai.boot.module.system.service.SysUserService; +import com.youlai.boot.core.security.model.SysUserDetails; +import com.youlai.boot.system.model.dto.UserAuthInfo; +import com.youlai.boot.system.service.SysUserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/com/youlai/boot/framework/security/util/JwtUtils.java b/src/main/java/com/youlai/boot/core/security/util/JwtUtils.java similarity index 95% rename from src/main/java/com/youlai/boot/framework/security/util/JwtUtils.java rename to src/main/java/com/youlai/boot/core/security/util/JwtUtils.java index 2b8ecf76..aef6df32 100644 --- a/src/main/java/com/youlai/boot/framework/security/util/JwtUtils.java +++ b/src/main/java/com/youlai/boot/core/security/util/JwtUtils.java @@ -1,4 +1,4 @@ -package com.youlai.boot.framework.security.util; +package com.youlai.boot.core.security.util; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; @@ -6,8 +6,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.json.JSONObject; import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.JWTUtil; -import com.youlai.system.common.constant.JwtClaimConstants; -import com.youlai.boot.framework.security.model.SysUserDetails; +import com.youlai.boot.common.constant.JwtClaimConstants; +import com.youlai.boot.core.security.model.SysUserDetails; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/youlai/boot/framework/security/util/SecurityUtils.java b/src/main/java/com/youlai/boot/core/security/util/SecurityUtils.java similarity index 94% rename from src/main/java/com/youlai/boot/framework/security/util/SecurityUtils.java rename to src/main/java/com/youlai/boot/core/security/util/SecurityUtils.java index b844c6ab..e78c0e01 100644 --- a/src/main/java/com/youlai/boot/framework/security/util/SecurityUtils.java +++ b/src/main/java/com/youlai/boot/core/security/util/SecurityUtils.java @@ -1,9 +1,9 @@ -package com.youlai.boot.framework.security.util; +package com.youlai.boot.core.security.util; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.youlai.system.common.constant.SystemConstants; -import com.youlai.boot.framework.security.model.SysUserDetails; +import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.core.security.model.SysUserDetails; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/com/youlai/boot/module/system/controller/AuthController.java b/src/main/java/com/youlai/boot/infrastructure/auth/controller/AuthController.java similarity index 82% rename from src/main/java/com/youlai/boot/module/system/controller/AuthController.java rename to src/main/java/com/youlai/boot/infrastructure/auth/controller/AuthController.java index 3b9eedc7..d71ff47d 100644 --- a/src/main/java/com/youlai/boot/module/system/controller/AuthController.java +++ b/src/main/java/com/youlai/boot/infrastructure/auth/controller/AuthController.java @@ -1,11 +1,11 @@ -package com.youlai.boot.module.system.controller; +package com.youlai.boot.infrastructure.auth.controller; -import com.youlai.system.enums.LogModuleEnum; -import com.youlai.system.common.result.Result; -import com.youlai.boot.module.system.model.dto.CaptchaResult; -import com.youlai.boot.module.system.model.dto.LoginResult; +import com.youlai.boot.common.enums.LogModuleEnum; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.infrastructure.auth.service.AuthService; +import com.youlai.boot.system.model.dto.CaptchaResult; +import com.youlai.boot.system.model.dto.LoginResult; import com.youlai.boot.common.annotation.LogAnnotation; -import com.youlai.system.service.AuthService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/youlai/boot/module/system/service/AuthService.java b/src/main/java/com/youlai/boot/infrastructure/auth/service/AuthService.java similarity index 72% rename from src/main/java/com/youlai/boot/module/system/service/AuthService.java rename to src/main/java/com/youlai/boot/infrastructure/auth/service/AuthService.java index d23d2094..a0dfb7db 100644 --- a/src/main/java/com/youlai/boot/module/system/service/AuthService.java +++ b/src/main/java/com/youlai/boot/infrastructure/auth/service/AuthService.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.service; +package com.youlai.boot.infrastructure.auth.service; -import com.youlai.boot.module.system.model.dto.CaptchaResult; -import com.youlai.boot.module.system.model.dto.LoginResult; +import com.youlai.boot.system.model.dto.CaptchaResult; +import com.youlai.boot.system.model.dto.LoginResult; /** * 认证服务接口 diff --git a/src/main/java/com/youlai/boot/module/system/service/impl/AuthServiceImpl.java b/src/main/java/com/youlai/boot/infrastructure/auth/service/impl/AuthServiceImpl.java similarity index 94% rename from src/main/java/com/youlai/boot/module/system/service/impl/AuthServiceImpl.java rename to src/main/java/com/youlai/boot/infrastructure/auth/service/impl/AuthServiceImpl.java index 3271d095..42897fea 100644 --- a/src/main/java/com/youlai/boot/module/system/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/youlai/boot/infrastructure/auth/service/impl/AuthServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.service.impl; +package com.youlai.boot.infrastructure.auth.service.impl; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CaptchaUtil; @@ -8,13 +8,13 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.jwt.JWTPayload; import cn.hutool.jwt.JWTUtil; -import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.enums.CaptchaTypeEnum; -import com.youlai.boot.module.system.model.dto.CaptchaResult; -import com.youlai.boot.module.system.model.dto.LoginResult; +import com.youlai.boot.common.constant.SecurityConstants; +import com.youlai.boot.common.enums.CaptchaTypeEnum; +import com.youlai.boot.infrastructure.auth.service.AuthService; +import com.youlai.boot.system.model.dto.CaptchaResult; +import com.youlai.boot.system.model.dto.LoginResult; import com.youlai.boot.config.property.CaptchaProperties; -import com.youlai.system.service.AuthService; -import com.youlai.boot.framework.security.util.JwtUtils; +import com.youlai.boot.core.security.util.JwtUtils; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/module/system/controller/FileController.java b/src/main/java/com/youlai/boot/infrastructure/file/controller/FileController.java similarity index 77% rename from src/main/java/com/youlai/boot/module/system/controller/FileController.java rename to src/main/java/com/youlai/boot/infrastructure/file/controller/FileController.java index ea28d16a..71b857c3 100644 --- a/src/main/java/com/youlai/boot/module/system/controller/FileController.java +++ b/src/main/java/com/youlai/boot/infrastructure/file/controller/FileController.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.system.controller; +package com.youlai.boot.infrastructure.file.controller; -import com.youlai.system.common.result.Result; -import com.youlai.boot.module.system.model.dto.FileInfo; -import com.youlai.system.service.OssService; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.infrastructure.file.service.FileService; +import com.youlai.boot.system.model.dto.FileInfo; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Schema; @@ -25,7 +25,7 @@ import org.springframework.web.multipart.MultipartFile; @RequiredArgsConstructor public class FileController { - private final OssService ossService; + private final FileService fileService; @PostMapping @Operation(summary = "文件上传") @@ -33,7 +33,7 @@ public class FileController { @Parameter(name = "file", description = "表单文件对象", required = true, in = ParameterIn.DEFAULT, schema = @Schema(name = "file", format = "binary")) @RequestPart(value = "file") MultipartFile file ) { - FileInfo fileInfo = ossService.uploadFile(file); + FileInfo fileInfo = fileService.uploadFile(file); return Result.success(fileInfo); } @@ -43,7 +43,7 @@ public class FileController { public Result deleteFile( @Parameter(description = "文件路径") @RequestParam String filePath ) { - boolean result = ossService.deleteFile(filePath); + boolean result = fileService.deleteFile(filePath); return Result.judge(result); } } diff --git a/src/main/java/com/youlai/boot/common/service/OssService.java b/src/main/java/com/youlai/boot/infrastructure/file/service/FileService.java similarity index 76% rename from src/main/java/com/youlai/boot/common/service/OssService.java rename to src/main/java/com/youlai/boot/infrastructure/file/service/FileService.java index 9aa891b8..4220dc3a 100644 --- a/src/main/java/com/youlai/boot/common/service/OssService.java +++ b/src/main/java/com/youlai/boot/infrastructure/file/service/FileService.java @@ -1,6 +1,6 @@ -package com.youlai.boot.common.service; +package com.youlai.boot.infrastructure.file.service; -import com.youlai.boot.module.system.model.dto.FileInfo; +import com.youlai.boot.system.model.dto.FileInfo; import org.springframework.web.multipart.MultipartFile; /** @@ -9,7 +9,7 @@ import org.springframework.web.multipart.MultipartFile; * @author haoxr * @since 2022/11/19 */ -public interface OssService { +public interface FileService { /** * 上传文件 diff --git a/src/main/java/com/youlai/boot/common/service/impl/AliyunOssService.java b/src/main/java/com/youlai/boot/infrastructure/file/service/impl/AliyunFileService.java similarity index 93% rename from src/main/java/com/youlai/boot/common/service/impl/AliyunOssService.java rename to src/main/java/com/youlai/boot/infrastructure/file/service/impl/AliyunFileService.java index e7e3dbf3..b173356d 100644 --- a/src/main/java/com/youlai/boot/common/service/impl/AliyunOssService.java +++ b/src/main/java/com/youlai/boot/infrastructure/file/service/impl/AliyunFileService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.common.service.impl; +package com.youlai.boot.infrastructure.file.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; @@ -8,8 +8,8 @@ import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.model.ObjectMetadata; import com.aliyun.oss.model.PutObjectRequest; -import com.youlai.boot.module.system.model.dto.FileInfo; -import com.youlai.system.service.OssService; +import com.youlai.boot.infrastructure.file.service.FileService; +import com.youlai.boot.system.model.dto.FileInfo; import jakarta.annotation.PostConstruct; import lombok.Data; import lombok.RequiredArgsConstructor; @@ -33,7 +33,7 @@ import java.time.LocalDateTime; @ConfigurationProperties(prefix = "oss.aliyun") @RequiredArgsConstructor @Data -public class AliyunOssService implements OssService { +public class AliyunFileService implements FileService { /** * 服务Endpoint */ diff --git a/src/main/java/com/youlai/boot/common/service/impl/MinioOssService.java b/src/main/java/com/youlai/boot/infrastructure/file/service/impl/MinioFileService.java similarity index 95% rename from src/main/java/com/youlai/boot/common/service/impl/MinioOssService.java rename to src/main/java/com/youlai/boot/infrastructure/file/service/impl/MinioFileService.java index f4921dbd..298044a6 100644 --- a/src/main/java/com/youlai/boot/common/service/impl/MinioOssService.java +++ b/src/main/java/com/youlai/boot/infrastructure/file/service/impl/MinioFileService.java @@ -1,12 +1,12 @@ -package com.youlai.boot.common.service.impl; +package com.youlai.boot.infrastructure.file.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.youlai.boot.module.system.model.dto.FileInfo; -import com.youlai.system.service.OssService; +import com.youlai.boot.infrastructure.file.service.FileService; +import com.youlai.boot.system.model.dto.FileInfo; import io.minio.*; import io.minio.errors.*; import io.minio.http.Method; @@ -36,7 +36,7 @@ import java.time.LocalDateTime; @ConfigurationProperties(prefix = "oss.minio") @RequiredArgsConstructor @Data -public class MinioOssService implements OssService { +public class MinioFileService implements FileService { /** * 服务Endpoint @@ -102,7 +102,8 @@ public class MinioOssService implements OssService { // 返回文件路径 String fileUrl; - if (StrUtil.isBlank(customDomain)) { // 未配置自定义域名 + // 未配置自定义域名 + if (StrUtil.isBlank(customDomain)) { GetPresignedObjectUrlArgs getPresignedObjectUrlArgs = GetPresignedObjectUrlArgs.builder() .bucket(bucketName).object(fileName) .method(Method.GET) diff --git a/src/main/java/com/youlai/boot/module/generator/controller/GeneratorController.java b/src/main/java/com/youlai/boot/infrastructure/generator/controller/GeneratorController.java similarity index 87% rename from src/main/java/com/youlai/boot/module/generator/controller/GeneratorController.java rename to src/main/java/com/youlai/boot/infrastructure/generator/controller/GeneratorController.java index 13df11d2..a5e06bd9 100644 --- a/src/main/java/com/youlai/boot/module/generator/controller/GeneratorController.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/controller/GeneratorController.java @@ -1,16 +1,16 @@ -package com.youlai.boot.module.generator.controller; +package com.youlai.boot.infrastructure.generator.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.common.result.PageResult; -import com.youlai.system.common.result.Result; +import com.youlai.boot.common.result.PageResult; +import com.youlai.boot.common.result.Result; import com.youlai.boot.config.property.GeneratorProperties; -import com.youlai.system.enums.LogModuleEnum; -import com.youlai.boot.module.system.model.form.GenConfigForm; -import com.youlai.boot.module.system.model.query.TablePageQuery; -import com.youlai.boot.module.system.model.vo.GeneratorPreviewVO; -import com.youlai.boot.module.system.model.vo.TablePageVO; +import com.youlai.boot.common.enums.LogModuleEnum; +import com.youlai.boot.infrastructure.generator.service.GeneratorService; +import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm; +import com.youlai.boot.system.model.query.TablePageQuery; +import com.youlai.boot.system.model.vo.GeneratorPreviewVO; +import com.youlai.boot.system.model.vo.TablePageVO; import com.youlai.boot.common.annotation.LogAnnotation; -import com.youlai.system.service.GeneratorService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/youlai/boot/module/generator/mapper/DatabaseMapper.java b/src/main/java/com/youlai/boot/infrastructure/generator/mapper/DatabaseMapper.java similarity index 57% rename from src/main/java/com/youlai/boot/module/generator/mapper/DatabaseMapper.java rename to src/main/java/com/youlai/boot/infrastructure/generator/mapper/DatabaseMapper.java index 1e876d51..a0277dc6 100644 --- a/src/main/java/com/youlai/boot/module/generator/mapper/DatabaseMapper.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/mapper/DatabaseMapper.java @@ -1,12 +1,12 @@ -package com.youlai.boot.module.generator.mapper; +package com.youlai.boot.infrastructure.generator.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.system.model.bo.ColumnMetaData; -import com.youlai.boot.module.system.model.bo.TableMetaData; -import com.youlai.boot.module.system.model.entity.SysDept; -import com.youlai.boot.module.system.model.query.TablePageQuery; -import com.youlai.boot.module.system.model.vo.TablePageVO; +import com.youlai.boot.system.model.bo.ColumnMetaData; +import com.youlai.boot.system.model.bo.TableMetaData; +import com.youlai.boot.system.model.entity.SysDept; +import com.youlai.boot.system.model.query.TablePageQuery; +import com.youlai.boot.system.model.vo.TablePageVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/generator/mapper/GenConfigMapper.java b/src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenConfigMapper.java similarity index 67% rename from src/main/java/com/youlai/boot/module/generator/mapper/GenConfigMapper.java rename to src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenConfigMapper.java index 565dd54b..0c9f0208 100644 --- a/src/main/java/com/youlai/boot/module/generator/mapper/GenConfigMapper.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.generator.mapper; +package com.youlai.boot.infrastructure.generator.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.module.system.model.entity.GenConfig; +import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/generator/mapper/GenFieldConfigMapper.java b/src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenFieldConfigMapper.java similarity index 67% rename from src/main/java/com/youlai/boot/module/generator/mapper/GenFieldConfigMapper.java rename to src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenFieldConfigMapper.java index 7b01fc08..beb953ac 100644 --- a/src/main/java/com/youlai/boot/module/generator/mapper/GenFieldConfigMapper.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/mapper/GenFieldConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.generator.mapper; +package com.youlai.boot.infrastructure.generator.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.module.system.model.entity.GenFieldConfig; +import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/system/model/entity/GenConfig.java b/src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenConfig.java similarity index 86% rename from src/main/java/com/youlai/boot/module/system/model/entity/GenConfig.java rename to src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenConfig.java index 36da6c4e..6f1e7b37 100644 --- a/src/main/java/com/youlai/boot/module/system/model/entity/GenConfig.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenConfig.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.system.model.entity; +package com.youlai.boot.infrastructure.generator.model.entity; import com.baomidou.mybatisplus.annotation.*; -import com.youlai.system.common.base.BaseEntity; +import com.youlai.boot.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/boot/module/system/model/entity/GenFieldConfig.java b/src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenFieldConfig.java similarity index 86% rename from src/main/java/com/youlai/boot/module/system/model/entity/GenFieldConfig.java rename to src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenFieldConfig.java index e8d92c52..da556e4f 100644 --- a/src/main/java/com/youlai/boot/module/system/model/entity/GenFieldConfig.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/model/entity/GenFieldConfig.java @@ -1,13 +1,12 @@ -package com.youlai.boot.module.system.model.entity; +package com.youlai.boot.infrastructure.generator.model.entity; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.youlai.system.common.base.BaseEntity; -import com.youlai.system.enums.FormTypeEnum; -import com.youlai.system.enums.QueryTypeEnum; +import com.youlai.boot.common.base.BaseEntity; +import com.youlai.boot.common.enums.FormTypeEnum; +import com.youlai.boot.common.enums.QueryTypeEnum; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/boot/module/system/model/form/GenConfigForm.java b/src/main/java/com/youlai/boot/infrastructure/generator/model/form/GenConfigForm.java similarity index 94% rename from src/main/java/com/youlai/boot/module/system/model/form/GenConfigForm.java rename to src/main/java/com/youlai/boot/infrastructure/generator/model/form/GenConfigForm.java index dda78b5f..f2a7c81a 100644 --- a/src/main/java/com/youlai/boot/module/system/model/form/GenConfigForm.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/model/form/GenConfigForm.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.model.form; +package com.youlai.boot.infrastructure.generator.model.form; -import com.youlai.system.enums.FormTypeEnum; -import com.youlai.system.enums.QueryTypeEnum; +import com.youlai.boot.common.enums.FormTypeEnum; +import com.youlai.boot.common.enums.QueryTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/generator/service/GenConfigService.java b/src/main/java/com/youlai/boot/infrastructure/generator/service/GenConfigService.java similarity index 60% rename from src/main/java/com/youlai/boot/module/generator/service/GenConfigService.java rename to src/main/java/com/youlai/boot/infrastructure/generator/service/GenConfigService.java index 233698f1..6e9a2478 100644 --- a/src/main/java/com/youlai/boot/module/generator/service/GenConfigService.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/service/GenConfigService.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.generator.service; +package com.youlai.boot.infrastructure.generator.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.system.model.entity.GenConfig; +import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/boot/module/generator/service/GenFieldConfigService.java b/src/main/java/com/youlai/boot/infrastructure/generator/service/GenFieldConfigService.java similarity index 60% rename from src/main/java/com/youlai/boot/module/generator/service/GenFieldConfigService.java rename to src/main/java/com/youlai/boot/infrastructure/generator/service/GenFieldConfigService.java index 8aac3939..568a6f6f 100644 --- a/src/main/java/com/youlai/boot/module/generator/service/GenFieldConfigService.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/service/GenFieldConfigService.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.generator.service; +package com.youlai.boot.infrastructure.generator.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.system.model.entity.GenFieldConfig; +import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig; /** * 代码生成配置接口 diff --git a/src/main/java/com/youlai/boot/module/generator/service/GeneratorService.java b/src/main/java/com/youlai/boot/infrastructure/generator/service/GeneratorService.java similarity index 79% rename from src/main/java/com/youlai/boot/module/generator/service/GeneratorService.java rename to src/main/java/com/youlai/boot/infrastructure/generator/service/GeneratorService.java index b2236666..25411f61 100644 --- a/src/main/java/com/youlai/boot/module/generator/service/GeneratorService.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/service/GeneratorService.java @@ -1,10 +1,10 @@ -package com.youlai.boot.module.generator.service; +package com.youlai.boot.infrastructure.generator.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.system.model.form.GenConfigForm; -import com.youlai.boot.module.system.model.query.TablePageQuery; -import com.youlai.boot.module.system.model.vo.GeneratorPreviewVO; -import com.youlai.boot.module.system.model.vo.TablePageVO; +import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm; +import com.youlai.boot.system.model.query.TablePageQuery; +import com.youlai.boot.system.model.vo.GeneratorPreviewVO; +import com.youlai.boot.system.model.vo.TablePageVO; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/generator/service/impl/GenConfigServiceImpl.java b/src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenConfigServiceImpl.java similarity index 57% rename from src/main/java/com/youlai/boot/module/generator/service/impl/GenConfigServiceImpl.java rename to src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenConfigServiceImpl.java index 51e2e503..23d55b67 100644 --- a/src/main/java/com/youlai/boot/module/generator/service/impl/GenConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenConfigServiceImpl.java @@ -1,9 +1,9 @@ -package com.youlai.boot.module.generator.service.impl; +package com.youlai.boot.infrastructure.generator.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.module.generator.mapper.GenConfigMapper; -import com.youlai.boot.module.system.model.entity.GenConfig; -import com.youlai.system.service.GenConfigService; +import com.youlai.boot.infrastructure.generator.mapper.GenConfigMapper; +import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; +import com.youlai.boot.infrastructure.generator.service.GenConfigService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/module/generator/service/impl/GenFieldConfigServiceImpl.java b/src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenFieldConfigServiceImpl.java similarity index 58% rename from src/main/java/com/youlai/boot/module/generator/service/impl/GenFieldConfigServiceImpl.java rename to src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenFieldConfigServiceImpl.java index 80b960bf..1204253c 100644 --- a/src/main/java/com/youlai/boot/module/generator/service/impl/GenFieldConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GenFieldConfigServiceImpl.java @@ -1,9 +1,9 @@ -package com.youlai.boot.module.generator.service.impl; +package com.youlai.boot.infrastructure.generator.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.module.generator.mapper.GenFieldConfigMapper; -import com.youlai.boot.module.system.model.entity.GenFieldConfig; -import com.youlai.system.service.GenFieldConfigService; +import com.youlai.boot.infrastructure.generator.mapper.GenFieldConfigMapper; +import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig; +import com.youlai.boot.infrastructure.generator.service.GenFieldConfigService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/module/generator/service/impl/GeneratorServiceImpl.java b/src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GeneratorServiceImpl.java similarity index 93% rename from src/main/java/com/youlai/boot/module/generator/service/impl/GeneratorServiceImpl.java rename to src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GeneratorServiceImpl.java index eb4b1a5d..f5dcaa4f 100644 --- a/src/main/java/com/youlai/boot/module/generator/service/impl/GeneratorServiceImpl.java +++ b/src/main/java/com/youlai/boot/infrastructure/generator/service/impl/GeneratorServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.generator.service.impl; +package com.youlai.boot.infrastructure.generator.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; @@ -11,26 +11,26 @@ import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.SystemApplication; +import com.youlai.boot.YouLaiBootApplication; +import com.youlai.boot.common.enums.FormTypeEnum; +import com.youlai.boot.common.enums.JavaTypeEnum; +import com.youlai.boot.common.enums.QueryTypeEnum; import com.youlai.boot.config.property.GeneratorProperties; -import com.youlai.boot.module.system.converter.GenConfigConverter; -import com.youlai.system.enums.FormTypeEnum; -import com.youlai.system.enums.JavaTypeEnum; -import com.youlai.system.enums.QueryTypeEnum; +import com.youlai.boot.infrastructure.generator.service.GenConfigService; +import com.youlai.boot.infrastructure.generator.service.GenFieldConfigService; +import com.youlai.boot.infrastructure.generator.service.GeneratorService; +import com.youlai.boot.system.converter.GenConfigConverter; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.module.generator.mapper.DatabaseMapper; -import com.youlai.boot.module.system.model.bo.ColumnMetaData; -import com.youlai.boot.module.system.model.bo.TableMetaData; -import com.youlai.boot.module.system.model.entity.GenConfig; -import com.youlai.boot.module.system.model.entity.GenFieldConfig; -import com.youlai.boot.module.system.model.form.GenConfigForm; -import com.youlai.boot.module.system.model.query.TablePageQuery; -import com.youlai.boot.module.system.model.vo.GeneratorPreviewVO; -import com.youlai.boot.module.system.model.vo.TablePageVO; -import com.youlai.system.service.GeneratorService; -import com.youlai.system.service.GenConfigService; -import com.youlai.system.service.GenFieldConfigService; -import com.youlai.system.service.SysMenuService; +import com.youlai.boot.infrastructure.generator.mapper.DatabaseMapper; +import com.youlai.boot.system.model.bo.ColumnMetaData; +import com.youlai.boot.system.model.bo.TableMetaData; +import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; +import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig; +import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm; +import com.youlai.boot.system.model.query.TablePageQuery; +import com.youlai.boot.system.model.vo.GeneratorPreviewVO; +import com.youlai.boot.system.model.vo.TablePageVO; +import com.youlai.boot.system.service.SysMenuService; import lombok.RequiredArgsConstructor; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Value; @@ -112,7 +112,7 @@ public class GeneratorServiceImpl implements GeneratorService { String entityName = StrUtil.toCamelCase(StrUtil.removePrefix(tableName, tableName.split("_")[0])); genConfig.setEntityName(entityName); - String packageName = SystemApplication.class.getPackageName(); + String packageName = YouLaiBootApplication.class.getPackageName(); genConfig.setPackageName(StrUtil.subBefore(packageName, ".", true)); genConfig.setModuleName(StrUtil.subAfter(packageName, ".", true)); diff --git a/src/main/java/com/youlai/boot/common/service/MailService.java b/src/main/java/com/youlai/boot/infrastructure/mail/service/MailService.java similarity index 92% rename from src/main/java/com/youlai/boot/common/service/MailService.java rename to src/main/java/com/youlai/boot/infrastructure/mail/service/MailService.java index 75f8fce6..6a2697f3 100644 --- a/src/main/java/com/youlai/boot/common/service/MailService.java +++ b/src/main/java/com/youlai/boot/infrastructure/mail/service/MailService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.common.service; +package com.youlai.boot.infrastructure.mail.service; /** * 邮件服务接口层 diff --git a/src/main/java/com/youlai/boot/common/service/impl/MailServiceImpl.java b/src/main/java/com/youlai/boot/infrastructure/mail/service/impl/MailServiceImpl.java similarity index 95% rename from src/main/java/com/youlai/boot/common/service/impl/MailServiceImpl.java rename to src/main/java/com/youlai/boot/infrastructure/mail/service/impl/MailServiceImpl.java index 8ac14fac..48501257 100644 --- a/src/main/java/com/youlai/boot/common/service/impl/MailServiceImpl.java +++ b/src/main/java/com/youlai/boot/infrastructure/mail/service/impl/MailServiceImpl.java @@ -1,7 +1,7 @@ -package com.youlai.boot.common.service.impl; +package com.youlai.boot.infrastructure.mail.service.impl; import com.youlai.boot.config.property.MailProperties; -import com.youlai.system.service.MailService; +import com.youlai.boot.infrastructure.mail.service.MailService; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/common/service/SmsService.java b/src/main/java/com/youlai/boot/infrastructure/sms/service/SmsService.java similarity index 90% rename from src/main/java/com/youlai/boot/common/service/SmsService.java rename to src/main/java/com/youlai/boot/infrastructure/sms/service/SmsService.java index d838592a..b3d518c2 100644 --- a/src/main/java/com/youlai/boot/common/service/SmsService.java +++ b/src/main/java/com/youlai/boot/infrastructure/sms/service/SmsService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.common.service; +package com.youlai.boot.infrastructure.sms.service; /** * 短信服务接口层 diff --git a/src/main/java/com/youlai/boot/common/service/impl/AliyunSmsService.java b/src/main/java/com/youlai/boot/infrastructure/sms/service/impl/AliyunSmsService.java similarity index 95% rename from src/main/java/com/youlai/boot/common/service/impl/AliyunSmsService.java rename to src/main/java/com/youlai/boot/infrastructure/sms/service/impl/AliyunSmsService.java index 74c27e98..64085dd0 100644 --- a/src/main/java/com/youlai/boot/common/service/impl/AliyunSmsService.java +++ b/src/main/java/com/youlai/boot/infrastructure/sms/service/impl/AliyunSmsService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.common.service.impl; +package com.youlai.boot.infrastructure.sms.service.impl; import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; @@ -9,7 +9,7 @@ import com.aliyuncs.exceptions.ServerException; import com.aliyuncs.http.MethodType; import com.aliyuncs.profile.DefaultProfile; import com.youlai.boot.config.property.AliyunSmsProperties; -import com.youlai.system.service.SmsService; +import com.youlai.boot.infrastructure.sms.service.SmsService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/module/system/controller/SysConfigController.java b/src/main/java/com/youlai/boot/system/controller/SysConfigController.java similarity index 89% rename from src/main/java/com/youlai/boot/module/system/controller/SysConfigController.java rename to src/main/java/com/youlai/boot/system/controller/SysConfigController.java index aebe35f0..ae810cf3 100644 --- a/src/main/java/com/youlai/boot/module/system/controller/SysConfigController.java +++ b/src/main/java/com/youlai/boot/system/controller/SysConfigController.java @@ -1,12 +1,12 @@ -package com.youlai.boot.module.system.controller; +package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; -import com.youlai.boot.module.system.model.form.ConfigForm; -import com.youlai.boot.module.system.model.query.ConfigPageQuery; -import com.youlai.boot.module.system.model.vo.ConfigVO; -import com.youlai.boot.module.system.service.SysConfigService; +import com.youlai.boot.system.model.form.ConfigForm; +import com.youlai.boot.system.model.query.ConfigPageQuery; +import com.youlai.boot.system.model.vo.ConfigVO; +import com.youlai.boot.system.service.SysConfigService; import io.swagger.v3.oas.annotations.Parameter; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/youlai/boot/module/system/controller/SysDeptController.java b/src/main/java/com/youlai/boot/system/controller/SysDeptController.java similarity index 86% rename from src/main/java/com/youlai/boot/module/system/controller/SysDeptController.java rename to src/main/java/com/youlai/boot/system/controller/SysDeptController.java index b05d5712..6c72cd38 100644 --- a/src/main/java/com/youlai/boot/module/system/controller/SysDeptController.java +++ b/src/main/java/com/youlai/boot/system/controller/SysDeptController.java @@ -1,14 +1,14 @@ -package com.youlai.boot.module.system.controller; +package com.youlai.boot.system.controller; -import com.youlai.system.enums.LogModuleEnum; +import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.annotation.NoRepeat; -import com.youlai.system.common.model.Option; -import com.youlai.system.common.result.Result; -import com.youlai.boot.module.system.model.form.DeptForm; -import com.youlai.boot.module.system.model.query.DeptQuery; -import com.youlai.boot.module.system.model.vo.DeptVO; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.system.model.form.DeptForm; +import com.youlai.boot.system.model.query.DeptQuery; +import com.youlai.boot.system.model.vo.DeptVO; import com.youlai.boot.common.annotation.LogAnnotation; -import com.youlai.system.service.SysDeptService; +import com.youlai.boot.system.service.SysDeptService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/youlai/boot/module/system/controller/SysDictController.java b/src/main/java/com/youlai/boot/system/controller/SysDictController.java similarity index 86% rename from src/main/java/com/youlai/boot/module/system/controller/SysDictController.java rename to src/main/java/com/youlai/boot/system/controller/SysDictController.java index 182b8f54..e2a5f8af 100644 --- a/src/main/java/com/youlai/boot/module/system/controller/SysDictController.java +++ b/src/main/java/com/youlai/boot/system/controller/SysDictController.java @@ -1,16 +1,16 @@ -package com.youlai.boot.module.system.controller; +package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.common.model.Option; -import com.youlai.system.common.result.PageResult; -import com.youlai.system.common.result.Result; -import com.youlai.system.enums.LogModuleEnum; -import com.youlai.boot.module.system.model.query.DictPageQuery; -import com.youlai.boot.module.system.model.vo.DictPageVO; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.common.result.PageResult; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.common.enums.LogModuleEnum; +import com.youlai.boot.system.model.query.DictPageQuery; +import com.youlai.boot.system.model.vo.DictPageVO; import com.youlai.boot.common.annotation.NoRepeat; -import com.youlai.boot.module.system.model.form.DictForm; +import com.youlai.boot.system.model.form.DictForm; import com.youlai.boot.common.annotation.LogAnnotation; -import com.youlai.system.service.SysDictService; +import com.youlai.boot.system.service.SysDictService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/youlai/boot/module/system/controller/SysLogController.java b/src/main/java/com/youlai/boot/system/controller/SysLogController.java similarity index 79% rename from src/main/java/com/youlai/boot/module/system/controller/SysLogController.java rename to src/main/java/com/youlai/boot/system/controller/SysLogController.java index 0a0577a8..20bc84f9 100644 --- a/src/main/java/com/youlai/boot/module/system/controller/SysLogController.java +++ b/src/main/java/com/youlai/boot/system/controller/SysLogController.java @@ -1,13 +1,13 @@ -package com.youlai.boot.module.system.controller; +package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.common.result.PageResult; -import com.youlai.system.common.result.Result; -import com.youlai.boot.module.system.model.query.LogPageQuery; -import com.youlai.boot.module.system.model.vo.LogPageVO; -import com.youlai.boot.module.system.model.vo.VisitStatsVO; -import com.youlai.boot.module.system.model.vo.VisitTrendVO; -import com.youlai.system.service.SysLogService; +import com.youlai.boot.common.result.PageResult; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.system.model.query.LogPageQuery; +import com.youlai.boot.system.model.vo.LogPageVO; +import com.youlai.boot.system.model.vo.VisitStatsVO; +import com.youlai.boot.system.model.vo.VisitTrendVO; +import com.youlai.boot.system.service.SysLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/youlai/boot/module/system/controller/SysMenuController.java b/src/main/java/com/youlai/boot/system/controller/SysMenuController.java similarity index 86% rename from src/main/java/com/youlai/boot/module/system/controller/SysMenuController.java rename to src/main/java/com/youlai/boot/system/controller/SysMenuController.java index d149eeb5..046f56a3 100644 --- a/src/main/java/com/youlai/boot/module/system/controller/SysMenuController.java +++ b/src/main/java/com/youlai/boot/system/controller/SysMenuController.java @@ -1,16 +1,16 @@ -package com.youlai.boot.module.system.controller; +package com.youlai.boot.system.controller; -import com.youlai.system.common.result.Result; -import com.youlai.system.enums.LogModuleEnum; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.annotation.NoRepeat; -import com.youlai.boot.module.system.model.form.MenuForm; -import com.youlai.boot.module.system.model.query.MenuQuery; -import com.youlai.boot.module.system.model.vo.MenuVO; -import com.youlai.system.common.model.Option; -import com.youlai.boot.module.system.model.vo.RouteVO; +import com.youlai.boot.system.model.form.MenuForm; +import com.youlai.boot.system.model.query.MenuQuery; +import com.youlai.boot.system.model.vo.MenuVO; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.vo.RouteVO; import com.youlai.boot.common.annotation.LogAnnotation; -import com.youlai.boot.framework.security.util.SecurityUtils; -import com.youlai.system.service.SysMenuService; +import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.system.service.SysMenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/youlai/boot/module/system/controller/SysRoleController.java b/src/main/java/com/youlai/boot/system/controller/SysRoleController.java similarity index 88% rename from src/main/java/com/youlai/boot/module/system/controller/SysRoleController.java rename to src/main/java/com/youlai/boot/system/controller/SysRoleController.java index d9e20372..e9f758a1 100644 --- a/src/main/java/com/youlai/boot/module/system/controller/SysRoleController.java +++ b/src/main/java/com/youlai/boot/system/controller/SysRoleController.java @@ -1,16 +1,16 @@ -package com.youlai.boot.module.system.controller; +package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.system.enums.LogModuleEnum; +import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.annotation.NoRepeat; -import com.youlai.system.common.model.Option; -import com.youlai.system.common.result.PageResult; -import com.youlai.system.common.result.Result; -import com.youlai.boot.module.system.model.form.RoleForm; -import com.youlai.boot.module.system.model.query.RolePageQuery; -import com.youlai.boot.module.system.model.vo.RolePageVO; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.common.result.PageResult; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.system.model.form.RoleForm; +import com.youlai.boot.system.model.query.RolePageQuery; +import com.youlai.boot.system.model.vo.RolePageVO; import com.youlai.boot.common.annotation.LogAnnotation; -import com.youlai.system.service.SysRoleService; +import com.youlai.boot.system.service.SysRoleService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/youlai/boot/module/system/controller/SysUserController.java b/src/main/java/com/youlai/boot/system/controller/SysUserController.java similarity index 90% rename from src/main/java/com/youlai/boot/module/system/controller/SysUserController.java rename to src/main/java/com/youlai/boot/system/controller/SysUserController.java index 628f5cf4..d9537515 100644 --- a/src/main/java/com/youlai/boot/module/system/controller/SysUserController.java +++ b/src/main/java/com/youlai/boot/system/controller/SysUserController.java @@ -1,28 +1,27 @@ -package com.youlai.boot.module.system.controller; +package com.youlai.boot.system.controller; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.youlai.boot.module.system.model.form.*; import com.youlai.boot.system.model.form.*; -import com.youlai.system.common.result.PageResult; -import com.youlai.system.common.result.Result; -import com.youlai.system.enums.ContactType; -import com.youlai.boot.module.system.model.vo.UserProfileVO; -import com.youlai.boot.framework.security.util.SecurityUtils; +import com.youlai.boot.common.result.PageResult; +import com.youlai.boot.common.result.Result; +import com.youlai.boot.common.enums.ContactType; +import com.youlai.boot.system.model.vo.UserProfileVO; +import com.youlai.boot.core.security.util.SecurityUtils; import com.youlai.boot.common.util.ExcelUtils; -import com.youlai.system.enums.LogModuleEnum; -import com.youlai.boot.module.system.model.dto.UserImportDTO; +import com.youlai.boot.common.enums.LogModuleEnum; +import com.youlai.boot.system.model.dto.UserImportDTO; import com.youlai.boot.common.annotation.NoRepeat; -import com.youlai.boot.module.system.listener.UserImportListener; -import com.youlai.boot.module.system.model.entity.SysUser; -import com.youlai.boot.module.system.model.query.UserPageQuery; -import com.youlai.boot.module.system.model.dto.UserExportDTO; -import com.youlai.boot.module.system.model.vo.UserInfoVO; -import com.youlai.boot.module.system.model.vo.UserPageVO; +import com.youlai.boot.system.listener.UserImportListener; +import com.youlai.boot.system.model.entity.SysUser; +import com.youlai.boot.system.model.query.UserPageQuery; +import com.youlai.boot.system.model.dto.UserExportDTO; +import com.youlai.boot.system.model.vo.UserInfoVO; +import com.youlai.boot.system.model.vo.UserPageVO; import com.youlai.boot.common.annotation.LogAnnotation; -import com.youlai.system.service.SysUserService; +import com.youlai.boot.system.service.SysUserService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/youlai/boot/module/system/controller/WebsocketController.java b/src/main/java/com/youlai/boot/system/controller/WebsocketController.java similarity index 94% rename from src/main/java/com/youlai/boot/module/system/controller/WebsocketController.java rename to src/main/java/com/youlai/boot/system/controller/WebsocketController.java index 50d17238..859da8fc 100644 --- a/src/main/java/com/youlai/boot/module/system/controller/WebsocketController.java +++ b/src/main/java/com/youlai/boot/system/controller/WebsocketController.java @@ -1,6 +1,6 @@ -package com.youlai.boot.module.system.controller; +package com.youlai.boot.system.controller; -import com.youlai.boot.module.system.model.dto.ChatMessage; +import com.youlai.boot.system.model.dto.ChatMessage; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.handler.annotation.DestinationVariable; diff --git a/src/main/java/com/youlai/boot/module/system/converter/ConfigConverter.java b/src/main/java/com/youlai/boot/system/converter/ConfigConverter.java similarity index 63% rename from src/main/java/com/youlai/boot/module/system/converter/ConfigConverter.java rename to src/main/java/com/youlai/boot/system/converter/ConfigConverter.java index 5ea1660a..297b9287 100644 --- a/src/main/java/com/youlai/boot/module/system/converter/ConfigConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/ConfigConverter.java @@ -1,9 +1,9 @@ -package com.youlai.boot.module.system.converter; +package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.system.model.entity.SysConfig; -import com.youlai.boot.module.system.model.vo.ConfigVO; -import com.youlai.boot.module.system.model.form.ConfigForm; +import com.youlai.boot.system.model.entity.SysConfig; +import com.youlai.boot.system.model.vo.ConfigVO; +import com.youlai.boot.system.model.form.ConfigForm; import org.mapstruct.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/system/converter/DeptConverter.java b/src/main/java/com/youlai/boot/system/converter/DeptConverter.java similarity index 57% rename from src/main/java/com/youlai/boot/module/system/converter/DeptConverter.java rename to src/main/java/com/youlai/boot/system/converter/DeptConverter.java index dcc3c438..14c493a9 100644 --- a/src/main/java/com/youlai/boot/module/system/converter/DeptConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/DeptConverter.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.system.converter; +package com.youlai.boot.system.converter; -import com.youlai.boot.module.system.model.entity.SysDept; -import com.youlai.boot.module.system.model.vo.DeptVO; -import com.youlai.boot.module.system.model.form.DeptForm; +import com.youlai.boot.system.model.entity.SysDept; +import com.youlai.boot.system.model.vo.DeptVO; +import com.youlai.boot.system.model.form.DeptForm; import org.mapstruct.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/system/converter/DictConverter.java b/src/main/java/com/youlai/boot/system/converter/DictConverter.java similarity index 62% rename from src/main/java/com/youlai/boot/module/system/converter/DictConverter.java rename to src/main/java/com/youlai/boot/system/converter/DictConverter.java index 666acb75..8c7d1cef 100644 --- a/src/main/java/com/youlai/boot/module/system/converter/DictConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/DictConverter.java @@ -1,9 +1,9 @@ -package com.youlai.boot.module.system.converter; +package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.system.model.entity.SysDict; -import com.youlai.boot.module.system.model.vo.DictPageVO; -import com.youlai.boot.module.system.model.form.DictForm; +import com.youlai.boot.system.model.entity.SysDict; +import com.youlai.boot.system.model.vo.DictPageVO; +import com.youlai.boot.system.model.form.DictForm; import org.mapstruct.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/system/converter/DictItemConverter.java b/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java similarity index 77% rename from src/main/java/com/youlai/boot/module/system/converter/DictItemConverter.java rename to src/main/java/com/youlai/boot/system/converter/DictItemConverter.java index dda7fd43..9c0eadae 100644 --- a/src/main/java/com/youlai/boot/module/system/converter/DictItemConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java @@ -1,10 +1,10 @@ -package com.youlai.boot.module.system.converter; +package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.system.model.entity.SysDictItem; -import com.youlai.boot.module.system.model.vo.DictPageVO; -import com.youlai.system.common.model.Option; -import com.youlai.boot.module.system.model.form.DictForm; +import com.youlai.boot.system.model.entity.SysDictItem; +import com.youlai.boot.system.model.vo.DictPageVO; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.form.DictForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; diff --git a/src/main/java/com/youlai/boot/module/system/converter/GenConfigConverter.java b/src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java similarity index 81% rename from src/main/java/com/youlai/boot/module/system/converter/GenConfigConverter.java rename to src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java index 4d59fbc7..b2d765da 100644 --- a/src/main/java/com/youlai/boot/module/system/converter/GenConfigConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/GenConfigConverter.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.system.converter; +package com.youlai.boot.system.converter; -import com.youlai.boot.module.system.model.entity.GenConfig; -import com.youlai.boot.module.system.model.entity.GenFieldConfig; -import com.youlai.boot.module.system.model.form.GenConfigForm; +import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; +import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig; +import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/src/main/java/com/youlai/boot/module/system/converter/MenuConverter.java b/src/main/java/com/youlai/boot/system/converter/MenuConverter.java similarity index 65% rename from src/main/java/com/youlai/boot/module/system/converter/MenuConverter.java rename to src/main/java/com/youlai/boot/system/converter/MenuConverter.java index 68a32c86..f27b5bf7 100644 --- a/src/main/java/com/youlai/boot/module/system/converter/MenuConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/MenuConverter.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.system.converter; +package com.youlai.boot.system.converter; -import com.youlai.boot.module.system.model.entity.SysMenu; -import com.youlai.boot.module.system.model.vo.MenuVO; -import com.youlai.boot.module.system.model.form.MenuForm; +import com.youlai.boot.system.model.entity.SysMenu; +import com.youlai.boot.system.model.vo.MenuVO; +import com.youlai.boot.system.model.form.MenuForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/src/main/java/com/youlai/boot/module/system/converter/RoleConverter.java b/src/main/java/com/youlai/boot/system/converter/RoleConverter.java similarity index 72% rename from src/main/java/com/youlai/boot/module/system/converter/RoleConverter.java rename to src/main/java/com/youlai/boot/system/converter/RoleConverter.java index 98366b03..38fd3404 100644 --- a/src/main/java/com/youlai/boot/module/system/converter/RoleConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/RoleConverter.java @@ -1,10 +1,10 @@ -package com.youlai.boot.module.system.converter; +package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.system.model.entity.SysRole; -import com.youlai.boot.module.system.model.vo.RolePageVO; -import com.youlai.system.common.model.Option; -import com.youlai.boot.module.system.model.form.RoleForm; +import com.youlai.boot.system.model.entity.SysRole; +import com.youlai.boot.system.model.vo.RolePageVO; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.form.RoleForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; diff --git a/src/main/java/com/youlai/boot/module/system/converter/UserConverter.java b/src/main/java/com/youlai/boot/system/converter/UserConverter.java similarity index 66% rename from src/main/java/com/youlai/boot/module/system/converter/UserConverter.java rename to src/main/java/com/youlai/boot/system/converter/UserConverter.java index 2771ec00..5d2b3f19 100644 --- a/src/main/java/com/youlai/boot/module/system/converter/UserConverter.java +++ b/src/main/java/com/youlai/boot/system/converter/UserConverter.java @@ -1,14 +1,14 @@ -package com.youlai.boot.module.system.converter; +package com.youlai.boot.system.converter; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.system.model.entity.SysUser; -import com.youlai.boot.module.system.model.vo.UserInfoVO; -import com.youlai.boot.module.system.model.vo.UserPageVO; -import com.youlai.boot.module.system.model.vo.UserProfileVO; -import com.youlai.boot.module.system.model.bo.UserBO; -import com.youlai.boot.module.system.model.form.UserForm; -import com.youlai.boot.module.system.model.dto.UserImportDTO; -import com.youlai.boot.module.system.model.form.UserProfileForm; +import com.youlai.boot.system.model.entity.SysUser; +import com.youlai.boot.system.model.vo.UserInfoVO; +import com.youlai.boot.system.model.vo.UserPageVO; +import com.youlai.boot.system.model.vo.UserProfileVO; +import com.youlai.boot.system.model.bo.UserBO; +import com.youlai.boot.system.model.form.UserForm; +import com.youlai.boot.system.model.dto.UserImportDTO; +import com.youlai.boot.system.model.form.UserProfileForm; import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/src/main/java/com/youlai/boot/module/system/event/UserConnectionEvent.java b/src/main/java/com/youlai/boot/system/event/UserConnectionEvent.java similarity index 89% rename from src/main/java/com/youlai/boot/module/system/event/UserConnectionEvent.java rename to src/main/java/com/youlai/boot/system/event/UserConnectionEvent.java index 4aaeb32a..8033a2c8 100644 --- a/src/main/java/com/youlai/boot/module/system/event/UserConnectionEvent.java +++ b/src/main/java/com/youlai/boot/system/event/UserConnectionEvent.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.event; +package com.youlai.boot.system.event; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/src/main/java/com/youlai/boot/module/system/handler/XxlJobSampleHandler.java b/src/main/java/com/youlai/boot/system/handler/XxlJobSampleHandler.java similarity index 88% rename from src/main/java/com/youlai/boot/module/system/handler/XxlJobSampleHandler.java rename to src/main/java/com/youlai/boot/system/handler/XxlJobSampleHandler.java index 970b55de..69628788 100644 --- a/src/main/java/com/youlai/boot/module/system/handler/XxlJobSampleHandler.java +++ b/src/main/java/com/youlai/boot/system/handler/XxlJobSampleHandler.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.handler; +package com.youlai.boot.system.handler; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/module/system/listener/UserImportListener.java b/src/main/java/com/youlai/boot/system/listener/UserImportListener.java similarity index 88% rename from src/main/java/com/youlai/boot/module/system/listener/UserImportListener.java rename to src/main/java/com/youlai/boot/system/listener/UserImportListener.java index af1bc365..cce542f4 100644 --- a/src/main/java/com/youlai/boot/module/system/listener/UserImportListener.java +++ b/src/main/java/com/youlai/boot/system/listener/UserImportListener.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.listener; +package com.youlai.boot.system.listener; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Validator; @@ -8,20 +8,20 @@ import cn.hutool.json.JSONUtil; import com.alibaba.excel.context.AnalysisContext; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.youlai.boot.common.base.BaseAnalysisEventListener; -import com.youlai.boot.module.system.model.entity.SysDept; -import com.youlai.boot.module.system.model.entity.SysRole; -import com.youlai.boot.module.system.model.entity.SysUser; -import com.youlai.boot.module.system.model.entity.SysUserRole; -import com.youlai.system.common.base.IBaseEnum; -import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.enums.GenderEnum; -import com.youlai.system.enums.StatusEnum; -import com.youlai.boot.module.system.converter.UserConverter; -import com.youlai.boot.module.system.model.dto.UserImportDTO; -import com.youlai.system.service.SysDeptService; -import com.youlai.system.service.SysRoleService; -import com.youlai.system.service.SysUserRoleService; -import com.youlai.system.service.SysUserService; +import com.youlai.boot.system.model.entity.SysDept; +import com.youlai.boot.system.model.entity.SysRole; +import com.youlai.boot.system.model.entity.SysUser; +import com.youlai.boot.system.model.entity.SysUserRole; +import com.youlai.boot.common.base.IBaseEnum; +import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.common.enums.GenderEnum; +import com.youlai.boot.common.enums.StatusEnum; +import com.youlai.boot.system.converter.UserConverter; +import com.youlai.boot.system.model.dto.UserImportDTO; +import com.youlai.boot.system.service.SysDeptService; +import com.youlai.boot.system.service.SysRoleService; +import com.youlai.boot.system.service.SysUserRoleService; +import com.youlai.boot.system.service.SysUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/com/youlai/boot/module/system/mapper/SysConfigMapper.java b/src/main/java/com/youlai/boot/system/mapper/SysConfigMapper.java similarity index 70% rename from src/main/java/com/youlai/boot/module/system/mapper/SysConfigMapper.java rename to src/main/java/com/youlai/boot/system/mapper/SysConfigMapper.java index ad0d18f1..cc94aeaf 100644 --- a/src/main/java/com/youlai/boot/module/system/mapper/SysConfigMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/SysConfigMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.module.system.model.entity.SysConfig; +import com.youlai.boot.system.model.entity.SysConfig; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/system/mapper/SysDeptMapper.java b/src/main/java/com/youlai/boot/system/mapper/SysDeptMapper.java similarity index 84% rename from src/main/java/com/youlai/boot/module/system/mapper/SysDeptMapper.java rename to src/main/java/com/youlai/boot/system/mapper/SysDeptMapper.java index 6288c4db..c320d9df 100644 --- a/src/main/java/com/youlai/boot/module/system/mapper/SysDeptMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/SysDeptMapper.java @@ -1,10 +1,10 @@ -package com.youlai.boot.module.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.youlai.boot.common.annotation.DataPermission; -import com.youlai.boot.module.system.model.entity.SysDept; +import com.youlai.boot.system.model.entity.SysDept; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/youlai/boot/module/system/mapper/SysDictItemMapper.java b/src/main/java/com/youlai/boot/system/mapper/SysDictItemMapper.java similarity index 70% rename from src/main/java/com/youlai/boot/module/system/mapper/SysDictItemMapper.java rename to src/main/java/com/youlai/boot/system/mapper/SysDictItemMapper.java index d1caa414..1dc7fcf2 100644 --- a/src/main/java/com/youlai/boot/module/system/mapper/SysDictItemMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/SysDictItemMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.module.system.model.entity.SysDictItem; +import com.youlai.boot.system.model.entity.SysDictItem; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/system/mapper/SysDictMapper.java b/src/main/java/com/youlai/boot/system/mapper/SysDictMapper.java similarity index 70% rename from src/main/java/com/youlai/boot/module/system/mapper/SysDictMapper.java rename to src/main/java/com/youlai/boot/system/mapper/SysDictMapper.java index 173eb863..56f74d66 100644 --- a/src/main/java/com/youlai/boot/module/system/mapper/SysDictMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/SysDictMapper.java @@ -1,10 +1,10 @@ -package com.youlai.boot.module.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.system.model.entity.SysDict; -import com.youlai.boot.module.system.model.query.DictPageQuery; -import com.youlai.boot.module.system.model.vo.DictPageVO; +import com.youlai.boot.system.model.entity.SysDict; +import com.youlai.boot.system.model.query.DictPageQuery; +import com.youlai.boot.system.model.vo.DictPageVO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/system/mapper/SysLogMapper.java b/src/main/java/com/youlai/boot/system/mapper/SysLogMapper.java similarity index 77% rename from src/main/java/com/youlai/boot/module/system/mapper/SysLogMapper.java rename to src/main/java/com/youlai/boot/system/mapper/SysLogMapper.java index e99ee70a..d6f95d9a 100644 --- a/src/main/java/com/youlai/boot/module/system/mapper/SysLogMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/SysLogMapper.java @@ -1,11 +1,11 @@ -package com.youlai.boot.module.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.system.model.bo.VisitCount; -import com.youlai.boot.module.system.model.entity.SysLog; -import com.youlai.boot.module.system.model.query.LogPageQuery; -import com.youlai.boot.module.system.model.vo.LogPageVO; -import com.youlai.boot.module.system.model.vo.VisitStatsVO; +import com.youlai.boot.system.model.bo.VisitCount; +import com.youlai.boot.system.model.entity.SysLog; +import com.youlai.boot.system.model.query.LogPageQuery; +import com.youlai.boot.system.model.vo.LogPageVO; +import com.youlai.boot.system.model.vo.VisitStatsVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/youlai/boot/module/system/mapper/SysMenuMapper.java b/src/main/java/com/youlai/boot/system/mapper/SysMenuMapper.java similarity index 70% rename from src/main/java/com/youlai/boot/module/system/mapper/SysMenuMapper.java rename to src/main/java/com/youlai/boot/system/mapper/SysMenuMapper.java index 5e7c2b78..e5317350 100644 --- a/src/main/java/com/youlai/boot/module/system/mapper/SysMenuMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/SysMenuMapper.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.module.system.model.bo.RouteBO; -import com.youlai.boot.module.system.model.entity.SysMenu; +import com.youlai.boot.system.model.bo.RouteBO; +import com.youlai.boot.system.model.entity.SysMenu; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/system/mapper/SysRoleMapper.java b/src/main/java/com/youlai/boot/system/mapper/SysRoleMapper.java similarity index 76% rename from src/main/java/com/youlai/boot/module/system/mapper/SysRoleMapper.java rename to src/main/java/com/youlai/boot/system/mapper/SysRoleMapper.java index 85048828..758324cd 100644 --- a/src/main/java/com/youlai/boot/module/system/mapper/SysRoleMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.module.system.model.entity.SysRole; +import com.youlai.boot.system.model.entity.SysRole; import org.apache.ibatis.annotations.Mapper; import java.util.Set; diff --git a/src/main/java/com/youlai/boot/module/system/mapper/SysRoleMenuMapper.java b/src/main/java/com/youlai/boot/system/mapper/SysRoleMenuMapper.java similarity index 81% rename from src/main/java/com/youlai/boot/module/system/mapper/SysRoleMenuMapper.java rename to src/main/java/com/youlai/boot/system/mapper/SysRoleMenuMapper.java index db500621..8d488095 100644 --- a/src/main/java/com/youlai/boot/module/system/mapper/SysRoleMenuMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/SysRoleMenuMapper.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.module.system.model.bo.RolePermsBO; -import com.youlai.boot.module.system.model.entity.SysRoleMenu; +import com.youlai.boot.system.model.bo.RolePermsBO; +import com.youlai.boot.system.model.entity.SysRoleMenu; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/system/mapper/SysUserMapper.java b/src/main/java/com/youlai/boot/system/mapper/SysUserMapper.java similarity index 76% rename from src/main/java/com/youlai/boot/module/system/mapper/SysUserMapper.java rename to src/main/java/com/youlai/boot/system/mapper/SysUserMapper.java index a1db6429..760b3470 100644 --- a/src/main/java/com/youlai/boot/module/system/mapper/SysUserMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/SysUserMapper.java @@ -1,14 +1,14 @@ -package com.youlai.boot.module.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.system.model.bo.UserBO; -import com.youlai.boot.module.system.model.entity.SysUser; -import com.youlai.boot.module.system.model.query.UserPageQuery; -import com.youlai.boot.module.system.model.form.UserForm; +import com.youlai.boot.system.model.bo.UserBO; +import com.youlai.boot.system.model.entity.SysUser; +import com.youlai.boot.system.model.query.UserPageQuery; +import com.youlai.boot.system.model.form.UserForm; import com.youlai.boot.common.annotation.DataPermission; -import com.youlai.boot.module.system.model.dto.UserAuthInfo; -import com.youlai.boot.module.system.model.dto.UserExportDTO; +import com.youlai.boot.system.model.dto.UserAuthInfo; +import com.youlai.boot.system.model.dto.UserExportDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/system/mapper/SysUserRoleMapper.java b/src/main/java/com/youlai/boot/system/mapper/SysUserRoleMapper.java similarity index 78% rename from src/main/java/com/youlai/boot/module/system/mapper/SysUserRoleMapper.java rename to src/main/java/com/youlai/boot/system/mapper/SysUserRoleMapper.java index 01ce905a..df047efe 100644 --- a/src/main/java/com/youlai/boot/module/system/mapper/SysUserRoleMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/SysUserRoleMapper.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.mapper; +package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.module.system.model.entity.SysUserRole; +import com.youlai.boot.system.model.entity.SysUserRole; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/youlai/boot/module/system/model/bo/ColumnMetaData.java b/src/main/java/com/youlai/boot/system/model/bo/ColumnMetaData.java similarity index 94% rename from src/main/java/com/youlai/boot/module/system/model/bo/ColumnMetaData.java rename to src/main/java/com/youlai/boot/system/model/bo/ColumnMetaData.java index 9c4bfbac..b956a4d9 100644 --- a/src/main/java/com/youlai/boot/module/system/model/bo/ColumnMetaData.java +++ b/src/main/java/com/youlai/boot/system/model/bo/ColumnMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.bo; +package com.youlai.boot.system.model.bo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/bo/RolePermsBO.java b/src/main/java/com/youlai/boot/system/model/bo/RolePermsBO.java similarity index 86% rename from src/main/java/com/youlai/boot/module/system/model/bo/RolePermsBO.java rename to src/main/java/com/youlai/boot/system/model/bo/RolePermsBO.java index 81ed7f42..198e8180 100644 --- a/src/main/java/com/youlai/boot/module/system/model/bo/RolePermsBO.java +++ b/src/main/java/com/youlai/boot/system/model/bo/RolePermsBO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.bo; +package com.youlai.boot.system.model.bo; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/bo/RouteBO.java b/src/main/java/com/youlai/boot/system/model/bo/RouteBO.java similarity index 93% rename from src/main/java/com/youlai/boot/module/system/model/bo/RouteBO.java rename to src/main/java/com/youlai/boot/system/model/bo/RouteBO.java index b0b8071b..b546b280 100644 --- a/src/main/java/com/youlai/boot/module/system/model/bo/RouteBO.java +++ b/src/main/java/com/youlai/boot/system/model/bo/RouteBO.java @@ -1,6 +1,6 @@ -package com.youlai.boot.module.system.model.bo; +package com.youlai.boot.system.model.bo; -import com.youlai.system.enums.MenuTypeEnum; +import com.youlai.boot.common.enums.MenuTypeEnum; import lombok.Data; /** diff --git a/src/main/java/com/youlai/boot/module/system/model/bo/TableMetaData.java b/src/main/java/com/youlai/boot/system/model/bo/TableMetaData.java similarity index 91% rename from src/main/java/com/youlai/boot/module/system/model/bo/TableMetaData.java rename to src/main/java/com/youlai/boot/system/model/bo/TableMetaData.java index f78ae8b3..b011df8e 100644 --- a/src/main/java/com/youlai/boot/module/system/model/bo/TableMetaData.java +++ b/src/main/java/com/youlai/boot/system/model/bo/TableMetaData.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.bo; +package com.youlai.boot.system.model.bo; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/bo/UserBO.java b/src/main/java/com/youlai/boot/system/model/bo/UserBO.java similarity index 95% rename from src/main/java/com/youlai/boot/module/system/model/bo/UserBO.java rename to src/main/java/com/youlai/boot/system/model/bo/UserBO.java index 5c67274b..2756db20 100644 --- a/src/main/java/com/youlai/boot/module/system/model/bo/UserBO.java +++ b/src/main/java/com/youlai/boot/system/model/bo/UserBO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.bo; +package com.youlai.boot.system.model.bo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/bo/VisitCount.java b/src/main/java/com/youlai/boot/system/model/bo/VisitCount.java similarity index 84% rename from src/main/java/com/youlai/boot/module/system/model/bo/VisitCount.java rename to src/main/java/com/youlai/boot/system/model/bo/VisitCount.java index 4e06969f..a5e1b81c 100644 --- a/src/main/java/com/youlai/boot/module/system/model/bo/VisitCount.java +++ b/src/main/java/com/youlai/boot/system/model/bo/VisitCount.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.bo; +package com.youlai.boot.system.model.bo; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/dto/CaptchaResult.java b/src/main/java/com/youlai/boot/system/model/dto/CaptchaResult.java similarity index 91% rename from src/main/java/com/youlai/boot/module/system/model/dto/CaptchaResult.java rename to src/main/java/com/youlai/boot/system/model/dto/CaptchaResult.java index 646391b6..522f1f80 100644 --- a/src/main/java/com/youlai/boot/module/system/model/dto/CaptchaResult.java +++ b/src/main/java/com/youlai/boot/system/model/dto/CaptchaResult.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.dto; +package com.youlai.boot.system.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/youlai/boot/module/system/model/dto/ChatMessage.java b/src/main/java/com/youlai/boot/system/model/dto/ChatMessage.java similarity index 86% rename from src/main/java/com/youlai/boot/module/system/model/dto/ChatMessage.java rename to src/main/java/com/youlai/boot/system/model/dto/ChatMessage.java index 449b3503..7e2a6e79 100644 --- a/src/main/java/com/youlai/boot/module/system/model/dto/ChatMessage.java +++ b/src/main/java/com/youlai/boot/system/model/dto/ChatMessage.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.dto; +package com.youlai.boot.system.model.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/dto/FileInfo.java b/src/main/java/com/youlai/boot/system/model/dto/FileInfo.java similarity index 84% rename from src/main/java/com/youlai/boot/module/system/model/dto/FileInfo.java rename to src/main/java/com/youlai/boot/system/model/dto/FileInfo.java index f5bf340b..537ff668 100644 --- a/src/main/java/com/youlai/boot/module/system/model/dto/FileInfo.java +++ b/src/main/java/com/youlai/boot/system/model/dto/FileInfo.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.dto; +package com.youlai.boot.system.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/dto/LoginResult.java b/src/main/java/com/youlai/boot/system/model/dto/LoginResult.java similarity index 91% rename from src/main/java/com/youlai/boot/module/system/model/dto/LoginResult.java rename to src/main/java/com/youlai/boot/system/model/dto/LoginResult.java index 28e348c5..769cbf9b 100644 --- a/src/main/java/com/youlai/boot/module/system/model/dto/LoginResult.java +++ b/src/main/java/com/youlai/boot/system/model/dto/LoginResult.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.dto; +package com.youlai.boot.system.model.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/youlai/boot/module/system/model/dto/UserAuthInfo.java b/src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java similarity index 89% rename from src/main/java/com/youlai/boot/module/system/model/dto/UserAuthInfo.java rename to src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java index d4dd814b..0f4e0880 100644 --- a/src/main/java/com/youlai/boot/module/system/model/dto/UserAuthInfo.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserAuthInfo.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.dto; +package com.youlai.boot.system.model.dto; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/dto/UserExportDTO.java b/src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java similarity index 94% rename from src/main/java/com/youlai/boot/module/system/model/dto/UserExportDTO.java rename to src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java index 4d9d1feb..fd3c3e87 100644 --- a/src/main/java/com/youlai/boot/module/system/model/dto/UserExportDTO.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserExportDTO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.dto; +package com.youlai.boot.system.model.dto; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; diff --git a/src/main/java/com/youlai/boot/module/system/model/dto/UserImportDTO.java b/src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java similarity index 92% rename from src/main/java/com/youlai/boot/module/system/model/dto/UserImportDTO.java rename to src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java index c895bfdd..3a9bedbf 100644 --- a/src/main/java/com/youlai/boot/module/system/model/dto/UserImportDTO.java +++ b/src/main/java/com/youlai/boot/system/model/dto/UserImportDTO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.dto; +package com.youlai.boot.system.model.dto; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/entity/SysConfig.java b/src/main/java/com/youlai/boot/system/model/entity/SysConfig.java similarity index 94% rename from src/main/java/com/youlai/boot/module/system/model/entity/SysConfig.java rename to src/main/java/com/youlai/boot/system/model/entity/SysConfig.java index 10140b65..95464996 100644 --- a/src/main/java/com/youlai/boot/module/system/model/entity/SysConfig.java +++ b/src/main/java/com/youlai/boot/system/model/entity/SysConfig.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.entity; +package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.*; import com.youlai.boot.common.base.BaseEntity; diff --git a/src/main/java/com/youlai/boot/module/system/model/entity/SysDept.java b/src/main/java/com/youlai/boot/system/model/entity/SysDept.java similarity index 87% rename from src/main/java/com/youlai/boot/module/system/model/entity/SysDept.java rename to src/main/java/com/youlai/boot/system/model/entity/SysDept.java index 64aaa5f4..7627fe5c 100644 --- a/src/main/java/com/youlai/boot/module/system/model/entity/SysDept.java +++ b/src/main/java/com/youlai/boot/system/model/entity/SysDept.java @@ -1,6 +1,6 @@ -package com.youlai.boot.module.system.model.entity; +package com.youlai.boot.system.model.entity; -import com.youlai.system.common.base.BaseEntity; +import com.youlai.boot.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/boot/module/system/model/entity/SysDict.java b/src/main/java/com/youlai/boot/system/model/entity/SysDict.java similarity index 79% rename from src/main/java/com/youlai/boot/module/system/model/entity/SysDict.java rename to src/main/java/com/youlai/boot/system/model/entity/SysDict.java index 012ded60..ff58c043 100644 --- a/src/main/java/com/youlai/boot/module/system/model/entity/SysDict.java +++ b/src/main/java/com/youlai/boot/system/model/entity/SysDict.java @@ -1,6 +1,6 @@ -package com.youlai.boot.module.system.model.entity; +package com.youlai.boot.system.model.entity; -import com.youlai.system.common.base.BaseEntity; +import com.youlai.boot.common.base.BaseEntity; import lombok.Data; /** diff --git a/src/main/java/com/youlai/boot/module/system/model/entity/SysDictItem.java b/src/main/java/com/youlai/boot/system/model/entity/SysDictItem.java similarity index 93% rename from src/main/java/com/youlai/boot/module/system/model/entity/SysDictItem.java rename to src/main/java/com/youlai/boot/system/model/entity/SysDictItem.java index 53af28a9..ba379e73 100644 --- a/src/main/java/com/youlai/boot/module/system/model/entity/SysDictItem.java +++ b/src/main/java/com/youlai/boot/system/model/entity/SysDictItem.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.entity; +package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/youlai/boot/module/system/model/entity/SysLog.java b/src/main/java/com/youlai/boot/system/model/entity/SysLog.java similarity index 92% rename from src/main/java/com/youlai/boot/module/system/model/entity/SysLog.java rename to src/main/java/com/youlai/boot/system/model/entity/SysLog.java index 70a2b82f..2c9326f3 100644 --- a/src/main/java/com/youlai/boot/module/system/model/entity/SysLog.java +++ b/src/main/java/com/youlai/boot/system/model/entity/SysLog.java @@ -1,11 +1,11 @@ -package com.youlai.boot.module.system.model.entity; +package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.*; import java.io.Serializable; import java.time.LocalDateTime; -import com.youlai.system.enums.LogModuleEnum; +import com.youlai.boot.common.enums.LogModuleEnum; import lombok.Data; /** diff --git a/src/main/java/com/youlai/boot/module/system/model/entity/SysMenu.java b/src/main/java/com/youlai/boot/system/model/entity/SysMenu.java similarity index 95% rename from src/main/java/com/youlai/boot/module/system/model/entity/SysMenu.java rename to src/main/java/com/youlai/boot/system/model/entity/SysMenu.java index a0500f12..d7c5cd32 100644 --- a/src/main/java/com/youlai/boot/module/system/model/entity/SysMenu.java +++ b/src/main/java/com/youlai/boot/system/model/entity/SysMenu.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.system.model.entity; +package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.*; -import com.youlai.system.enums.MenuTypeEnum; +import com.youlai.boot.common.enums.MenuTypeEnum; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/boot/module/system/model/entity/SysRole.java b/src/main/java/com/youlai/boot/system/model/entity/SysRole.java similarity index 86% rename from src/main/java/com/youlai/boot/module/system/model/entity/SysRole.java rename to src/main/java/com/youlai/boot/system/model/entity/SysRole.java index 01ec0fbd..4cc58d11 100644 --- a/src/main/java/com/youlai/boot/module/system/model/entity/SysRole.java +++ b/src/main/java/com/youlai/boot/system/model/entity/SysRole.java @@ -1,6 +1,6 @@ -package com.youlai.boot.module.system.model.entity; +package com.youlai.boot.system.model.entity; -import com.youlai.system.common.base.BaseEntity; +import com.youlai.boot.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/boot/module/system/model/entity/SysRoleMenu.java b/src/main/java/com/youlai/boot/system/model/entity/SysRoleMenu.java similarity index 89% rename from src/main/java/com/youlai/boot/module/system/model/entity/SysRoleMenu.java rename to src/main/java/com/youlai/boot/system/model/entity/SysRoleMenu.java index ec967acf..03464b3e 100644 --- a/src/main/java/com/youlai/boot/module/system/model/entity/SysRoleMenu.java +++ b/src/main/java/com/youlai/boot/system/model/entity/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.entity; +package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/youlai/boot/module/system/model/entity/SysUser.java b/src/main/java/com/youlai/boot/system/model/entity/SysUser.java similarity index 89% rename from src/main/java/com/youlai/boot/module/system/model/entity/SysUser.java rename to src/main/java/com/youlai/boot/system/model/entity/SysUser.java index 4f6a0d83..9e513182 100644 --- a/src/main/java/com/youlai/boot/module/system/model/entity/SysUser.java +++ b/src/main/java/com/youlai/boot/system/model/entity/SysUser.java @@ -1,6 +1,6 @@ -package com.youlai.boot.module.system.model.entity; +package com.youlai.boot.system.model.entity; -import com.youlai.system.common.base.BaseEntity; +import com.youlai.boot.common.base.BaseEntity; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/boot/module/system/model/entity/SysUserRole.java b/src/main/java/com/youlai/boot/system/model/entity/SysUserRole.java similarity index 90% rename from src/main/java/com/youlai/boot/module/system/model/entity/SysUserRole.java rename to src/main/java/com/youlai/boot/system/model/entity/SysUserRole.java index 91884495..1fbbcaec 100644 --- a/src/main/java/com/youlai/boot/module/system/model/entity/SysUserRole.java +++ b/src/main/java/com/youlai/boot/system/model/entity/SysUserRole.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.entity; +package com.youlai.boot.system.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/youlai/boot/module/system/model/form/ConfigForm.java b/src/main/java/com/youlai/boot/system/model/form/ConfigForm.java similarity index 95% rename from src/main/java/com/youlai/boot/module/system/model/form/ConfigForm.java rename to src/main/java/com/youlai/boot/system/model/form/ConfigForm.java index c4dc53f2..6e83c039 100644 --- a/src/main/java/com/youlai/boot/module/system/model/form/ConfigForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/ConfigForm.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.form; +package com.youlai.boot.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/youlai/boot/module/system/model/form/DeptForm.java b/src/main/java/com/youlai/boot/system/model/form/DeptForm.java similarity index 94% rename from src/main/java/com/youlai/boot/module/system/model/form/DeptForm.java rename to src/main/java/com/youlai/boot/system/model/form/DeptForm.java index be4465a1..66cc3654 100644 --- a/src/main/java/com/youlai/boot/module/system/model/form/DeptForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/DeptForm.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.form; +package com.youlai.boot.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/youlai/boot/module/system/model/form/DictForm.java b/src/main/java/com/youlai/boot/system/model/form/DictForm.java similarity index 96% rename from src/main/java/com/youlai/boot/module/system/model/form/DictForm.java rename to src/main/java/com/youlai/boot/system/model/form/DictForm.java index 3dcd3ef6..a7d614bd 100644 --- a/src/main/java/com/youlai/boot/module/system/model/form/DictForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/DictForm.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.form; +package com.youlai.boot.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/boot/module/system/model/form/EmailChangeForm.java b/src/main/java/com/youlai/boot/system/model/form/EmailChangeForm.java similarity index 87% rename from src/main/java/com/youlai/boot/module/system/model/form/EmailChangeForm.java rename to src/main/java/com/youlai/boot/system/model/form/EmailChangeForm.java index 359aa39e..befe5c5b 100644 --- a/src/main/java/com/youlai/boot/module/system/model/form/EmailChangeForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/EmailChangeForm.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.form; +package com.youlai.boot.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/form/MenuForm.java b/src/main/java/com/youlai/boot/system/model/form/MenuForm.java similarity index 91% rename from src/main/java/com/youlai/boot/module/system/model/form/MenuForm.java rename to src/main/java/com/youlai/boot/system/model/form/MenuForm.java index d19282b3..98550a7c 100644 --- a/src/main/java/com/youlai/boot/module/system/model/form/MenuForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/MenuForm.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.model.form; +package com.youlai.boot.system.model.form; -import com.youlai.system.enums.MenuTypeEnum; -import com.youlai.system.common.model.KeyValue; +import com.youlai.boot.common.enums.MenuTypeEnum; +import com.youlai.boot.common.model.KeyValue; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.hibernate.validator.constraints.Range; diff --git a/src/main/java/com/youlai/boot/module/system/model/form/MobileBindingForm.java b/src/main/java/com/youlai/boot/system/model/form/MobileBindingForm.java similarity index 87% rename from src/main/java/com/youlai/boot/module/system/model/form/MobileBindingForm.java rename to src/main/java/com/youlai/boot/system/model/form/MobileBindingForm.java index 1fed9626..9dd7cbf2 100644 --- a/src/main/java/com/youlai/boot/module/system/model/form/MobileBindingForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/MobileBindingForm.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.form; +package com.youlai.boot.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/form/PasswordChangeForm.java b/src/main/java/com/youlai/boot/system/model/form/PasswordChangeForm.java similarity index 88% rename from src/main/java/com/youlai/boot/module/system/model/form/PasswordChangeForm.java rename to src/main/java/com/youlai/boot/system/model/form/PasswordChangeForm.java index e1feb52b..f282c6bf 100644 --- a/src/main/java/com/youlai/boot/module/system/model/form/PasswordChangeForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/PasswordChangeForm.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.form; +package com.youlai.boot.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/form/PasswordResetForm.java b/src/main/java/com/youlai/boot/system/model/form/PasswordResetForm.java similarity index 87% rename from src/main/java/com/youlai/boot/module/system/model/form/PasswordResetForm.java rename to src/main/java/com/youlai/boot/system/model/form/PasswordResetForm.java index d08f1545..a1acca63 100644 --- a/src/main/java/com/youlai/boot/module/system/model/form/PasswordResetForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/PasswordResetForm.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.form; +package com.youlai.boot.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/form/RoleForm.java b/src/main/java/com/youlai/boot/system/model/form/RoleForm.java similarity index 94% rename from src/main/java/com/youlai/boot/module/system/model/form/RoleForm.java rename to src/main/java/com/youlai/boot/system/model/form/RoleForm.java index 7f99191b..d1588557 100644 --- a/src/main/java/com/youlai/boot/module/system/model/form/RoleForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/RoleForm.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.form; +package com.youlai.boot.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/form/UserForm.java b/src/main/java/com/youlai/boot/system/model/form/UserForm.java similarity index 96% rename from src/main/java/com/youlai/boot/module/system/model/form/UserForm.java rename to src/main/java/com/youlai/boot/system/model/form/UserForm.java index 4b933b3f..8b48259a 100644 --- a/src/main/java/com/youlai/boot/module/system/model/form/UserForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/UserForm.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.form; +package com.youlai.boot.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/form/UserProfileForm.java b/src/main/java/com/youlai/boot/system/model/form/UserProfileForm.java similarity index 93% rename from src/main/java/com/youlai/boot/module/system/model/form/UserProfileForm.java rename to src/main/java/com/youlai/boot/system/model/form/UserProfileForm.java index df145388..4bd35db5 100644 --- a/src/main/java/com/youlai/boot/module/system/model/form/UserProfileForm.java +++ b/src/main/java/com/youlai/boot/system/model/form/UserProfileForm.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.form; +package com.youlai.boot.system.model.form; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/query/ConfigPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/ConfigPageQuery.java similarity index 89% rename from src/main/java/com/youlai/boot/module/system/model/query/ConfigPageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/ConfigPageQuery.java index c96457f3..3105c2a9 100644 --- a/src/main/java/com/youlai/boot/module/system/model/query/ConfigPageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/ConfigPageQuery.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.query; +package com.youlai.boot.system.model.query; import com.youlai.boot.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/boot/module/system/model/query/DeptQuery.java b/src/main/java/com/youlai/boot/system/model/query/DeptQuery.java similarity index 88% rename from src/main/java/com/youlai/boot/module/system/model/query/DeptQuery.java rename to src/main/java/com/youlai/boot/system/model/query/DeptQuery.java index e1d04f1a..3a7afadb 100644 --- a/src/main/java/com/youlai/boot/module/system/model/query/DeptQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/DeptQuery.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.query; +package com.youlai.boot.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/query/DictPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java similarity index 77% rename from src/main/java/com/youlai/boot/module/system/model/query/DictPageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java index 4d9b3ed6..282e7947 100644 --- a/src/main/java/com/youlai/boot/module/system/model/query/DictPageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.model.query; +package com.youlai.boot.system.model.query; -import com.youlai.system.common.base.BasePageQuery; +import com.youlai.boot.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/query/LogPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/LogPageQuery.java similarity index 83% rename from src/main/java/com/youlai/boot/module/system/model/query/LogPageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/LogPageQuery.java index d7cdc49f..1de60a20 100644 --- a/src/main/java/com/youlai/boot/module/system/model/query/LogPageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/LogPageQuery.java @@ -1,6 +1,6 @@ -package com.youlai.boot.module.system.model.query; +package com.youlai.boot.system.model.query; -import com.youlai.system.common.base.BasePageQuery; +import com.youlai.boot.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/boot/module/system/model/query/MenuQuery.java b/src/main/java/com/youlai/boot/system/model/query/MenuQuery.java similarity index 88% rename from src/main/java/com/youlai/boot/module/system/model/query/MenuQuery.java rename to src/main/java/com/youlai/boot/system/model/query/MenuQuery.java index 58b3a94e..e9de9971 100644 --- a/src/main/java/com/youlai/boot/module/system/model/query/MenuQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/MenuQuery.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.query; +package com.youlai.boot.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/query/PermPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/PermPageQuery.java similarity index 77% rename from src/main/java/com/youlai/boot/module/system/model/query/PermPageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/PermPageQuery.java index 94d5536e..95cb5485 100644 --- a/src/main/java/com/youlai/boot/module/system/model/query/PermPageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/PermPageQuery.java @@ -1,6 +1,6 @@ -package com.youlai.boot.module.system.model.query; +package com.youlai.boot.system.model.query; -import com.youlai.system.common.base.BasePageQuery; +import com.youlai.boot.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/query/RolePageQuery.java b/src/main/java/com/youlai/boot/system/model/query/RolePageQuery.java similarity index 87% rename from src/main/java/com/youlai/boot/module/system/model/query/RolePageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/RolePageQuery.java index fd4d8d85..4fc7cd3d 100644 --- a/src/main/java/com/youlai/boot/module/system/model/query/RolePageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/RolePageQuery.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.model.query; +package com.youlai.boot.system.model.query; import com.fasterxml.jackson.annotation.JsonFormat; -import com.youlai.system.common.base.BasePageQuery; +import com.youlai.boot.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/boot/module/system/model/query/TablePageQuery.java b/src/main/java/com/youlai/boot/system/model/query/TablePageQuery.java similarity index 84% rename from src/main/java/com/youlai/boot/module/system/model/query/TablePageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/TablePageQuery.java index 702d1270..c841f9f2 100644 --- a/src/main/java/com/youlai/boot/module/system/model/query/TablePageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/TablePageQuery.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.model.query; +package com.youlai.boot.system.model.query; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.youlai.system.common.base.BasePageQuery; +import com.youlai.boot.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/youlai/boot/module/system/model/query/UserPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java similarity index 85% rename from src/main/java/com/youlai/boot/module/system/model/query/UserPageQuery.java rename to src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java index 3fd8c499..5d7f7157 100644 --- a/src/main/java/com/youlai/boot/module/system/model/query/UserPageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java @@ -1,6 +1,6 @@ -package com.youlai.boot.module.system.model.query; +package com.youlai.boot.system.model.query; -import com.youlai.system.common.base.BasePageQuery; +import com.youlai.boot.common.base.BasePageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/ConfigVO.java b/src/main/java/com/youlai/boot/system/model/vo/ConfigVO.java similarity index 94% rename from src/main/java/com/youlai/boot/module/system/model/vo/ConfigVO.java rename to src/main/java/com/youlai/boot/system/model/vo/ConfigVO.java index e96275e1..12bf2f47 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/ConfigVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/ConfigVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/DeptVO.java b/src/main/java/com/youlai/boot/system/model/vo/DeptVO.java similarity index 95% rename from src/main/java/com/youlai/boot/module/system/model/vo/DeptVO.java rename to src/main/java/com/youlai/boot/system/model/vo/DeptVO.java index 3c93d87e..d2249f4d 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/DeptVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/DeptVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/DictPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java similarity index 95% rename from src/main/java/com/youlai/boot/module/system/model/vo/DictPageVO.java rename to src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java index ae097bd4..80d43fe4 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/DictPageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/GeneratorPreviewVO.java b/src/main/java/com/youlai/boot/system/model/vo/GeneratorPreviewVO.java similarity index 89% rename from src/main/java/com/youlai/boot/module/system/model/vo/GeneratorPreviewVO.java rename to src/main/java/com/youlai/boot/system/model/vo/GeneratorPreviewVO.java index da23ac44..1fd62aab 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/GeneratorPreviewVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/GeneratorPreviewVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/LogPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java similarity index 93% rename from src/main/java/com/youlai/boot/module/system/model/vo/LogPageVO.java rename to src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java index 8653913f..253c34c0 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/LogPageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/LogPageVO.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.youlai.system.enums.LogModuleEnum; +import com.youlai.boot.common.enums.LogModuleEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/MenuVO.java b/src/main/java/com/youlai/boot/system/model/vo/MenuVO.java similarity index 93% rename from src/main/java/com/youlai/boot/module/system/model/vo/MenuVO.java rename to src/main/java/com/youlai/boot/system/model/vo/MenuVO.java index 41ba40e4..3b76fcda 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/MenuVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/MenuVO.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import com.fasterxml.jackson.annotation.JsonInclude; -import com.youlai.system.enums.MenuTypeEnum; +import com.youlai.boot.common.enums.MenuTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/RolePageVO.java b/src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java similarity index 93% rename from src/main/java/com/youlai/boot/module/system/model/vo/RolePageVO.java rename to src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java index ad41939e..86a1ce21 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/RolePageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/RolePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/RouteVO.java b/src/main/java/com/youlai/boot/system/model/vo/RouteVO.java similarity index 97% rename from src/main/java/com/youlai/boot/module/system/model/vo/RouteVO.java rename to src/main/java/com/youlai/boot/system/model/vo/RouteVO.java index bfefa969..8c786f02 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/RouteVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/RouteVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/TablePageVO.java b/src/main/java/com/youlai/boot/system/model/vo/TablePageVO.java similarity index 94% rename from src/main/java/com/youlai/boot/module/system/model/vo/TablePageVO.java rename to src/main/java/com/youlai/boot/system/model/vo/TablePageVO.java index 0d3b020a..970cd5a8 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/TablePageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/TablePageVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/UserInfoVO.java b/src/main/java/com/youlai/boot/system/model/vo/UserInfoVO.java similarity index 93% rename from src/main/java/com/youlai/boot/module/system/model/vo/UserInfoVO.java rename to src/main/java/com/youlai/boot/system/model/vo/UserInfoVO.java index 797b68b2..fc2d095d 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/UserInfoVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/UserInfoVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/UserPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java similarity index 95% rename from src/main/java/com/youlai/boot/module/system/model/vo/UserPageVO.java rename to src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java index 36a52580..770a9424 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/UserPageVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/UserProfileVO.java b/src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java similarity index 95% rename from src/main/java/com/youlai/boot/module/system/model/vo/UserProfileVO.java rename to src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java index 48098131..614f917b 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/UserProfileVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/UserProfileVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/VisitStatsVO.java b/src/main/java/com/youlai/boot/system/model/vo/VisitStatsVO.java similarity index 93% rename from src/main/java/com/youlai/boot/module/system/model/vo/VisitStatsVO.java rename to src/main/java/com/youlai/boot/system/model/vo/VisitStatsVO.java index cc5c13ed..0ede21e8 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/VisitStatsVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/VisitStatsVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/com/youlai/boot/module/system/model/vo/VisitTrendVO.java b/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java similarity index 91% rename from src/main/java/com/youlai/boot/module/system/model/vo/VisitTrendVO.java rename to src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java index 3a8c1169..07cb686f 100644 --- a/src/main/java/com/youlai/boot/module/system/model/vo/VisitTrendVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.model.vo; +package com.youlai.boot.system.model.vo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/youlai/boot/module/system/service/SysConfigService.java b/src/main/java/com/youlai/boot/system/service/SysConfigService.java similarity index 82% rename from src/main/java/com/youlai/boot/module/system/service/SysConfigService.java rename to src/main/java/com/youlai/boot/system/service/SysConfigService.java index fd507ef1..d842b4ae 100644 --- a/src/main/java/com/youlai/boot/module/system/service/SysConfigService.java +++ b/src/main/java/com/youlai/boot/system/service/SysConfigService.java @@ -1,11 +1,11 @@ -package com.youlai.boot.module.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.system.model.entity.SysConfig; -import com.youlai.boot.module.system.model.form.ConfigForm; -import com.youlai.boot.module.system.model.query.ConfigPageQuery; -import com.youlai.boot.module.system.model.vo.ConfigVO; +import com.youlai.boot.system.model.entity.SysConfig; +import com.youlai.boot.system.model.form.ConfigForm; +import com.youlai.boot.system.model.query.ConfigPageQuery; +import com.youlai.boot.system.model.vo.ConfigVO; /** * 系统配置Service接口 diff --git a/src/main/java/com/youlai/boot/module/system/service/SysDeptService.java b/src/main/java/com/youlai/boot/system/service/SysDeptService.java similarity index 77% rename from src/main/java/com/youlai/boot/module/system/service/SysDeptService.java rename to src/main/java/com/youlai/boot/system/service/SysDeptService.java index e221599d..b293ca92 100644 --- a/src/main/java/com/youlai/boot/module/system/service/SysDeptService.java +++ b/src/main/java/com/youlai/boot/system/service/SysDeptService.java @@ -1,11 +1,11 @@ -package com.youlai.boot.module.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.system.model.entity.SysDept; -import com.youlai.system.common.model.Option; -import com.youlai.boot.module.system.model.form.DeptForm; -import com.youlai.boot.module.system.model.query.DeptQuery; -import com.youlai.boot.module.system.model.vo.DeptVO; +import com.youlai.boot.system.model.entity.SysDept; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.form.DeptForm; +import com.youlai.boot.system.model.query.DeptQuery; +import com.youlai.boot.system.model.vo.DeptVO; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/system/service/SysDictItemService.java b/src/main/java/com/youlai/boot/system/service/SysDictItemService.java similarity index 64% rename from src/main/java/com/youlai/boot/module/system/service/SysDictItemService.java rename to src/main/java/com/youlai/boot/system/service/SysDictItemService.java index 176f20ea..c4a4b99d 100644 --- a/src/main/java/com/youlai/boot/module/system/service/SysDictItemService.java +++ b/src/main/java/com/youlai/boot/system/service/SysDictItemService.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.system.model.entity.SysDictItem; +import com.youlai.boot.system.model.entity.SysDictItem; /** * 字典项 接口 diff --git a/src/main/java/com/youlai/boot/module/system/service/SysDictService.java b/src/main/java/com/youlai/boot/system/service/SysDictService.java similarity index 80% rename from src/main/java/com/youlai/boot/module/system/service/SysDictService.java rename to src/main/java/com/youlai/boot/system/service/SysDictService.java index 5187f2b0..4b7309fd 100644 --- a/src/main/java/com/youlai/boot/module/system/service/SysDictService.java +++ b/src/main/java/com/youlai/boot/system/service/SysDictService.java @@ -1,12 +1,12 @@ -package com.youlai.boot.module.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.system.common.model.Option; -import com.youlai.boot.module.system.model.entity.SysDict; -import com.youlai.boot.module.system.model.form.DictForm; -import com.youlai.boot.module.system.model.query.DictPageQuery; -import com.youlai.boot.module.system.model.vo.DictPageVO; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.entity.SysDict; +import com.youlai.boot.system.model.form.DictForm; +import com.youlai.boot.system.model.query.DictPageQuery; +import com.youlai.boot.system.model.vo.DictPageVO; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/system/service/SysLogService.java b/src/main/java/com/youlai/boot/system/service/SysLogService.java similarity index 69% rename from src/main/java/com/youlai/boot/module/system/service/SysLogService.java rename to src/main/java/com/youlai/boot/system/service/SysLogService.java index bde97109..2bb7a589 100644 --- a/src/main/java/com/youlai/boot/module/system/service/SysLogService.java +++ b/src/main/java/com/youlai/boot/system/service/SysLogService.java @@ -1,12 +1,12 @@ -package com.youlai.boot.module.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.module.system.model.entity.SysLog; +import com.youlai.boot.system.model.entity.SysLog; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.system.model.query.LogPageQuery; -import com.youlai.boot.module.system.model.vo.LogPageVO; -import com.youlai.boot.module.system.model.vo.VisitStatsVO; -import com.youlai.boot.module.system.model.vo.VisitTrendVO; +import com.youlai.boot.system.model.query.LogPageQuery; +import com.youlai.boot.system.model.vo.LogPageVO; +import com.youlai.boot.system.model.vo.VisitStatsVO; +import com.youlai.boot.system.model.vo.VisitTrendVO; import java.time.LocalDate; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/system/service/SysMenuService.java b/src/main/java/com/youlai/boot/system/service/SysMenuService.java similarity index 75% rename from src/main/java/com/youlai/boot/module/system/service/SysMenuService.java rename to src/main/java/com/youlai/boot/system/service/SysMenuService.java index df78c4cb..99335b60 100644 --- a/src/main/java/com/youlai/boot/module/system/service/SysMenuService.java +++ b/src/main/java/com/youlai/boot/system/service/SysMenuService.java @@ -1,13 +1,13 @@ -package com.youlai.boot.module.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.system.model.entity.GenConfig; -import com.youlai.boot.module.system.model.form.MenuForm; -import com.youlai.system.common.model.Option; -import com.youlai.boot.module.system.model.entity.SysMenu; -import com.youlai.boot.module.system.model.query.MenuQuery; -import com.youlai.boot.module.system.model.vo.MenuVO; -import com.youlai.boot.module.system.model.vo.RouteVO; +import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; +import com.youlai.boot.system.model.form.MenuForm; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.entity.SysMenu; +import com.youlai.boot.system.model.query.MenuQuery; +import com.youlai.boot.system.model.vo.MenuVO; +import com.youlai.boot.system.model.vo.RouteVO; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/youlai/boot/module/system/service/SysRoleMenuService.java b/src/main/java/com/youlai/boot/system/service/SysRoleMenuService.java similarity index 90% rename from src/main/java/com/youlai/boot/module/system/service/SysRoleMenuService.java rename to src/main/java/com/youlai/boot/system/service/SysRoleMenuService.java index b52c642d..b8e7e3dc 100644 --- a/src/main/java/com/youlai/boot/module/system/service/SysRoleMenuService.java +++ b/src/main/java/com/youlai/boot/system/service/SysRoleMenuService.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.system.model.entity.SysRoleMenu; +import com.youlai.boot.system.model.entity.SysRoleMenu; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/youlai/boot/module/system/service/SysRoleService.java b/src/main/java/com/youlai/boot/system/service/SysRoleService.java similarity index 84% rename from src/main/java/com/youlai/boot/module/system/service/SysRoleService.java rename to src/main/java/com/youlai/boot/system/service/SysRoleService.java index a9925ab5..ac63a157 100644 --- a/src/main/java/com/youlai/boot/module/system/service/SysRoleService.java +++ b/src/main/java/com/youlai/boot/system/service/SysRoleService.java @@ -1,13 +1,13 @@ -package com.youlai.boot.module.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.system.model.entity.SysRole; -import com.youlai.system.common.model.Option; -import com.youlai.boot.module.system.model.form.RoleForm; -import com.youlai.boot.module.system.model.query.RolePageQuery; -import com.youlai.boot.module.system.model.vo.RolePageVO; +import com.youlai.boot.system.model.entity.SysRole; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.model.form.RoleForm; +import com.youlai.boot.system.model.query.RolePageQuery; +import com.youlai.boot.system.model.vo.RolePageVO; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/youlai/boot/module/system/service/SysUserRoleService.java b/src/main/java/com/youlai/boot/system/service/SysUserRoleService.java similarity index 82% rename from src/main/java/com/youlai/boot/module/system/service/SysUserRoleService.java rename to src/main/java/com/youlai/boot/system/service/SysUserRoleService.java index 4b14ddc8..6c8b36d2 100644 --- a/src/main/java/com/youlai/boot/module/system/service/SysUserRoleService.java +++ b/src/main/java/com/youlai/boot/system/service/SysUserRoleService.java @@ -1,8 +1,8 @@ -package com.youlai.boot.module.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.module.system.model.entity.SysUserRole; +import com.youlai.boot.system.model.entity.SysUserRole; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/system/service/SysUserService.java b/src/main/java/com/youlai/boot/system/service/SysUserService.java similarity index 83% rename from src/main/java/com/youlai/boot/module/system/service/SysUserService.java rename to src/main/java/com/youlai/boot/system/service/SysUserService.java index 92daf1fa..3c9c0165 100644 --- a/src/main/java/com/youlai/boot/module/system/service/SysUserService.java +++ b/src/main/java/com/youlai/boot/system/service/SysUserService.java @@ -1,19 +1,17 @@ -package com.youlai.boot.module.system.service; +package com.youlai.boot.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.common.enums.ContactType; -import com.youlai.boot.module.system.model.dto.UserAuthInfo; -import com.youlai.boot.module.system.model.dto.UserExportDTO; -import com.youlai.boot.module.system.model.entity.SysUser; -import com.youlai.boot.module.system.model.form.*; -import com.youlai.boot.module.system.model.query.UserPageQuery; -import com.youlai.boot.module.system.model.vo.UserInfoVO; -import com.youlai.boot.module.system.model.vo.UserPageVO; -import com.youlai.boot.module.system.model.vo.UserProfileVO; +import com.youlai.boot.system.model.dto.UserAuthInfo; +import com.youlai.boot.system.model.dto.UserExportDTO; +import com.youlai.boot.system.model.entity.SysUser; +import com.youlai.boot.system.model.query.UserPageQuery; +import com.youlai.boot.system.model.vo.UserInfoVO; +import com.youlai.boot.system.model.vo.UserPageVO; +import com.youlai.boot.system.model.vo.UserProfileVO; import com.youlai.boot.system.model.form.*; -import com.youlai.system.enums.ContactType; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/system/service/WebsocketService.java b/src/main/java/com/youlai/boot/system/service/WebsocketService.java similarity index 70% rename from src/main/java/com/youlai/boot/module/system/service/WebsocketService.java rename to src/main/java/com/youlai/boot/system/service/WebsocketService.java index c4d3b530..7c54cc9e 100644 --- a/src/main/java/com/youlai/boot/module/system/service/WebsocketService.java +++ b/src/main/java/com/youlai/boot/system/service/WebsocketService.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.service; +package com.youlai.boot.system.service; public interface WebsocketService { diff --git a/src/main/java/com/youlai/boot/module/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/SysConfigServiceImpl.java similarity index 89% rename from src/main/java/com/youlai/boot/module/system/service/impl/SysConfigServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/SysConfigServiceImpl.java index 4a795322..423d8f27 100644 --- a/src/main/java/com/youlai/boot/module/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/SysConfigServiceImpl.java @@ -1,18 +1,18 @@ -package com.youlai.boot.module.system.service.impl; +package com.youlai.boot.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.boot.common.constant.RedisConstants; -import com.youlai.boot.module.system.converter.ConfigConverter; -import com.youlai.boot.module.system.mapper.SysConfigMapper; -import com.youlai.boot.module.system.model.entity.SysConfig; -import com.youlai.boot.module.system.model.form.ConfigForm; -import com.youlai.boot.module.system.model.query.ConfigPageQuery; -import com.youlai.boot.module.system.model.vo.ConfigVO; -import com.youlai.boot.module.system.service.SysConfigService; -import com.youlai.boot.framework.security.util.SecurityUtils; +import com.youlai.boot.system.converter.ConfigConverter; +import com.youlai.boot.system.mapper.SysConfigMapper; +import com.youlai.boot.system.model.entity.SysConfig; +import com.youlai.boot.system.model.form.ConfigForm; +import com.youlai.boot.system.model.query.ConfigPageQuery; +import com.youlai.boot.system.model.vo.ConfigVO; +import com.youlai.boot.system.service.SysConfigService; +import com.youlai.boot.core.security.util.SecurityUtils; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/youlai/boot/module/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/SysDeptServiceImpl.java similarity index 92% rename from src/main/java/com/youlai/boot/module/system/service/impl/SysDeptServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/SysDeptServiceImpl.java index f8421f64..95f556df 100644 --- a/src/main/java/com/youlai/boot/module/system/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/SysDeptServiceImpl.java @@ -1,21 +1,21 @@ -package com.youlai.boot.module.system.service.impl; +package com.youlai.boot.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.module.system.converter.DeptConverter; -import com.youlai.boot.module.system.mapper.SysDeptMapper; -import com.youlai.boot.module.system.model.entity.SysDept; -import com.youlai.boot.module.system.model.form.DeptForm; -import com.youlai.boot.module.system.model.query.DeptQuery; -import com.youlai.boot.module.system.model.vo.DeptVO; -import com.youlai.system.common.constant.SymbolConstant; -import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.enums.StatusEnum; -import com.youlai.system.common.model.Option; -import com.youlai.system.service.SysDeptService; +import com.youlai.boot.system.converter.DeptConverter; +import com.youlai.boot.system.mapper.SysDeptMapper; +import com.youlai.boot.system.model.entity.SysDept; +import com.youlai.boot.system.model.form.DeptForm; +import com.youlai.boot.system.model.query.DeptQuery; +import com.youlai.boot.system.model.vo.DeptVO; +import com.youlai.boot.common.constant.SymbolConstant; +import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.common.enums.StatusEnum; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.service.SysDeptService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/module/system/service/impl/SysDictItemServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/SysDictItemServiceImpl.java similarity index 63% rename from src/main/java/com/youlai/boot/module/system/service/impl/SysDictItemServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/SysDictItemServiceImpl.java index c3940651..cba61cca 100644 --- a/src/main/java/com/youlai/boot/module/system/service/impl/SysDictItemServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/SysDictItemServiceImpl.java @@ -1,9 +1,9 @@ -package com.youlai.boot.module.system.service.impl; +package com.youlai.boot.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.module.system.mapper.SysDictItemMapper; -import com.youlai.boot.module.system.model.entity.SysDictItem; -import com.youlai.system.service.SysDictItemService; +import com.youlai.boot.system.mapper.SysDictItemMapper; +import com.youlai.boot.system.model.entity.SysDictItem; +import com.youlai.boot.system.service.SysDictItemService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/module/system/service/impl/SysDictServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/SysDictServiceImpl.java similarity index 91% rename from src/main/java/com/youlai/boot/module/system/service/impl/SysDictServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/SysDictServiceImpl.java index e8be94f1..7a4c5fd6 100644 --- a/src/main/java/com/youlai/boot/module/system/service/impl/SysDictServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/SysDictServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.service.impl; +package com.youlai.boot.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; @@ -6,17 +6,17 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.module.system.converter.DictConverter; -import com.youlai.boot.module.system.converter.DictItemConverter; -import com.youlai.boot.module.system.mapper.SysDictMapper; -import com.youlai.boot.module.system.model.entity.SysDict; -import com.youlai.boot.module.system.model.entity.SysDictItem; -import com.youlai.boot.module.system.model.form.DictForm; -import com.youlai.boot.module.system.model.query.DictPageQuery; -import com.youlai.boot.module.system.model.vo.DictPageVO; -import com.youlai.system.common.model.Option; -import com.youlai.system.service.SysDictItemService; -import com.youlai.system.service.SysDictService; +import com.youlai.boot.system.converter.DictConverter; +import com.youlai.boot.system.converter.DictItemConverter; +import com.youlai.boot.system.mapper.SysDictMapper; +import com.youlai.boot.system.model.entity.SysDict; +import com.youlai.boot.system.model.entity.SysDictItem; +import com.youlai.boot.system.model.form.DictForm; +import com.youlai.boot.system.model.query.DictPageQuery; +import com.youlai.boot.system.model.vo.DictPageVO; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.service.SysDictItemService; +import com.youlai.boot.system.service.SysDictService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/youlai/boot/module/system/service/impl/SysLogServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/SysLogServiceImpl.java similarity index 87% rename from src/main/java/com/youlai/boot/module/system/service/impl/SysLogServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/SysLogServiceImpl.java index f46261c0..54e12fb0 100644 --- a/src/main/java/com/youlai/boot/module/system/service/impl/SysLogServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/SysLogServiceImpl.java @@ -1,15 +1,15 @@ -package com.youlai.boot.module.system.service.impl; +package com.youlai.boot.system.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.module.system.mapper.SysLogMapper; -import com.youlai.boot.module.system.model.bo.VisitCount; -import com.youlai.boot.module.system.model.entity.SysLog; -import com.youlai.boot.module.system.model.query.LogPageQuery; -import com.youlai.boot.module.system.model.vo.LogPageVO; -import com.youlai.boot.module.system.model.vo.VisitStatsVO; -import com.youlai.boot.module.system.model.vo.VisitTrendVO; -import com.youlai.system.service.SysLogService; +import com.youlai.boot.system.mapper.SysLogMapper; +import com.youlai.boot.system.model.bo.VisitCount; +import com.youlai.boot.system.model.entity.SysLog; +import com.youlai.boot.system.model.query.LogPageQuery; +import com.youlai.boot.system.model.vo.LogPageVO; +import com.youlai.boot.system.model.vo.VisitStatsVO; +import com.youlai.boot.system.model.vo.VisitTrendVO; +import com.youlai.boot.system.service.SysLogService; import org.springframework.stereotype.Service; import java.math.BigDecimal; diff --git a/src/main/java/com/youlai/boot/module/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/SysMenuServiceImpl.java similarity index 94% rename from src/main/java/com/youlai/boot/module/system/service/impl/SysMenuServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/SysMenuServiceImpl.java index 7dca8197..9db0bfee 100644 --- a/src/main/java/com/youlai/boot/module/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.service.impl; +package com.youlai.boot.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; @@ -10,22 +10,22 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.youlai.boot.module.system.converter.MenuConverter; -import com.youlai.boot.module.system.mapper.SysMenuMapper; -import com.youlai.boot.module.system.model.bo.RouteBO; -import com.youlai.boot.module.system.model.entity.GenConfig; -import com.youlai.boot.module.system.model.entity.SysMenu; -import com.youlai.boot.module.system.model.form.MenuForm; -import com.youlai.boot.module.system.model.query.MenuQuery; -import com.youlai.boot.module.system.model.vo.MenuVO; -import com.youlai.boot.module.system.model.vo.RouteVO; -import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.enums.MenuTypeEnum; -import com.youlai.system.enums.StatusEnum; -import com.youlai.system.common.model.KeyValue; -import com.youlai.system.common.model.Option; -import com.youlai.system.service.SysMenuService; -import com.youlai.system.service.SysRoleMenuService; +import com.youlai.boot.system.converter.MenuConverter; +import com.youlai.boot.system.mapper.SysMenuMapper; +import com.youlai.boot.system.model.bo.RouteBO; +import com.youlai.boot.infrastructure.generator.model.entity.GenConfig; +import com.youlai.boot.system.model.entity.SysMenu; +import com.youlai.boot.system.model.form.MenuForm; +import com.youlai.boot.system.model.query.MenuQuery; +import com.youlai.boot.system.model.vo.MenuVO; +import com.youlai.boot.system.model.vo.RouteVO; +import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.common.enums.MenuTypeEnum; +import com.youlai.boot.common.enums.StatusEnum; +import com.youlai.boot.common.model.KeyValue; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.system.service.SysMenuService; +import com.youlai.boot.system.service.SysRoleMenuService; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.cache.annotation.CacheEvict; diff --git a/src/main/java/com/youlai/boot/module/system/service/impl/SysRoleMenuServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/SysRoleMenuServiceImpl.java similarity index 91% rename from src/main/java/com/youlai/boot/module/system/service/impl/SysRoleMenuServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/SysRoleMenuServiceImpl.java index b169c0cd..ed6d0585 100644 --- a/src/main/java/com/youlai/boot/module/system/service/impl/SysRoleMenuServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/SysRoleMenuServiceImpl.java @@ -1,12 +1,12 @@ -package com.youlai.boot.module.system.service.impl; +package com.youlai.boot.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.module.system.mapper.SysRoleMenuMapper; -import com.youlai.boot.module.system.model.bo.RolePermsBO; -import com.youlai.boot.module.system.model.entity.SysRoleMenu; -import com.youlai.system.common.constant.SecurityConstants; -import com.youlai.system.service.SysRoleMenuService; +import com.youlai.boot.system.mapper.SysRoleMenuMapper; +import com.youlai.boot.system.model.bo.RolePermsBO; +import com.youlai.boot.system.model.entity.SysRoleMenu; +import com.youlai.boot.common.constant.SecurityConstants; +import com.youlai.boot.system.service.SysRoleMenuService; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/module/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/SysRoleServiceImpl.java similarity index 90% rename from src/main/java/com/youlai/boot/module/system/service/impl/SysRoleServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/SysRoleServiceImpl.java index 6ae11df6..45dc4464 100644 --- a/src/main/java/com/youlai/boot/module/system/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.service.impl; +package com.youlai.boot.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; @@ -7,19 +7,19 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.module.system.converter.RoleConverter; -import com.youlai.boot.module.system.mapper.SysRoleMapper; -import com.youlai.boot.module.system.model.entity.SysRole; -import com.youlai.boot.module.system.model.entity.SysRoleMenu; -import com.youlai.boot.module.system.model.form.RoleForm; -import com.youlai.boot.module.system.model.query.RolePageQuery; -import com.youlai.boot.module.system.model.vo.RolePageVO; -import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.common.model.Option; -import com.youlai.boot.framework.security.util.SecurityUtils; -import com.youlai.system.service.SysRoleMenuService; -import com.youlai.system.service.SysRoleService; -import com.youlai.system.service.SysUserRoleService; +import com.youlai.boot.system.converter.RoleConverter; +import com.youlai.boot.system.mapper.SysRoleMapper; +import com.youlai.boot.system.model.entity.SysRole; +import com.youlai.boot.system.model.entity.SysRoleMenu; +import com.youlai.boot.system.model.form.RoleForm; +import com.youlai.boot.system.model.query.RolePageQuery; +import com.youlai.boot.system.model.vo.RolePageVO; +import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.common.model.Option; +import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.system.service.SysRoleMenuService; +import com.youlai.boot.system.service.SysRoleService; +import com.youlai.boot.system.service.SysUserRoleService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/boot/module/system/service/impl/SysUserRoleServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/SysUserRoleServiceImpl.java similarity index 91% rename from src/main/java/com/youlai/boot/module/system/service/impl/SysUserRoleServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/SysUserRoleServiceImpl.java index a114b95c..ac10f931 100644 --- a/src/main/java/com/youlai/boot/module/system/service/impl/SysUserRoleServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/SysUserRoleServiceImpl.java @@ -1,11 +1,11 @@ -package com.youlai.boot.module.system.service.impl; +package com.youlai.boot.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.module.system.mapper.SysUserRoleMapper; -import com.youlai.boot.module.system.model.entity.SysUserRole; -import com.youlai.system.service.SysUserRoleService; +import com.youlai.boot.system.mapper.SysUserRoleMapper; +import com.youlai.boot.system.model.entity.SysUserRole; +import com.youlai.boot.system.service.SysUserRoleService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/youlai/boot/module/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/SysUserServiceImpl.java similarity index 91% rename from src/main/java/com/youlai/boot/module/system/service/impl/SysUserServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/SysUserServiceImpl.java index 25ff7b60..182218a9 100644 --- a/src/main/java/com/youlai/boot/module/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.youlai.boot.module.system.service.impl; +package com.youlai.boot.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; @@ -8,25 +8,30 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.module.system.model.form.*; +import com.youlai.boot.common.constant.RedisConstants; +import com.youlai.boot.common.constant.SystemConstants; +import com.youlai.boot.common.enums.ContactType; +import com.youlai.boot.infrastructure.mail.service.MailService; +import com.youlai.boot.infrastructure.sms.service.SmsService; import com.youlai.boot.system.model.form.*; -import com.youlai.system.common.constant.RedisConstants; -import com.youlai.system.common.constant.SystemConstants; import com.youlai.boot.config.property.AliyunSmsProperties; -import com.youlai.boot.module.system.converter.UserConverter; -import com.youlai.system.enums.ContactType; +import com.youlai.boot.system.converter.UserConverter; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.module.system.model.vo.UserProfileVO; -import com.youlai.boot.framework.security.util.SecurityUtils; -import com.youlai.boot.module.system.mapper.SysUserMapper; -import com.youlai.boot.module.system.model.dto.UserAuthInfo; -import com.youlai.boot.module.system.model.bo.UserBO; -import com.youlai.boot.module.system.model.entity.SysUser; -import com.youlai.boot.module.system.model.query.UserPageQuery; -import com.youlai.boot.module.system.model.dto.UserExportDTO; -import com.youlai.boot.module.system.model.vo.UserInfoVO; -import com.youlai.boot.module.system.model.vo.UserPageVO; -import com.youlai.boot.framework.security.service.PermissionService; +import com.youlai.boot.system.model.vo.UserProfileVO; +import com.youlai.boot.core.security.util.SecurityUtils; +import com.youlai.boot.system.mapper.SysUserMapper; +import com.youlai.boot.system.model.dto.UserAuthInfo; +import com.youlai.boot.system.model.bo.UserBO; +import com.youlai.boot.system.model.entity.SysUser; +import com.youlai.boot.system.model.query.UserPageQuery; +import com.youlai.boot.system.model.dto.UserExportDTO; +import com.youlai.boot.system.model.vo.UserInfoVO; +import com.youlai.boot.system.model.vo.UserPageVO; +import com.youlai.boot.core.security.service.PermissionService; +import com.youlai.boot.system.service.SysRoleMenuService; +import com.youlai.boot.system.service.SysRoleService; +import com.youlai.boot.system.service.SysUserRoleService; +import com.youlai.boot.system.service.SysUserService; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/com/youlai/boot/module/system/service/impl/WebsocketServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/WebsocketServiceImpl.java similarity index 90% rename from src/main/java/com/youlai/boot/module/system/service/impl/WebsocketServiceImpl.java rename to src/main/java/com/youlai/boot/system/service/impl/WebsocketServiceImpl.java index a39d2360..bd7534ab 100644 --- a/src/main/java/com/youlai/boot/module/system/service/impl/WebsocketServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/WebsocketServiceImpl.java @@ -1,7 +1,7 @@ -package com.youlai.boot.module.system.service.impl; +package com.youlai.boot.system.service.impl; -import com.youlai.boot.module.system.event.UserConnectionEvent; -import com.youlai.system.service.WebsocketService; +import com.youlai.boot.system.event.UserConnectionEvent; +import com.youlai.boot.system.service.WebsocketService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index f383b6f6..cfea8270 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -62,7 +62,7 @@ mybatis-plus: # 主键ID类型 id-type: none # 逻辑删除字段名称 - logic-delete-field: deleted + logic-delete-field: is_deleted # 逻辑删除-删除值 logic-delete-value: 1 # 逻辑删除-未删除值 @@ -146,9 +146,12 @@ springdoc: api-docs: path: /v3/api-docs group-configs: - - group: 'default' + - group: '系统管理' paths-to-match: '/**' - packages-to-scan: com.youlai.system.controller + packages-to-scan: com.youlai.boot.system.controller + - group: '登录认证' + paths-to-match: '/**' + packages-to-scan: com.youlai.boot.infrastructure.auth.controller default-flat-param-object: true # knife4j 接口文档配置 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 97dacfe9..97d0abbc 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -45,7 +45,7 @@ mybatis-plus: # 主键ID类型 id-type: none # 逻辑删除字段名称 - logic-delete-field: deleted + logic-delete-field: is_deleted # 逻辑删除-删除值 logic-delete-value: 1 # 逻辑删除-未删除值 @@ -132,7 +132,7 @@ springdoc: group-configs: - group: 'default' paths-to-match: '/**' - packages-to-scan: com.youlai.system.controller + packages-to-scan: com.**.controller default-flat-param-object: true # knife4j 接口文档配置 @@ -140,7 +140,7 @@ knife4j: # 是否开启 Knife4j 增强功能 enable: true # 设置为 true 表示开启增强功能 # 生产环境配置 - production: true # 设置为 true 表示在生产环境中不显示文档，为 false 表示显示文档（通常在开发环境中使用） + production: false # 设置为 true 表示在生产环境中不显示文档，为 false 表示显示文档（通常在开发环境中使用） setting: language: zh_cn diff --git a/src/main/resources/mapper/DatabaseMapper.xml b/src/main/resources/mapper/DatabaseMapper.xml index 92ab0a40..40cec1be 100644 --- a/src/main/resources/mapper/DatabaseMapper.xml +++ b/src/main/resources/mapper/DatabaseMapper.xml @@ -5,7 +5,7 @@ - SELECT t1.TABLE_NAME , t1.TABLE_COMMENT , @@ -33,7 +33,7 @@ CREATE_TIME DESC - SELECT TABLE_NAME , TABLE_COMMENT , @@ -47,7 +47,7 @@ AND TABLE_NAME = #{tableName} - SELECT COLUMN_NAME, DATA_TYPE, diff --git a/src/main/resources/mapper/SysConfigMapper.xml b/src/main/resources/mapper/SysConfigMapper.xml index bfb47401..08b5f751 100644 --- a/src/main/resources/mapper/SysConfigMapper.xml +++ b/src/main/resources/mapper/SysConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/SysDeptMapper.xml b/src/main/resources/mapper/SysDeptMapper.xml index 98bccf92..15baa35f 100644 --- a/src/main/resources/mapper/SysDeptMapper.xml +++ b/src/main/resources/mapper/SysDeptMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/SysDictItemMapper.xml b/src/main/resources/mapper/SysDictItemMapper.xml index 342b35d9..80efe0e0 100644 --- a/src/main/resources/mapper/SysDictItemMapper.xml +++ b/src/main/resources/mapper/SysDictItemMapper.xml @@ -2,10 +2,10 @@ - + - SELECT id, `name`, diff --git a/src/main/resources/mapper/SysDictMapper.xml b/src/main/resources/mapper/SysDictMapper.xml index 10df21ff..dd858110 100644 --- a/src/main/resources/mapper/SysDictMapper.xml +++ b/src/main/resources/mapper/SysDictMapper.xml @@ -2,13 +2,13 @@ - + - + + select="com.youlai.boot.system.mapper.SysDictItemMapper.listDictItemsByDictId"> diff --git a/src/main/resources/mapper/SysLogMapper.xml b/src/main/resources/mapper/SysLogMapper.xml index 63d8fd3d..1719094e 100644 --- a/src/main/resources/mapper/SysLogMapper.xml +++ b/src/main/resources/mapper/SysLogMapper.xml @@ -2,10 +2,10 @@ - + - SELECT t1.id, t1.module, @@ -48,7 +48,7 @@ - SELECT COUNT(1) AS count, DATE_FORMAT(create_time,'%Y-%m-%d') AS date @@ -61,7 +61,7 @@ - SELECT COUNT(DISTINCT ip) AS count, DATE_FORMAT(create_time, '%Y-%m-%d') AS date @@ -74,7 +74,7 @@ - SELECT COUNT(CASE WHEN DATE(create_time) = CURDATE() THEN 1 END) AS todayCount, COUNT(*) AS totalCount, @@ -94,7 +94,7 @@ - SELECT COUNT(DISTINCT CASE WHEN DATE(create_time) = CURDATE() THEN ip END) AS todayCount, COUNT(DISTINCT ip) AS totalCount, diff --git a/src/main/resources/mapper/SysMenuMapper.xml b/src/main/resources/mapper/SysMenuMapper.xml index 4aa6cda1..6c0b9ba1 100644 --- a/src/main/resources/mapper/SysMenuMapper.xml +++ b/src/main/resources/mapper/SysMenuMapper.xml @@ -2,10 +2,10 @@ - + - + @@ -44,7 +44,7 @@ INNER JOIN sys_role_menu t2 ON t1.id = t2.menu_id INNER JOIN sys_role t3 ON t2.role_id = t3.id AND t3.status = 1 AND t3.is_deleted = 0 WHERE - t1.type != '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}' + t1.type != '${@com.youlai.boot.common.enums.MenuTypeEnum@BUTTON.getValue()}' diff --git a/src/main/resources/mapper/SysRoleMapper.xml b/src/main/resources/mapper/SysRoleMapper.xml index df315629..b4e8db21 100644 --- a/src/main/resources/mapper/SysRoleMapper.xml +++ b/src/main/resources/mapper/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -33,7 +33,7 @@ INNER JOIN sys_role t2 ON t1.role_id = t2.id AND t2.is_deleted = 0 AND t2.`status` = 1 INNER JOIN sys_menu t3 ON t1.menu_id = t3.id WHERE - type = '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}' + type = '${@com.youlai.boot.common.enums.MenuTypeEnum@BUTTON.getValue()}' AND t2.`code` = #{roleCode} @@ -48,7 +48,7 @@ INNER JOIN sys_menu t2 ON t2.id = t1.menu_id INNER JOIN sys_role t3 ON t3.id = t1.role_id WHERE - t2.type = '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}' + t2.type = '${@com.youlai.boot.common.enums.MenuTypeEnum@BUTTON.getValue()}' AND t2.perm IS NOT NULL AND t3.CODE IN diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml index f5dd7492..92828fd7 100644 --- a/src/main/resources/mapper/SysUserMapper.xml +++ b/src/main/resources/mapper/SysUserMapper.xml @@ -2,10 +2,10 @@ - + - SELECT u.id, u.username, @@ -53,7 +53,7 @@ - + @@ -66,7 +66,7 @@ + select="com.youlai.boot.system.mapper.SysUserRoleMapper.listRoleIdsByUserId" > @@ -90,7 +90,7 @@ - + @@ -120,7 +120,7 @@ - SELECT u.username, u.nickname, @@ -153,7 +153,7 @@ - SELECT u.id, u.username, diff --git a/src/main/resources/mapper/SysUserRoleMapper.xml b/src/main/resources/mapper/SysUserRoleMapper.xml index bc67393e..e482d4ca 100644 --- a/src/main/resources/mapper/SysUserRoleMapper.xml +++ b/src/main/resources/mapper/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - +