From 5f2e3289d42c74288bfe4790db146ac6029306ec Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Fri, 11 Jul 2025 15:10:45 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpringSecurityOfficialApplication.java | 2 +- .../config/DefaultSecurityConfig.java | 2 +- .../{ => official}/config/Knife4jConfig.java | 2 +- .../config/SecurityConfiguration.java | 6 +- .../handler/SecurityAccessDeniedHandler.java | 4 +- .../SecurityAuthenticationEntryPoint.java | 4 +- .../controller/security/LoginController.java | 6 +- .../controller/system/DeptController.java | 16 +- .../system/EmailTemplateController.java | 16 +- .../system/EmailUsersController.java | 16 +- .../controller/system/FilesController.java | 16 +- .../system/FilesPartDetailController.java | 16 +- .../controller/system/I18nController.java | 16 +- .../controller/system/I18nTypeController.java | 16 +- .../controller/system/MenuIconController.java | 16 +- .../controller/system/MessageController.java | 16 +- .../system/MessageReceivedController.java | 16 +- .../system/MessageTypeController.java | 16 +- .../system/PermissionController.java | 16 +- .../controller/system/RoleController.java | 16 +- .../system/RolePermissionController.java | 16 +- .../controller/system/RouterController.java | 16 +- .../system/RouterRoleController.java | 16 +- .../controller/system/UserController.java | 16 +- .../controller/system/UserDeptController.java | 16 +- .../system/UserLoginController.java | 16 +- .../controller/system/UserRoleController.java | 16 +- .../domain}/dto/security/LoginRequest.java | 2 +- .../official/domain}/dto/system/DeptDto.java | 2 +- .../domain/dto/system/EmailTemplateDto.java | 2 +- .../domain/dto/system/EmailUsersDto.java | 2 +- .../domain/dto/system/FilesDto.java | 2 +- .../dto/system/FilesPartDetailDto.java | 2 +- .../official/domain}/dto/system/I18nDto.java | 2 +- .../domain/dto/system/I18nTypeDto.java | 2 +- .../domain}/dto/system/MenuIconDto.java | 2 +- .../domain}/dto/system/MessageDto.java | 2 +- .../domain/dto/system/MessageReceivedDto.java | 2 +- .../domain}/dto/system/MessageTypeDto.java | 2 +- .../domain}/dto/system/PermissionDto.java | 2 +- .../official/domain}/dto/system/RoleDto.java | 2 +- .../domain/dto/system/RolePermissionDto.java | 2 +- .../domain}/dto/system/RouterDto.java | 2 +- .../domain/dto/system/RouterRoleDto.java | 2 +- .../domain}/dto/system/UserDeptDto.java | 2 +- .../official/domain}/dto/system/UserDto.java | 2 +- .../domain/dto/system/UserLoginDto.java | 2 +- .../domain/dto/system/UserRoleDto.java | 2 +- .../official/domain}/entity/DeptEntity.java | 5 +- .../domain/entity/EmailTemplateEntity.java | 2 +- .../domain}/entity/EmailUsersEntity.java | 2 +- .../domain/entity/FilesEntity.java | 2 +- .../domain}/entity/FilesPartDetailEntity.java | 2 +- .../domain/entity/I18nEntity.java | 2 +- .../domain/entity/I18nTypeEntity.java | 2 +- .../domain/entity/MenuIconEntity.java | 2 +- .../domain/entity/MessageEntity.java | 2 +- .../domain/entity/MessageReceivedEntity.java | 2 +- .../domain/entity/MessageTypeEntity.java | 2 +- .../domain/entity/PermissionEntity.java | 2 +- .../official/domain}/entity/RoleEntity.java | 2 +- .../domain/entity/RolePermissionEntity.java | 2 +- .../official/domain}/entity/RouterEntity.java | 2 +- .../domain/entity/RouterRoleEntity.java | 2 +- .../domain/entity/UserDeptEntity.java | 2 +- .../domain/entity/UserEntity.java | 2 +- .../domain/entity/UserLoginEntity.java | 2 +- .../domain}/entity/UserRoleEntity.java | 2 +- .../{ => official}/domain/vo/DeptVo.java | 2 +- .../official/domain}/vo/EmailTemplateVo.java | 2 +- .../domain/vo/EmailUsersVo.java | 2 +- .../domain}/vo/FilesPartDetailVo.java | 2 +- .../{ => official}/domain/vo/FilesVo.java | 2 +- .../{ => official}/domain/vo/I18nTypeVo.java | 2 +- .../spring/official/domain}/vo/I18nVo.java | 2 +- .../official/domain}/vo/MenuIconVo.java | 2 +- .../domain/vo/MessageReceivedVo.java | 2 +- .../official/domain}/vo/MessageTypeVo.java | 2 +- .../{ => official}/domain/vo/MessageVo.java | 2 +- .../domain/vo/PermissionVo.java | 2 +- .../domain/vo/RolePermissionVo.java | 2 +- .../spring/official/domain}/vo/RoleVo.java | 2 +- .../official/domain}/vo/RouterRoleVo.java | 2 +- .../{ => official}/domain/vo/RouterVo.java | 2 +- .../official/domain}/vo/UserDeptVo.java | 2 +- .../official/domain}/vo/UserLoginVo.java | 2 +- .../official/domain}/vo/UserRoleVo.java | 2 +- .../{ => official}/domain/vo/UserVo.java | 2 +- .../domain}/vo/result/PageResult.java | 2 +- .../official/domain}/vo/result/Result.java | 2 +- .../domain}/vo/result/ResultCodeEnum.java | 2 +- .../{ => official}/mapper/DeptMapper.java | 8 +- .../official}/mapper/EmailTemplateMapper.java | 8 +- .../official}/mapper/EmailUsersMapper.java | 8 +- .../{ => official}/mapper/FilesMapper.java | 8 +- .../mapper/FilesPartDetailMapper.java | 8 +- .../spring/official}/mapper/I18nMapper.java | 8 +- .../official}/mapper/I18nTypeMapper.java | 8 +- .../{ => official}/mapper/MenuIconMapper.java | 8 +- .../{ => official}/mapper/MessageMapper.java | 8 +- .../mapper/MessageReceivedMapper.java | 8 +- .../official}/mapper/MessageTypeMapper.java | 8 +- .../official}/mapper/PermissionMapper.java | 8 +- .../spring/official}/mapper/RoleMapper.java | 8 +- .../mapper/RolePermissionMapper.java | 8 +- .../spring/official}/mapper/RouterMapper.java | 8 +- .../mapper/RouterRoleMapper.java | 8 +- .../official}/mapper/UserDeptMapper.java | 8 +- .../official}/mapper/UserLoginMapper.java | 8 +- .../spring/official}/mapper/UserMapper.java | 8 +- .../{ => official}/mapper/UserRoleMapper.java | 8 +- .../service/impl/LoginServiceImpl.java | 4 +- .../service/security/LoginService.java | 4 + .../service/system/DeptService.java | 10 +- .../service/system}/EmailTemplateService.java | 10 +- .../service/system}/EmailUsersService.java | 10 +- .../system/FilesPartDetailService.java | 10 +- .../service/system/FilesService.java | 10 +- .../official/service/system}/I18nService.java | 10 +- .../service/system}/I18nTypeService.java | 10 +- .../service/system/MenuIconService.java | 10 +- .../system}/MessageReceivedService.java | 10 +- .../service/system/MessageService.java | 10 +- .../service/system}/MessageTypeService.java | 10 +- .../service/system}/PermissionService.java | 10 +- .../system}/RolePermissionService.java | 10 +- .../service/system/RoleService.java | 10 +- .../service/system/RouterRoleService.java | 10 +- .../service/system}/RouterService.java | 10 +- .../service/system}/UserDeptService.java | 10 +- .../service/system}/UserLoginService.java | 10 +- .../service/system/UserRoleService.java | 10 +- .../official/service/system}/UserService.java | 10 +- .../service/system}/impl/DeptServiceImpl.java | 14 +- .../system/impl/EmailTemplateServiceImpl.java | 14 +- .../system}/impl/EmailUsersServiceImpl.java | 14 +- .../impl/FilesPartDetailServiceImpl.java | 14 +- .../service/system/impl/FilesServiceImpl.java | 14 +- .../service/system/impl/I18nServiceImpl.java | 14 +- .../system}/impl/I18nTypeServiceImpl.java | 14 +- .../system}/impl/MenuIconServiceImpl.java | 14 +- .../impl/MessageReceivedServiceImpl.java | 14 +- .../system/impl/MessageServiceImpl.java | 14 +- .../system/impl/MessageTypeServiceImpl.java | 14 +- .../system}/impl/PermissionServiceImpl.java | 14 +- .../impl/RolePermissionServiceImpl.java | 14 +- .../service/system/impl/RoleServiceImpl.java | 14 +- .../system/impl/RouterRoleServiceImpl.java | 14 +- .../system}/impl/RouterServiceImpl.java | 14 +- .../system}/impl/UserDeptServiceImpl.java | 14 +- .../system}/impl/UserLoginServiceImpl.java | 14 +- .../system/impl/UserRoleServiceImpl.java | 14 +- .../service/system/impl/UserServiceImpl.java | 14 +- .../spring/service/security/LoginService.java | 4 - .../src/main/resources/mapper/DeptMapper.xml | 6 +- .../resources/mapper/EmailTemplateMapper.xml | 6 +- .../resources/mapper/EmailUsersMapper.xml | 6 +- .../src/main/resources/mapper/FilesMapper.xml | 6 +- .../mapper/FilesPartDetailMapper.xml | 6 +- .../src/main/resources/mapper/I18nMapper.xml | 6 +- .../main/resources/mapper/I18nTypeMapper.xml | 6 +- .../main/resources/mapper/MenuIconMapper.xml | 6 +- .../main/resources/mapper/MessageMapper.xml | 6 +- .../mapper/MessageReceivedMapper.xml | 6 +- .../resources/mapper/MessageTypeMapper.xml | 6 +- .../resources/mapper/PermissionMapper.xml | 6 +- .../src/main/resources/mapper/RoleMapper.xml | 6 +- .../resources/mapper/RolePermissionMapper.xml | 6 +- .../main/resources/mapper/RouterMapper.xml | 6 +- .../resources/mapper/RouterRoleMapper.xml | 6 +- .../main/resources/mapper/UserDeptMapper.xml | 6 +- .../main/resources/mapper/UserLoginMapper.xml | 6 +- .../src/main/resources/mapper/UserMapper.xml | 6 +- .../main/resources/mapper/UserRoleMapper.xml | 6 +- spring-security/pom.xml | 6 + .../spring/service/security/LoginService.java | 4 - .../SpringSecurityStep1Application.java | 2 +- .../bean}/dto/security/LoginRequest.java | 2 +- .../step1/bean}/dto/system/DeptDto.java | 2 +- .../bean/dto/system/EmailTemplateDto.java | 2 +- .../bean/dto/system/EmailUsersDto.java | 2 +- .../{ => step1}/bean/dto/system/FilesDto.java | 2 +- .../bean}/dto/system/FilesPartDetailDto.java | 2 +- .../step1/bean}/dto/system/I18nDto.java | 2 +- .../bean/dto/system/I18nTypeDto.java | 2 +- .../step1/bean}/dto/system/MenuIconDto.java | 2 +- .../step1/bean}/dto/system/MessageDto.java | 2 +- .../bean/dto/system/MessageReceivedDto.java | 2 +- .../bean}/dto/system/MessageTypeDto.java | 2 +- .../step1/bean}/dto/system/PermissionDto.java | 2 +- .../step1/bean}/dto/system/RoleDto.java | 2 +- .../bean/dto/system/RolePermissionDto.java | 2 +- .../step1/bean}/dto/system/RouterDto.java | 2 +- .../bean/dto/system/RouterRoleDto.java | 2 +- .../step1/bean}/dto/system/UserDeptDto.java | 2 +- .../step1/bean}/dto/system/UserDto.java | 2 +- .../bean/dto/system/UserLoginDto.java | 2 +- .../bean/dto/system/UserRoleDto.java | 2 +- .../spring/step1/bean}/entity/DeptEntity.java | 5 +- .../bean/entity/EmailTemplateEntity.java | 2 +- .../step1/bean}/entity/EmailUsersEntity.java | 2 +- .../{ => step1}/bean/entity/FilesEntity.java | 2 +- .../bean}/entity/FilesPartDetailEntity.java | 2 +- .../{ => step1}/bean/entity/I18nEntity.java | 2 +- .../bean/entity/I18nTypeEntity.java | 2 +- .../bean/entity/MenuIconEntity.java | 2 +- .../bean/entity/MessageEntity.java | 2 +- .../bean/entity/MessageReceivedEntity.java | 2 +- .../bean/entity/MessageTypeEntity.java | 2 +- .../bean/entity/PermissionEntity.java | 2 +- .../spring/step1/bean}/entity/RoleEntity.java | 2 +- .../bean/entity/RolePermissionEntity.java | 2 +- .../step1/bean}/entity/RouterEntity.java | 2 +- .../bean/entity/RouterRoleEntity.java | 2 +- .../bean/entity/UserDeptEntity.java | 2 +- .../{ => step1}/bean/entity/UserEntity.java | 2 +- .../bean/entity/UserLoginEntity.java | 2 +- .../step1/bean}/entity/UserRoleEntity.java | 2 +- .../spring/{ => step1}/bean/vo/DeptVo.java | 2 +- .../step1/bean}/vo/EmailTemplateVo.java | 2 +- .../{ => step1}/bean/vo/EmailUsersVo.java | 2 +- .../step1/bean}/vo/FilesPartDetailVo.java | 2 +- .../spring/{ => step1}/bean/vo/FilesVo.java | 2 +- .../{ => step1}/bean/vo/I18nTypeVo.java | 2 +- .../com/spring/step1/bean}/vo/I18nVo.java | 2 +- .../com/spring/step1/bean}/vo/MenuIconVo.java | 2 +- .../bean/vo/MessageReceivedVo.java | 2 +- .../spring/step1/bean}/vo/MessageTypeVo.java | 2 +- .../spring/{ => step1}/bean/vo/MessageVo.java | 2 +- .../{ => step1}/bean/vo/PermissionVo.java | 2 +- .../{ => step1}/bean/vo/RolePermissionVo.java | 2 +- .../com/spring/step1/bean}/vo/RoleVo.java | 2 +- .../spring/step1/bean}/vo/RouterRoleVo.java | 2 +- .../spring/{ => step1}/bean/vo/RouterVo.java | 2 +- .../com/spring/step1/bean}/vo/UserDeptVo.java | 2 +- .../spring/step1/bean}/vo/UserLoginVo.java | 2 +- .../com/spring/step1/bean}/vo/UserRoleVo.java | 2 +- .../spring/{ => step1}/bean/vo/UserVo.java | 2 +- .../step1/bean}/vo/result/PageResult.java | 2 +- .../spring/step1}/bean/vo/result/Result.java | 2 +- .../step1/bean}/vo/result/ResultCodeEnum.java | 2 +- .../{ => step1}/config/Knife4jConfig.java | 2 +- .../anonymous/EmailTemplateController.java | 16 +- .../anonymous/EmailUsersController.java | 16 +- .../sample/anonymous/FilesController.java | 16 +- .../anonymous/FilesPartDetailController.java | 16 +- .../sample/anonymous/I18nController.java | 16 +- .../sample/anonymous/I18nTypeController.java | 16 +- .../sample/anonymous/MenuIconController.java | 16 +- .../anonymous/PermissionController.java | 16 +- .../sample/anonymous/RoleController.java | 16 +- .../anonymous/RolePermissionController.java | 16 +- .../sample/anonymous/RouterController.java | 16 +- .../anonymous/RouterRoleController.java | 16 +- .../sample/dept/DeptController.java | 16 +- .../sample/message/MessageController.java | 16 +- .../message/MessageReceivedController.java | 16 +- .../sample/message/MessageTypeController.java | 16 +- .../sample/user/UserController.java | 16 +- .../sample/user/UserDeptController.java | 16 +- .../sample/user/UserLoginController.java | 16 +- .../sample/user/UserRoleController.java | 16 +- .../controller/security/CheckController.java | 2 +- .../controller/security/LoginController.java | 2 +- .../spring/{ => step1}/mapper/DeptMapper.java | 8 +- .../step1}/mapper/EmailTemplateMapper.java | 8 +- .../step1}/mapper/EmailUsersMapper.java | 8 +- .../{ => step1}/mapper/FilesMapper.java | 8 +- .../step1}/mapper/FilesPartDetailMapper.java | 8 +- .../com/spring/step1}/mapper/I18nMapper.java | 8 +- .../spring/step1}/mapper/I18nTypeMapper.java | 8 +- .../{ => step1}/mapper/MenuIconMapper.java | 8 +- .../{ => step1}/mapper/MessageMapper.java | 8 +- .../step1}/mapper/MessageReceivedMapper.java | 8 +- .../step1}/mapper/MessageTypeMapper.java | 8 +- .../step1}/mapper/PermissionMapper.java | 8 +- .../com/spring/step1}/mapper/RoleMapper.java | 8 +- .../step1}/mapper/RolePermissionMapper.java | 8 +- .../spring/step1}/mapper/RouterMapper.java | 8 +- .../{ => step1}/mapper/RouterRoleMapper.java | 8 +- .../spring/step1}/mapper/UserDeptMapper.java | 8 +- .../spring/step1}/mapper/UserLoginMapper.java | 8 +- .../com/spring/step1}/mapper/UserMapper.java | 8 +- .../{ => step1}/mapper/UserRoleMapper.java | 8 +- .../config/SecurityConfiguration.java | 2 +- .../config/SecurityWebConfiguration.java | 6 +- .../handler/SecurityAccessDeniedHandler.java | 4 +- .../SecurityAuthenticationEntryPoint.java | 4 +- .../security/password/MD5PasswordEncoder.java | 2 +- .../service/CustomUserDetailsService.java | 2 +- .../step1}/service/impl/LoginServiceImpl.java | 4 +- .../service/sample/DeptService.java | 10 +- .../service/sample}/EmailTemplateService.java | 10 +- .../service/sample}/EmailUsersService.java | 10 +- .../sample/FilesPartDetailService.java | 10 +- .../service/sample/FilesService.java | 10 +- .../step1/service/sample}/I18nService.java | 10 +- .../service/sample}/I18nTypeService.java | 10 +- .../service/sample/MenuIconService.java | 10 +- .../sample}/MessageReceivedService.java | 10 +- .../service/sample/MessageService.java | 10 +- .../service/sample}/MessageTypeService.java | 10 +- .../service/sample}/PermissionService.java | 10 +- .../sample}/RolePermissionService.java | 10 +- .../service/sample/RoleService.java | 10 +- .../service/sample/RouterRoleService.java | 10 +- .../step1/service/sample}/RouterService.java | 10 +- .../service/sample}/UserDeptService.java | 10 +- .../service/sample}/UserLoginService.java | 10 +- .../service/sample/UserRoleService.java | 10 +- .../step1/service/sample}/UserService.java | 10 +- .../service/sample}/impl/DeptServiceImpl.java | 14 +- .../sample/impl/EmailTemplateServiceImpl.java | 14 +- .../sample}/impl/EmailUsersServiceImpl.java | 14 +- .../impl/FilesPartDetailServiceImpl.java | 14 +- .../service/sample/impl/FilesServiceImpl.java | 14 +- .../service/sample/impl/I18nServiceImpl.java | 14 +- .../sample}/impl/I18nTypeServiceImpl.java | 14 +- .../sample}/impl/MenuIconServiceImpl.java | 14 +- .../impl/MessageReceivedServiceImpl.java | 14 +- .../sample/impl/MessageServiceImpl.java | 14 +- .../sample/impl/MessageTypeServiceImpl.java | 14 +- .../sample}/impl/PermissionServiceImpl.java | 14 +- .../impl/RolePermissionServiceImpl.java | 14 +- .../service/sample/impl/RoleServiceImpl.java | 14 +- .../sample/impl/RouterRoleServiceImpl.java | 14 +- .../sample}/impl/RouterServiceImpl.java | 14 +- .../sample}/impl/UserDeptServiceImpl.java | 14 +- .../sample}/impl/UserLoginServiceImpl.java | 14 +- .../sample/impl/UserRoleServiceImpl.java | 14 +- .../service/sample/impl/UserServiceImpl.java | 14 +- .../step1/service/security/LoginService.java | 4 + .../step-1/src/main/resources/application.yml | 17 +- .../src/main/resources/mapper/DeptMapper.xml | 86 +++--- .../resources/mapper/EmailTemplateMapper.xml | 102 +++---- .../resources/mapper/EmailUsersMapper.xml | 110 +++---- .../src/main/resources/mapper/FilesMapper.xml | 270 +++++++++--------- .../mapper/FilesPartDetailMapper.xml | 102 +++---- .../src/main/resources/mapper/I18nMapper.xml | 78 ++--- .../main/resources/mapper/I18nTypeMapper.xml | 78 ++--- .../main/resources/mapper/MenuIconMapper.xml | 70 ++--- .../main/resources/mapper/MessageMapper.xml | 126 ++++---- .../mapper/MessageReceivedMapper.xml | 78 ++--- .../resources/mapper/MessageTypeMapper.xml | 86 +++--- .../resources/mapper/PermissionMapper.xml | 94 +++--- .../src/main/resources/mapper/RoleMapper.xml | 70 ++--- .../resources/mapper/RolePermissionMapper.xml | 70 ++--- .../main/resources/mapper/RouterMapper.xml | 110 +++---- .../resources/mapper/RouterRoleMapper.xml | 70 ++--- .../main/resources/mapper/UserDeptMapper.xml | 70 ++--- .../main/resources/mapper/UserLoginMapper.xml | 118 ++++---- .../src/main/resources/mapper/UserMapper.xml | 142 ++++----- .../main/resources/mapper/UserRoleMapper.xml | 70 ++--- .../java/com/spring/bean/vo/package-info.java | 1 - .../SpringSecurityStep2Application.java} | 6 +- .../ControllerStringParamTrimConfig.java | 50 ++++ .../{ => step2}/config/Knife4jConfig.java | 2 +- .../step2/config/MybatisPlusConfig.java | 35 +++ .../controller/CheckController.java | 2 +- .../controller/LoginController.java | 2 +- .../domain}/dto/LoginRequest.java | 2 +- .../com/spring/step2/domain/dto/UsersDto.java | 31 ++ .../step2/domain/entity/BaseEntity.java | 48 ++++ .../step2/domain/entity/UsersEntity.java | 31 ++ .../com/spring/step2/domain/vo/UsersVo.java | 30 ++ .../domain}/vo/result/PageResult.java | 2 +- .../step2}/domain/vo/result/Result.java | 2 +- .../domain}/vo/result/ResultCodeEnum.java | 2 +- .../com/spring/step2/mapper/UsersMapper.java | 34 +++ .../config/SecurityConfiguration.java | 2 +- .../config/SecurityWebConfiguration.java | 24 +- .../handler/SecurityAccessDeniedHandler.java | 4 +- .../SecurityAuthenticationEntryPoint.java | 4 +- .../security/password/MD5PasswordEncoder.java | 2 +- .../service/CustomUserDetailsService.java | 2 +- .../{ => step2}/service/LoginService.java | 2 +- .../step2}/service/impl/LoginServiceImpl.java | 4 +- .../src/main/resources/application-dev.yml | 6 + .../step-2/src/main/resources/application.yml | 26 +- .../src/main/resources/mapper/UsersMapper.xml | 33 +++ 380 files changed, 2555 insertions(+), 2237 deletions(-) rename spring-security/official/src/main/java/com/spring/{ => official}/SpringSecurityOfficialApplication.java (91%) rename spring-security/official/src/main/java/com/spring/{ => official}/config/DefaultSecurityConfig.java (98%) rename spring-security/official/src/main/java/com/spring/{ => official}/config/Knife4jConfig.java (98%) rename spring-security/official/src/main/java/com/spring/{ => official}/config/SecurityConfiguration.java (91%) rename spring-security/official/src/main/java/com/spring/{ => official}/config/handler/SecurityAccessDeniedHandler.java (91%) rename spring-security/official/src/main/java/com/spring/{ => official}/config/handler/SecurityAuthenticationEntryPoint.java (91%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/security/LoginController.java (89%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/DeptController.java (83%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/EmailTemplateController.java (83%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/EmailUsersController.java (83%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/FilesController.java (83%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/FilesPartDetailController.java (86%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/I18nController.java (83%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/I18nTypeController.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/MenuIconController.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/MessageController.java (83%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/MessageReceivedController.java (83%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/MessageTypeController.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/PermissionController.java (83%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/RoleController.java (83%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/RolePermissionController.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/RouterController.java (83%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/RouterRoleController.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/UserController.java (83%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/UserDeptController.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/UserLoginController.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/controller/system/UserRoleController.java (84%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/dto/security/LoginRequest.java (91%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/dto/system/DeptDto.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/dto/system/EmailTemplateDto.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/dto/system/EmailUsersDto.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/dto/system/FilesDto.java (98%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/dto/system/FilesPartDetailDto.java (97%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/dto/system/I18nDto.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/dto/system/I18nTypeDto.java (96%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/dto/system/MenuIconDto.java (95%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/dto/system/MessageDto.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/dto/system/MessageReceivedDto.java (96%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/dto/system/MessageTypeDto.java (96%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/dto/system/PermissionDto.java (96%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/dto/system/RoleDto.java (95%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/dto/system/RolePermissionDto.java (95%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/dto/system/RouterDto.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/dto/system/RouterRoleDto.java (95%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/dto/system/UserDeptDto.java (95%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/dto/system/UserDto.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/dto/system/UserLoginDto.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/dto/system/UserRoleDto.java (95%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/entity/DeptEntity.java (92%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/EmailTemplateEntity.java (97%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/entity/EmailUsersEntity.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/FilesEntity.java (98%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/entity/FilesPartDetailEntity.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/I18nEntity.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/I18nTypeEntity.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/MenuIconEntity.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/MessageEntity.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/MessageReceivedEntity.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/MessageTypeEntity.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/PermissionEntity.java (97%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/entity/RoleEntity.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/RolePermissionEntity.java (96%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/entity/RouterEntity.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/RouterRoleEntity.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/UserDeptEntity.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/UserEntity.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/entity/UserLoginEntity.java (97%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/entity/UserRoleEntity.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/vo/DeptVo.java (96%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/EmailTemplateVo.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/vo/EmailUsersVo.java (97%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/FilesPartDetailVo.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/vo/FilesVo.java (98%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/vo/I18nTypeVo.java (96%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/I18nVo.java (96%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/MenuIconVo.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/vo/MessageReceivedVo.java (96%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/MessageTypeVo.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/vo/MessageVo.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/vo/PermissionVo.java (97%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/vo/RolePermissionVo.java (96%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/RoleVo.java (96%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/RouterRoleVo.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/vo/RouterVo.java (97%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/UserDeptVo.java (96%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/UserLoginVo.java (97%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/UserRoleVo.java (96%) rename spring-security/official/src/main/java/com/spring/{ => official}/domain/vo/UserVo.java (97%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/result/PageResult.java (94%) rename spring-security/{step-1/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/result/Result.java (98%) rename spring-security/{step-2/src/main/java/com/spring/bean => official/src/main/java/com/spring/official/domain}/vo/result/ResultCodeEnum.java (98%) rename spring-security/official/src/main/java/com/spring/{ => official}/mapper/DeptMapper.java (79%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/EmailTemplateMapper.java (79%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/EmailUsersMapper.java (79%) rename spring-security/official/src/main/java/com/spring/{ => official}/mapper/FilesMapper.java (79%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/FilesPartDetailMapper.java (82%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/I18nMapper.java (80%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/I18nTypeMapper.java (80%) rename spring-security/official/src/main/java/com/spring/{ => official}/mapper/MenuIconMapper.java (80%) rename spring-security/official/src/main/java/com/spring/{ => official}/mapper/MessageMapper.java (79%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/MessageReceivedMapper.java (77%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/MessageTypeMapper.java (79%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/PermissionMapper.java (79%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/RoleMapper.java (80%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/RolePermissionMapper.java (79%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/RouterMapper.java (80%) rename spring-security/official/src/main/java/com/spring/{ => official}/mapper/RouterRoleMapper.java (80%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/UserDeptMapper.java (80%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/UserLoginMapper.java (79%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/mapper/UserMapper.java (80%) rename spring-security/official/src/main/java/com/spring/{ => official}/mapper/UserRoleMapper.java (80%) rename spring-security/{step-1/src/main/java/com/spring => official/src/main/java/com/spring/official}/service/impl/LoginServiceImpl.java (64%) create mode 100644 spring-security/official/src/main/java/com/spring/official/service/security/LoginService.java rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/DeptService.java (77%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/EmailTemplateService.java (78%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/EmailUsersService.java (78%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/FilesPartDetailService.java (81%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/FilesService.java (77%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/I18nService.java (77%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/I18nTypeService.java (78%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/MenuIconService.java (78%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/MessageReceivedService.java (77%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/MessageService.java (77%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/MessageTypeService.java (78%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/PermissionService.java (78%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/RolePermissionService.java (79%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/RoleService.java (77%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/RouterRoleService.java (79%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/RouterService.java (78%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/UserDeptService.java (78%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/UserLoginService.java (78%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/UserRoleService.java (79%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/UserService.java (77%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/impl/DeptServiceImpl.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/impl/EmailTemplateServiceImpl.java (84%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/impl/EmailUsersServiceImpl.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/impl/FilesPartDetailServiceImpl.java (86%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/impl/FilesServiceImpl.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/impl/I18nServiceImpl.java (84%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/impl/I18nTypeServiceImpl.java (84%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/impl/MenuIconServiceImpl.java (85%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/impl/MessageReceivedServiceImpl.java (83%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/impl/MessageServiceImpl.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/impl/MessageTypeServiceImpl.java (84%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/impl/PermissionServiceImpl.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/impl/RolePermissionServiceImpl.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/impl/RoleServiceImpl.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/impl/RouterRoleServiceImpl.java (85%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/impl/RouterServiceImpl.java (84%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/impl/UserDeptServiceImpl.java (84%) rename spring-security/{step-1/src/main/java/com/spring/service/sample => official/src/main/java/com/spring/official/service/system}/impl/UserLoginServiceImpl.java (84%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/impl/UserRoleServiceImpl.java (85%) rename spring-security/official/src/main/java/com/spring/{ => official}/service/system/impl/UserServiceImpl.java (84%) delete mode 100644 spring-security/official/src/main/java/com/spring/service/security/LoginService.java delete mode 100644 spring-security/step-1/src/main/java/com/spring/service/security/LoginService.java rename spring-security/{step-2/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/SpringSecurityStep1Application.java (92%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/dto/security/LoginRequest.java (92%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/dto/system/DeptDto.java (96%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/dto/system/EmailTemplateDto.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/dto/system/EmailUsersDto.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/dto/system/FilesDto.java (98%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/dto/system/FilesPartDetailDto.java (97%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/dto/system/I18nDto.java (96%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/dto/system/I18nTypeDto.java (96%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/dto/system/MenuIconDto.java (96%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/dto/system/MessageDto.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/dto/system/MessageReceivedDto.java (96%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/dto/system/MessageTypeDto.java (96%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/dto/system/PermissionDto.java (96%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/dto/system/RoleDto.java (96%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/dto/system/RolePermissionDto.java (96%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/dto/system/RouterDto.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/dto/system/RouterRoleDto.java (96%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/dto/system/UserDeptDto.java (96%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/dto/system/UserDto.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/dto/system/UserLoginDto.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/dto/system/UserRoleDto.java (96%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/entity/DeptEntity.java (92%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/EmailTemplateEntity.java (97%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/entity/EmailUsersEntity.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/FilesEntity.java (98%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/entity/FilesPartDetailEntity.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/I18nEntity.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/I18nTypeEntity.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/MenuIconEntity.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/MessageEntity.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/MessageReceivedEntity.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/MessageTypeEntity.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/PermissionEntity.java (97%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/entity/RoleEntity.java (96%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/RolePermissionEntity.java (97%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/entity/RouterEntity.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/RouterRoleEntity.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/UserDeptEntity.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/UserEntity.java (98%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/entity/UserLoginEntity.java (97%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/entity/UserRoleEntity.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/vo/DeptVo.java (97%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/vo/EmailTemplateVo.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/vo/EmailUsersVo.java (97%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/vo/FilesPartDetailVo.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/vo/FilesVo.java (99%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/vo/I18nTypeVo.java (97%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/vo/I18nVo.java (97%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/vo/MenuIconVo.java (96%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/vo/MessageReceivedVo.java (97%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/vo/MessageTypeVo.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/vo/MessageVo.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/vo/PermissionVo.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/vo/RolePermissionVo.java (96%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/vo/RoleVo.java (96%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/vo/RouterRoleVo.java (96%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/vo/RouterVo.java (97%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/vo/UserDeptVo.java (96%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/vo/UserLoginVo.java (97%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/vo/UserRoleVo.java (96%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/bean/vo/UserVo.java (98%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/vo/result/PageResult.java (94%) rename spring-security/{step-2/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/bean/vo/result/Result.java (99%) rename spring-security/{official/src/main/java/com/spring/domain => step-1/src/main/java/com/spring/step1/bean}/vo/result/ResultCodeEnum.java (98%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/config/Knife4jConfig.java (98%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/anonymous/EmailTemplateController.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/anonymous/EmailUsersController.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/anonymous/FilesController.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/anonymous/FilesPartDetailController.java (86%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/anonymous/I18nController.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/anonymous/I18nTypeController.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/anonymous/MenuIconController.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/anonymous/PermissionController.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/anonymous/RoleController.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/anonymous/RolePermissionController.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/anonymous/RouterController.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/anonymous/RouterRoleController.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/dept/DeptController.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/message/MessageController.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/message/MessageReceivedController.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/message/MessageTypeController.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/user/UserController.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/user/UserDeptController.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/user/UserLoginController.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/sample/user/UserRoleController.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/security/CheckController.java (94%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/controller/security/LoginController.java (87%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/mapper/DeptMapper.java (81%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/EmailTemplateMapper.java (80%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/EmailUsersMapper.java (80%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/mapper/FilesMapper.java (81%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/FilesPartDetailMapper.java (83%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/I18nMapper.java (81%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/I18nTypeMapper.java (81%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/mapper/MenuIconMapper.java (81%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/mapper/MessageMapper.java (81%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/MessageReceivedMapper.java (78%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/MessageTypeMapper.java (81%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/PermissionMapper.java (80%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/RoleMapper.java (81%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/RolePermissionMapper.java (80%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/RouterMapper.java (81%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/mapper/RouterRoleMapper.java (82%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/UserDeptMapper.java (81%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/UserLoginMapper.java (81%) rename spring-security/{official/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/mapper/UserMapper.java (81%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/mapper/UserRoleMapper.java (82%) rename spring-security/{step-2/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/security/config/SecurityConfiguration.java (98%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/security/config/SecurityWebConfiguration.java (93%) rename spring-security/{step-2/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/security/handler/SecurityAccessDeniedHandler.java (91%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/security/handler/SecurityAuthenticationEntryPoint.java (91%) rename spring-security/{step-2/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/security/password/MD5PasswordEncoder.java (97%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/security/service/CustomUserDetailsService.java (97%) rename spring-security/{step-2/src/main/java/com/spring => step-1/src/main/java/com/spring/step1}/service/impl/LoginServiceImpl.java (65%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/DeptService.java (78%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/EmailTemplateService.java (79%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/EmailUsersService.java (79%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/FilesPartDetailService.java (82%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/FilesService.java (79%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/I18nService.java (79%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/I18nTypeService.java (79%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/MenuIconService.java (80%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/MessageReceivedService.java (78%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/MessageService.java (79%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/MessageTypeService.java (80%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/PermissionService.java (79%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/RolePermissionService.java (80%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/RoleService.java (79%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/RouterRoleService.java (80%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/RouterService.java (79%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/UserDeptService.java (80%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/UserLoginService.java (80%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/UserRoleService.java (80%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/UserService.java (79%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/impl/DeptServiceImpl.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/impl/EmailTemplateServiceImpl.java (85%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/impl/EmailUsersServiceImpl.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/impl/FilesPartDetailServiceImpl.java (87%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/impl/FilesServiceImpl.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/impl/I18nServiceImpl.java (85%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/impl/I18nTypeServiceImpl.java (85%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/impl/MenuIconServiceImpl.java (86%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/impl/MessageReceivedServiceImpl.java (84%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/impl/MessageServiceImpl.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/impl/MessageTypeServiceImpl.java (85%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/impl/PermissionServiceImpl.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/impl/RolePermissionServiceImpl.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/impl/RoleServiceImpl.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/impl/RouterRoleServiceImpl.java (86%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/impl/RouterServiceImpl.java (85%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/impl/UserDeptServiceImpl.java (85%) rename spring-security/{official/src/main/java/com/spring/service/system => step-1/src/main/java/com/spring/step1/service/sample}/impl/UserLoginServiceImpl.java (85%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/impl/UserRoleServiceImpl.java (86%) rename spring-security/step-1/src/main/java/com/spring/{ => step1}/service/sample/impl/UserServiceImpl.java (85%) create mode 100644 spring-security/step-1/src/main/java/com/spring/step1/service/security/LoginService.java delete mode 100644 spring-security/step-2/src/main/java/com/spring/bean/vo/package-info.java rename spring-security/{step-1/src/main/java/com/spring/SpringSecurityStep1Application.java => step-2/src/main/java/com/spring/step2/SpringSecurityStep2Application.java} (60%) create mode 100644 spring-security/step-2/src/main/java/com/spring/step2/config/ControllerStringParamTrimConfig.java rename spring-security/step-2/src/main/java/com/spring/{ => step2}/config/Knife4jConfig.java (98%) create mode 100644 spring-security/step-2/src/main/java/com/spring/step2/config/MybatisPlusConfig.java rename spring-security/step-2/src/main/java/com/spring/{ => step2}/controller/CheckController.java (95%) rename spring-security/step-2/src/main/java/com/spring/{ => step2}/controller/LoginController.java (89%) rename spring-security/step-2/src/main/java/com/spring/{bean => step2/domain}/dto/LoginRequest.java (93%) create mode 100644 spring-security/step-2/src/main/java/com/spring/step2/domain/dto/UsersDto.java create mode 100644 spring-security/step-2/src/main/java/com/spring/step2/domain/entity/BaseEntity.java create mode 100644 spring-security/step-2/src/main/java/com/spring/step2/domain/entity/UsersEntity.java create mode 100644 spring-security/step-2/src/main/java/com/spring/step2/domain/vo/UsersVo.java rename spring-security/step-2/src/main/java/com/spring/{bean => step2/domain}/vo/result/PageResult.java (94%) rename spring-security/{official/src/main/java/com/spring => step-2/src/main/java/com/spring/step2}/domain/vo/result/Result.java (98%) rename spring-security/{step-1/src/main/java/com/spring/bean => step-2/src/main/java/com/spring/step2/domain}/vo/result/ResultCodeEnum.java (98%) create mode 100644 spring-security/step-2/src/main/java/com/spring/step2/mapper/UsersMapper.java rename spring-security/{step-1/src/main/java/com/spring => step-2/src/main/java/com/spring/step2}/security/config/SecurityConfiguration.java (98%) rename spring-security/step-2/src/main/java/com/spring/{ => step2}/security/config/SecurityWebConfiguration.java (73%) rename spring-security/{step-1/src/main/java/com/spring => step-2/src/main/java/com/spring/step2}/security/handler/SecurityAccessDeniedHandler.java (91%) rename spring-security/step-2/src/main/java/com/spring/{ => step2}/security/handler/SecurityAuthenticationEntryPoint.java (91%) rename spring-security/{step-1/src/main/java/com/spring => step-2/src/main/java/com/spring/step2}/security/password/MD5PasswordEncoder.java (97%) rename spring-security/step-2/src/main/java/com/spring/{ => step2}/security/service/CustomUserDetailsService.java (97%) rename spring-security/step-2/src/main/java/com/spring/{ => step2}/service/LoginService.java (50%) rename spring-security/{official/src/main/java/com/spring => step-2/src/main/java/com/spring/step2}/service/impl/LoginServiceImpl.java (68%) create mode 100644 spring-security/step-2/src/main/resources/mapper/UsersMapper.xml diff --git a/spring-security/official/src/main/java/com/spring/SpringSecurityOfficialApplication.java b/spring-security/official/src/main/java/com/spring/official/SpringSecurityOfficialApplication.java similarity index 91% rename from spring-security/official/src/main/java/com/spring/SpringSecurityOfficialApplication.java rename to spring-security/official/src/main/java/com/spring/official/SpringSecurityOfficialApplication.java index e0c684c..f97d1db 100644 --- a/spring-security/official/src/main/java/com/spring/SpringSecurityOfficialApplication.java +++ b/spring-security/official/src/main/java/com/spring/official/SpringSecurityOfficialApplication.java @@ -1,4 +1,4 @@ -package com.spring; +package com.spring.official; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-security/official/src/main/java/com/spring/config/DefaultSecurityConfig.java b/spring-security/official/src/main/java/com/spring/official/config/DefaultSecurityConfig.java similarity index 98% rename from spring-security/official/src/main/java/com/spring/config/DefaultSecurityConfig.java rename to spring-security/official/src/main/java/com/spring/official/config/DefaultSecurityConfig.java index 60aaa02..a40acba 100644 --- a/spring-security/official/src/main/java/com/spring/config/DefaultSecurityConfig.java +++ b/spring-security/official/src/main/java/com/spring/official/config/DefaultSecurityConfig.java @@ -1,4 +1,4 @@ -package com.spring.config; +package com.spring.official.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.ApplicationEventPublisher; diff --git a/spring-security/official/src/main/java/com/spring/config/Knife4jConfig.java b/spring-security/official/src/main/java/com/spring/official/config/Knife4jConfig.java similarity index 98% rename from spring-security/official/src/main/java/com/spring/config/Knife4jConfig.java rename to spring-security/official/src/main/java/com/spring/official/config/Knife4jConfig.java index e41e07e..b274755 100644 --- a/spring-security/official/src/main/java/com/spring/config/Knife4jConfig.java +++ b/spring-security/official/src/main/java/com/spring/official/config/Knife4jConfig.java @@ -1,4 +1,4 @@ -package com.spring.config; +package com.spring.official.config; import io.swagger.v3.oas.models.ExternalDocumentation; import io.swagger.v3.oas.models.OpenAPI; diff --git a/spring-security/official/src/main/java/com/spring/config/SecurityConfiguration.java b/spring-security/official/src/main/java/com/spring/official/config/SecurityConfiguration.java similarity index 91% rename from spring-security/official/src/main/java/com/spring/config/SecurityConfiguration.java rename to spring-security/official/src/main/java/com/spring/official/config/SecurityConfiguration.java index 0fdfc3c..2772661 100644 --- a/spring-security/official/src/main/java/com/spring/config/SecurityConfiguration.java +++ b/spring-security/official/src/main/java/com/spring/official/config/SecurityConfiguration.java @@ -1,7 +1,7 @@ -package com.spring.config; +package com.spring.official.config; -import com.spring.config.handler.SecurityAccessDeniedHandler; -import com.spring.config.handler.SecurityAuthenticationEntryPoint; +import com.spring.official.config.handler.SecurityAccessDeniedHandler; +import com.spring.official.config.handler.SecurityAuthenticationEntryPoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; diff --git a/spring-security/official/src/main/java/com/spring/config/handler/SecurityAccessDeniedHandler.java b/spring-security/official/src/main/java/com/spring/official/config/handler/SecurityAccessDeniedHandler.java similarity index 91% rename from spring-security/official/src/main/java/com/spring/config/handler/SecurityAccessDeniedHandler.java rename to spring-security/official/src/main/java/com/spring/official/config/handler/SecurityAccessDeniedHandler.java index dfbf1a6..0534e6b 100644 --- a/spring-security/official/src/main/java/com/spring/config/handler/SecurityAccessDeniedHandler.java +++ b/spring-security/official/src/main/java/com/spring/official/config/handler/SecurityAccessDeniedHandler.java @@ -1,7 +1,7 @@ -package com.spring.config.handler; +package com.spring.official.config.handler; import com.alibaba.fastjson2.JSON; -import com.spring.domain.vo.result.Result; +import com.spring.official.domain.vo.result.Result; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/spring-security/official/src/main/java/com/spring/config/handler/SecurityAuthenticationEntryPoint.java b/spring-security/official/src/main/java/com/spring/official/config/handler/SecurityAuthenticationEntryPoint.java similarity index 91% rename from spring-security/official/src/main/java/com/spring/config/handler/SecurityAuthenticationEntryPoint.java rename to spring-security/official/src/main/java/com/spring/official/config/handler/SecurityAuthenticationEntryPoint.java index c10becd..7cc0605 100644 --- a/spring-security/official/src/main/java/com/spring/config/handler/SecurityAuthenticationEntryPoint.java +++ b/spring-security/official/src/main/java/com/spring/official/config/handler/SecurityAuthenticationEntryPoint.java @@ -1,7 +1,7 @@ -package com.spring.config.handler; +package com.spring.official.config.handler; import com.alibaba.fastjson2.JSON; -import com.spring.domain.vo.result.Result; +import com.spring.official.domain.vo.result.Result; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/spring-security/official/src/main/java/com/spring/controller/security/LoginController.java b/spring-security/official/src/main/java/com/spring/official/controller/security/LoginController.java similarity index 89% rename from spring-security/official/src/main/java/com/spring/controller/security/LoginController.java rename to spring-security/official/src/main/java/com/spring/official/controller/security/LoginController.java index 8bbd819..2002e8e 100644 --- a/spring-security/official/src/main/java/com/spring/controller/security/LoginController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/security/LoginController.java @@ -1,7 +1,7 @@ -package com.spring.controller.security; +package com.spring.official.controller.security; -import com.spring.domain.dto.security.LoginRequest; -import com.spring.domain.vo.result.Result; +import com.spring.official.domain.dto.security.LoginRequest; +import com.spring.official.domain.vo.result.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/controller/system/DeptController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/DeptController.java similarity index 83% rename from spring-security/official/src/main/java/com/spring/controller/system/DeptController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/DeptController.java index 94131c1..fef8b58 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/DeptController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/DeptController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.DeptDto; -import com.spring.domain.entity.DeptEntity; -import com.spring.domain.vo.DeptVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.DeptService; +import com.spring.official.domain.dto.system.DeptDto; +import com.spring.official.domain.entity.DeptEntity; +import com.spring.official.domain.vo.DeptVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.DeptService; 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/spring-security/official/src/main/java/com/spring/controller/system/EmailTemplateController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/EmailTemplateController.java similarity index 83% rename from spring-security/official/src/main/java/com/spring/controller/system/EmailTemplateController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/EmailTemplateController.java index 08dabb9..30da3a2 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/EmailTemplateController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/EmailTemplateController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.EmailTemplateDto; -import com.spring.domain.entity.EmailTemplateEntity; -import com.spring.domain.vo.EmailTemplateVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.EmailTemplateService; +import com.spring.official.domain.dto.system.EmailTemplateDto; +import com.spring.official.domain.entity.EmailTemplateEntity; +import com.spring.official.domain.vo.EmailTemplateVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.EmailTemplateService; 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/spring-security/official/src/main/java/com/spring/controller/system/EmailUsersController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/EmailUsersController.java similarity index 83% rename from spring-security/official/src/main/java/com/spring/controller/system/EmailUsersController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/EmailUsersController.java index e076d6d..9e4ec2b 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/EmailUsersController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/EmailUsersController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.EmailUsersDto; -import com.spring.domain.entity.EmailUsersEntity; -import com.spring.domain.vo.EmailUsersVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.EmailUsersService; +import com.spring.official.domain.dto.system.EmailUsersDto; +import com.spring.official.domain.entity.EmailUsersEntity; +import com.spring.official.domain.vo.EmailUsersVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.EmailUsersService; 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/spring-security/official/src/main/java/com/spring/controller/system/FilesController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/FilesController.java similarity index 83% rename from spring-security/official/src/main/java/com/spring/controller/system/FilesController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/FilesController.java index 842e86e..beff078 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/FilesController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/FilesController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.FilesDto; -import com.spring.domain.entity.FilesEntity; -import com.spring.domain.vo.FilesVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.FilesService; +import com.spring.official.domain.dto.system.FilesDto; +import com.spring.official.domain.entity.FilesEntity; +import com.spring.official.domain.vo.FilesVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.FilesService; 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/spring-security/official/src/main/java/com/spring/controller/system/FilesPartDetailController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/FilesPartDetailController.java similarity index 86% rename from spring-security/official/src/main/java/com/spring/controller/system/FilesPartDetailController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/FilesPartDetailController.java index 1e12ffe..cb4f52e 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/FilesPartDetailController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/FilesPartDetailController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.FilesPartDetailDto; -import com.spring.domain.entity.FilesPartDetailEntity; -import com.spring.domain.vo.FilesPartDetailVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.FilesPartDetailService; +import com.spring.official.domain.dto.system.FilesPartDetailDto; +import com.spring.official.domain.entity.FilesPartDetailEntity; +import com.spring.official.domain.vo.FilesPartDetailVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.FilesPartDetailService; 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/spring-security/official/src/main/java/com/spring/controller/system/I18nController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/I18nController.java similarity index 83% rename from spring-security/official/src/main/java/com/spring/controller/system/I18nController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/I18nController.java index c930ae3..12cfcba 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/I18nController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/I18nController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.I18nDto; -import com.spring.domain.entity.I18nEntity; -import com.spring.domain.vo.I18nVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.I18nService; +import com.spring.official.domain.dto.system.I18nDto; +import com.spring.official.domain.entity.I18nEntity; +import com.spring.official.domain.vo.I18nVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.I18nService; 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/spring-security/official/src/main/java/com/spring/controller/system/I18nTypeController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/I18nTypeController.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/controller/system/I18nTypeController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/I18nTypeController.java index 3a680a1..86dbba1 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/I18nTypeController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/I18nTypeController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.I18nTypeDto; -import com.spring.domain.entity.I18nTypeEntity; -import com.spring.domain.vo.I18nTypeVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.I18nTypeService; +import com.spring.official.domain.dto.system.I18nTypeDto; +import com.spring.official.domain.entity.I18nTypeEntity; +import com.spring.official.domain.vo.I18nTypeVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.I18nTypeService; 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/spring-security/official/src/main/java/com/spring/controller/system/MenuIconController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/MenuIconController.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/controller/system/MenuIconController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/MenuIconController.java index e6ae140..f19f3b8 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/MenuIconController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/MenuIconController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.MenuIconDto; -import com.spring.domain.entity.MenuIconEntity; -import com.spring.domain.vo.MenuIconVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.MenuIconService; +import com.spring.official.domain.dto.system.MenuIconDto; +import com.spring.official.domain.entity.MenuIconEntity; +import com.spring.official.domain.vo.MenuIconVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.MenuIconService; 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/spring-security/official/src/main/java/com/spring/controller/system/MessageController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/MessageController.java similarity index 83% rename from spring-security/official/src/main/java/com/spring/controller/system/MessageController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/MessageController.java index 28e93e8..ba79204 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/MessageController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/MessageController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.MessageDto; -import com.spring.domain.entity.MessageEntity; -import com.spring.domain.vo.MessageVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.MessageService; +import com.spring.official.domain.dto.system.MessageDto; +import com.spring.official.domain.entity.MessageEntity; +import com.spring.official.domain.vo.MessageVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.MessageService; 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/spring-security/official/src/main/java/com/spring/controller/system/MessageReceivedController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/MessageReceivedController.java similarity index 83% rename from spring-security/official/src/main/java/com/spring/controller/system/MessageReceivedController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/MessageReceivedController.java index 644f3ca..3d8458e 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/MessageReceivedController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/MessageReceivedController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.MessageReceivedDto; -import com.spring.domain.entity.MessageReceivedEntity; -import com.spring.domain.vo.MessageReceivedVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.MessageReceivedService; +import com.spring.official.domain.dto.system.MessageReceivedDto; +import com.spring.official.domain.entity.MessageReceivedEntity; +import com.spring.official.domain.vo.MessageReceivedVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.MessageReceivedService; 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/spring-security/official/src/main/java/com/spring/controller/system/MessageTypeController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/MessageTypeController.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/controller/system/MessageTypeController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/MessageTypeController.java index 19e8453..9037457 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/MessageTypeController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/MessageTypeController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.MessageTypeDto; -import com.spring.domain.entity.MessageTypeEntity; -import com.spring.domain.vo.MessageTypeVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.MessageTypeService; +import com.spring.official.domain.dto.system.MessageTypeDto; +import com.spring.official.domain.entity.MessageTypeEntity; +import com.spring.official.domain.vo.MessageTypeVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.MessageTypeService; 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/spring-security/official/src/main/java/com/spring/controller/system/PermissionController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/PermissionController.java similarity index 83% rename from spring-security/official/src/main/java/com/spring/controller/system/PermissionController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/PermissionController.java index 530aea9..ea8314a 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/PermissionController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/PermissionController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.PermissionDto; -import com.spring.domain.entity.PermissionEntity; -import com.spring.domain.vo.PermissionVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.PermissionService; +import com.spring.official.domain.dto.system.PermissionDto; +import com.spring.official.domain.entity.PermissionEntity; +import com.spring.official.domain.vo.PermissionVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.PermissionService; 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/spring-security/official/src/main/java/com/spring/controller/system/RoleController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/RoleController.java similarity index 83% rename from spring-security/official/src/main/java/com/spring/controller/system/RoleController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/RoleController.java index df4b36d..778f512 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/RoleController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/RoleController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.RoleDto; -import com.spring.domain.entity.RoleEntity; -import com.spring.domain.vo.RoleVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.RoleService; +import com.spring.official.domain.dto.system.RoleDto; +import com.spring.official.domain.entity.RoleEntity; +import com.spring.official.domain.vo.RoleVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.RoleService; 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/spring-security/official/src/main/java/com/spring/controller/system/RolePermissionController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/RolePermissionController.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/controller/system/RolePermissionController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/RolePermissionController.java index 9c0af54..e0553b7 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/RolePermissionController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/RolePermissionController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.RolePermissionDto; -import com.spring.domain.entity.RolePermissionEntity; -import com.spring.domain.vo.RolePermissionVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.RolePermissionService; +import com.spring.official.domain.dto.system.RolePermissionDto; +import com.spring.official.domain.entity.RolePermissionEntity; +import com.spring.official.domain.vo.RolePermissionVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.RolePermissionService; 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/spring-security/official/src/main/java/com/spring/controller/system/RouterController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/RouterController.java similarity index 83% rename from spring-security/official/src/main/java/com/spring/controller/system/RouterController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/RouterController.java index aec7d14..0757c0f 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/RouterController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/RouterController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.RouterDto; -import com.spring.domain.entity.RouterEntity; -import com.spring.domain.vo.RouterVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.RouterService; +import com.spring.official.domain.dto.system.RouterDto; +import com.spring.official.domain.entity.RouterEntity; +import com.spring.official.domain.vo.RouterVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.RouterService; 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/spring-security/official/src/main/java/com/spring/controller/system/RouterRoleController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/RouterRoleController.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/controller/system/RouterRoleController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/RouterRoleController.java index 38b4630..3d97514 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/RouterRoleController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/RouterRoleController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.RouterRoleDto; -import com.spring.domain.entity.RouterRoleEntity; -import com.spring.domain.vo.RouterRoleVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.RouterRoleService; +import com.spring.official.domain.dto.system.RouterRoleDto; +import com.spring.official.domain.entity.RouterRoleEntity; +import com.spring.official.domain.vo.RouterRoleVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.RouterRoleService; 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/spring-security/official/src/main/java/com/spring/controller/system/UserController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/UserController.java similarity index 83% rename from spring-security/official/src/main/java/com/spring/controller/system/UserController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/UserController.java index baa4c6a..09a23b5 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/UserController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/UserController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.UserDto; -import com.spring.domain.entity.UserEntity; -import com.spring.domain.vo.UserVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.UserService; +import com.spring.official.domain.dto.system.UserDto; +import com.spring.official.domain.entity.UserEntity; +import com.spring.official.domain.vo.UserVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.UserService; 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/spring-security/official/src/main/java/com/spring/controller/system/UserDeptController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/UserDeptController.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/controller/system/UserDeptController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/UserDeptController.java index 12ce347..5107ad0 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/UserDeptController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/UserDeptController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.UserDeptDto; -import com.spring.domain.entity.UserDeptEntity; -import com.spring.domain.vo.UserDeptVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.UserDeptService; +import com.spring.official.domain.dto.system.UserDeptDto; +import com.spring.official.domain.entity.UserDeptEntity; +import com.spring.official.domain.vo.UserDeptVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.UserDeptService; 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/spring-security/official/src/main/java/com/spring/controller/system/UserLoginController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/UserLoginController.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/controller/system/UserLoginController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/UserLoginController.java index 3504d8b..0bbdf8f 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/UserLoginController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/UserLoginController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.UserLoginDto; -import com.spring.domain.entity.UserLoginEntity; -import com.spring.domain.vo.UserLoginVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.UserLoginService; +import com.spring.official.domain.dto.system.UserLoginDto; +import com.spring.official.domain.entity.UserLoginEntity; +import com.spring.official.domain.vo.UserLoginVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.UserLoginService; 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/spring-security/official/src/main/java/com/spring/controller/system/UserRoleController.java b/spring-security/official/src/main/java/com/spring/official/controller/system/UserRoleController.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/controller/system/UserRoleController.java rename to spring-security/official/src/main/java/com/spring/official/controller/system/UserRoleController.java index 00f049b..c7a9112 100644 --- a/spring-security/official/src/main/java/com/spring/controller/system/UserRoleController.java +++ b/spring-security/official/src/main/java/com/spring/official/controller/system/UserRoleController.java @@ -1,13 +1,13 @@ -package com.spring.controller.system; +package com.spring.official.controller.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.domain.dto.system.UserRoleDto; -import com.spring.domain.entity.UserRoleEntity; -import com.spring.domain.vo.UserRoleVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.domain.vo.result.Result; -import com.spring.domain.vo.result.ResultCodeEnum; -import com.spring.service.system.UserRoleService; +import com.spring.official.domain.dto.system.UserRoleDto; +import com.spring.official.domain.entity.UserRoleEntity; +import com.spring.official.domain.vo.UserRoleVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.domain.vo.result.Result; +import com.spring.official.domain.vo.result.ResultCodeEnum; +import com.spring.official.service.system.UserRoleService; 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/spring-security/step-1/src/main/java/com/spring/bean/dto/security/LoginRequest.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/security/LoginRequest.java similarity index 91% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/security/LoginRequest.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/security/LoginRequest.java index ec90031..e127e8f 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/security/LoginRequest.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/security/LoginRequest.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.security; +package com.spring.official.domain.dto.security; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/DeptDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/DeptDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/DeptDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/DeptDto.java index c563efb..caef0d4 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/DeptDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/DeptDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/EmailTemplateDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/EmailTemplateDto.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/EmailTemplateDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/EmailTemplateDto.java index 0e17de4..2be4811 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/EmailTemplateDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/EmailTemplateDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/EmailUsersDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/EmailUsersDto.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/EmailUsersDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/EmailUsersDto.java index f4597d5..076d11d 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/EmailUsersDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/EmailUsersDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/FilesDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/FilesDto.java similarity index 98% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/FilesDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/FilesDto.java index 6a8cd3c..433e13f 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/FilesDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/FilesDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/FilesPartDetailDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/FilesPartDetailDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/FilesPartDetailDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/FilesPartDetailDto.java index de7d2bb..07c7316 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/FilesPartDetailDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/FilesPartDetailDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/I18nDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/I18nDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/I18nDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/I18nDto.java index f835450..c317369 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/I18nDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/I18nDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/I18nTypeDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/I18nTypeDto.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/I18nTypeDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/I18nTypeDto.java index 5cc5f60..3a24ad1 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/I18nTypeDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/I18nTypeDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MenuIconDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/MenuIconDto.java similarity index 95% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/MenuIconDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/MenuIconDto.java index 36b1b82..153c75d 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MenuIconDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/MenuIconDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/MessageDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/MessageDto.java index a789e4c..dab1259 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/MessageDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/MessageReceivedDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/MessageReceivedDto.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/MessageReceivedDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/MessageReceivedDto.java index 71203b6..db60e0f 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/MessageReceivedDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/MessageReceivedDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageTypeDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/MessageTypeDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageTypeDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/MessageTypeDto.java index c9ffc51..27cf08a 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageTypeDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/MessageTypeDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/PermissionDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/PermissionDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/PermissionDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/PermissionDto.java index d10cd1c..0f00dc4 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/PermissionDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/PermissionDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RoleDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/RoleDto.java similarity index 95% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/RoleDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/RoleDto.java index 7fd80d0..afb8903 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RoleDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/RoleDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/RolePermissionDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/RolePermissionDto.java similarity index 95% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/RolePermissionDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/RolePermissionDto.java index eaf7e87..e4b4c2f 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/RolePermissionDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/RolePermissionDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RouterDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/RouterDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/RouterDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/RouterDto.java index 8b79826..88a9914 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RouterDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/RouterDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/RouterRoleDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/RouterRoleDto.java similarity index 95% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/RouterRoleDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/RouterRoleDto.java index ad0b8fe..9a55d12 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/RouterRoleDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/RouterRoleDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserDeptDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/UserDeptDto.java similarity index 95% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserDeptDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/UserDeptDto.java index 650c047..53b437c 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserDeptDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/UserDeptDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/UserDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/UserDto.java index b5698e1..9feb51c 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/UserDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/UserLoginDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/UserLoginDto.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/UserLoginDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/UserLoginDto.java index 7ef5463..1d8e43a 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/UserLoginDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/UserLoginDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/UserRoleDto.java b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/UserRoleDto.java similarity index 95% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/UserRoleDto.java rename to spring-security/official/src/main/java/com/spring/official/domain/dto/system/UserRoleDto.java index 581974f..cec8543 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/UserRoleDto.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/dto/system/UserRoleDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.official.domain.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/DeptEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/DeptEntity.java similarity index 92% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/DeptEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/DeptEntity.java index 566b108..0323f42 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/DeptEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/DeptEntity.java @@ -1,17 +1,14 @@ -package com.spring.bean.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/EmailTemplateEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/EmailTemplateEntity.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/entity/EmailTemplateEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/EmailTemplateEntity.java index 1dcdc85..06c7d38 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/EmailTemplateEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/EmailTemplateEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/EmailUsersEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/EmailUsersEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/EmailUsersEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/EmailUsersEntity.java index 850ec0b..ec5203d 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/EmailUsersEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/EmailUsersEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/FilesEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/FilesEntity.java similarity index 98% rename from spring-security/official/src/main/java/com/spring/domain/entity/FilesEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/FilesEntity.java index 83cad16..43c522d 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/FilesEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/FilesEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/FilesPartDetailEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/FilesPartDetailEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/FilesPartDetailEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/FilesPartDetailEntity.java index 81b0166..2e617ea 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/FilesPartDetailEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/FilesPartDetailEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/I18nEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/I18nEntity.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/entity/I18nEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/I18nEntity.java index d72507a..bf08920 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/I18nEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/I18nEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/I18nTypeEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/I18nTypeEntity.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/entity/I18nTypeEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/I18nTypeEntity.java index 471791a..fc8de5f 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/I18nTypeEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/I18nTypeEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/MenuIconEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/MenuIconEntity.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/entity/MenuIconEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/MenuIconEntity.java index 3db7391..19e555f 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/MenuIconEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/MenuIconEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/MessageEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/MessageEntity.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/entity/MessageEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/MessageEntity.java index da85048..d2c5379 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/MessageEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/MessageEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/MessageReceivedEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/MessageReceivedEntity.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/entity/MessageReceivedEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/MessageReceivedEntity.java index e14457c..fbce1b8 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/MessageReceivedEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/MessageReceivedEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/MessageTypeEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/MessageTypeEntity.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/entity/MessageTypeEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/MessageTypeEntity.java index c4fb873..924afcb 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/MessageTypeEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/MessageTypeEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/PermissionEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/PermissionEntity.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/entity/PermissionEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/PermissionEntity.java index 3e65088..44732ac 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/PermissionEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/PermissionEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/RoleEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/RoleEntity.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/RoleEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/RoleEntity.java index fca3ce6..01f7ffe 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/RoleEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/RoleEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/RolePermissionEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/RolePermissionEntity.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/entity/RolePermissionEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/RolePermissionEntity.java index 4774931..a6e081a 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/RolePermissionEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/RolePermissionEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/RouterEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/RouterEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/RouterEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/RouterEntity.java index 18426a2..1864cc7 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/RouterEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/RouterEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/RouterRoleEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/RouterRoleEntity.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/entity/RouterRoleEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/RouterRoleEntity.java index 6b3a691..38ec6cf 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/RouterRoleEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/RouterRoleEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/UserDeptEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/UserDeptEntity.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/entity/UserDeptEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/UserDeptEntity.java index aef437e..205b35a 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/UserDeptEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/UserDeptEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/UserEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/UserEntity.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/entity/UserEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/UserEntity.java index c03f325..ab35280 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/UserEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/UserEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/UserLoginEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/UserLoginEntity.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/entity/UserLoginEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/UserLoginEntity.java index 6fde138..a0f6ed6 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/UserLoginEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/UserLoginEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/UserRoleEntity.java b/spring-security/official/src/main/java/com/spring/official/domain/entity/UserRoleEntity.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/UserRoleEntity.java rename to spring-security/official/src/main/java/com/spring/official/domain/entity/UserRoleEntity.java index cb830e4..370ac4c 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/UserRoleEntity.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/entity/UserRoleEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.official.domain.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/DeptVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/DeptVo.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/vo/DeptVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/DeptVo.java index dafe312..db4c1dd 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/DeptVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/DeptVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/EmailTemplateVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/EmailTemplateVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/EmailTemplateVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/EmailTemplateVo.java index fd82826..dd31d9d 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/EmailTemplateVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/EmailTemplateVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/EmailUsersVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/EmailUsersVo.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/vo/EmailUsersVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/EmailUsersVo.java index e4d6f3f..6f02230 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/EmailUsersVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/EmailUsersVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/FilesPartDetailVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/FilesPartDetailVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/FilesPartDetailVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/FilesPartDetailVo.java index aa02288..930c27f 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/FilesPartDetailVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/FilesPartDetailVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/FilesVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/FilesVo.java similarity index 98% rename from spring-security/official/src/main/java/com/spring/domain/vo/FilesVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/FilesVo.java index 3e8faf6..30d7262 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/FilesVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/FilesVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/I18nTypeVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/I18nTypeVo.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/vo/I18nTypeVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/I18nTypeVo.java index 75ba159..8433cb3 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/I18nTypeVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/I18nTypeVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/I18nVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/I18nVo.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/I18nVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/I18nVo.java index cd4760c..13b397e 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/I18nVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/I18nVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/MenuIconVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/MenuIconVo.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/MenuIconVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/MenuIconVo.java index a5a8def..2199e6f 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/MenuIconVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/MenuIconVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/MessageReceivedVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/MessageReceivedVo.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/vo/MessageReceivedVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/MessageReceivedVo.java index ebbcec2..efabef9 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/MessageReceivedVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/MessageReceivedVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/MessageTypeVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/MessageTypeVo.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/MessageTypeVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/MessageTypeVo.java index 4cb38c0..7049ed3 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/MessageTypeVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/MessageTypeVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/MessageVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/MessageVo.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/vo/MessageVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/MessageVo.java index ebe4f4e..01c5e12 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/MessageVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/MessageVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/PermissionVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/PermissionVo.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/vo/PermissionVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/PermissionVo.java index e468819..f7dff77 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/PermissionVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/PermissionVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/RolePermissionVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/RolePermissionVo.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/vo/RolePermissionVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/RolePermissionVo.java index fd8f610..91cf39d 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/RolePermissionVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/RolePermissionVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/RoleVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/RoleVo.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/RoleVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/RoleVo.java index 0ef40e0..62519d3 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/RoleVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/RoleVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/RouterRoleVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/RouterRoleVo.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/RouterRoleVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/RouterRoleVo.java index 5e29f5e..53fefe4 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/RouterRoleVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/RouterRoleVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/RouterVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/RouterVo.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/vo/RouterVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/RouterVo.java index 50e2db4..d0f497b 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/RouterVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/UserDeptVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/UserDeptVo.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/UserDeptVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/UserDeptVo.java index c1a06e0..b096ba4 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/UserDeptVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/UserDeptVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/UserLoginVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/UserLoginVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/UserLoginVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/UserLoginVo.java index 495f6cc..460a2b7 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/UserLoginVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/UserLoginVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/UserRoleVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/UserRoleVo.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/UserRoleVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/UserRoleVo.java index 543855f..5716779 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/UserRoleVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/UserRoleVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/UserVo.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/UserVo.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/vo/UserVo.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/UserVo.java index ec8eab2..dede401 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/UserVo.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/UserVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.official.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/result/PageResult.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/result/PageResult.java similarity index 94% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/result/PageResult.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/result/PageResult.java index 2a63921..f45eee8 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/result/PageResult.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/result/PageResult.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo.result; +package com.spring.official.domain.vo.result; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/result/Result.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/result/Result.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/result/Result.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/result/Result.java index 546db04..3d78b7f 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/result/Result.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/result/Result.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo.result; +package com.spring.official.domain.vo.result; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/spring-security/step-2/src/main/java/com/spring/bean/vo/result/ResultCodeEnum.java b/spring-security/official/src/main/java/com/spring/official/domain/vo/result/ResultCodeEnum.java similarity index 98% rename from spring-security/step-2/src/main/java/com/spring/bean/vo/result/ResultCodeEnum.java rename to spring-security/official/src/main/java/com/spring/official/domain/vo/result/ResultCodeEnum.java index 7ab3b98..c782b28 100644 --- a/spring-security/step-2/src/main/java/com/spring/bean/vo/result/ResultCodeEnum.java +++ b/spring-security/official/src/main/java/com/spring/official/domain/vo/result/ResultCodeEnum.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo.result; +package com.spring.official.domain.vo.result; import lombok.Getter; diff --git a/spring-security/official/src/main/java/com/spring/mapper/DeptMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/DeptMapper.java similarity index 79% rename from spring-security/official/src/main/java/com/spring/mapper/DeptMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/DeptMapper.java index 8bebd64..0cfbf2b 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/DeptMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/DeptMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.DeptDto; -import com.spring.domain.entity.DeptEntity; -import com.spring.domain.vo.DeptVo; +import com.spring.official.domain.dto.system.DeptDto; +import com.spring.official.domain.entity.DeptEntity; +import com.spring.official.domain.vo.DeptVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/EmailTemplateMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/EmailTemplateMapper.java similarity index 79% rename from spring-security/step-1/src/main/java/com/spring/mapper/EmailTemplateMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/EmailTemplateMapper.java index 398847a..ac1209c 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/EmailTemplateMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/EmailTemplateMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.EmailTemplateDto; -import com.spring.bean.entity.EmailTemplateEntity; -import com.spring.bean.vo.EmailTemplateVo; +import com.spring.official.domain.dto.system.EmailTemplateDto; +import com.spring.official.domain.entity.EmailTemplateEntity; +import com.spring.official.domain.vo.EmailTemplateVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/EmailUsersMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/EmailUsersMapper.java similarity index 79% rename from spring-security/step-1/src/main/java/com/spring/mapper/EmailUsersMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/EmailUsersMapper.java index e58e756..33790a2 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/EmailUsersMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/EmailUsersMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.EmailUsersDto; -import com.spring.bean.entity.EmailUsersEntity; -import com.spring.bean.vo.EmailUsersVo; +import com.spring.official.domain.dto.system.EmailUsersDto; +import com.spring.official.domain.entity.EmailUsersEntity; +import com.spring.official.domain.vo.EmailUsersVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/FilesMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/FilesMapper.java similarity index 79% rename from spring-security/official/src/main/java/com/spring/mapper/FilesMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/FilesMapper.java index b1ee1f9..403d85e 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/FilesMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/FilesMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.FilesDto; -import com.spring.domain.entity.FilesEntity; -import com.spring.domain.vo.FilesVo; +import com.spring.official.domain.dto.system.FilesDto; +import com.spring.official.domain.entity.FilesEntity; +import com.spring.official.domain.vo.FilesVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/FilesPartDetailMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/FilesPartDetailMapper.java similarity index 82% rename from spring-security/step-1/src/main/java/com/spring/mapper/FilesPartDetailMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/FilesPartDetailMapper.java index 46c8993..5f87955 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/FilesPartDetailMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/FilesPartDetailMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.FilesPartDetailDto; -import com.spring.bean.entity.FilesPartDetailEntity; -import com.spring.bean.vo.FilesPartDetailVo; +import com.spring.official.domain.dto.system.FilesPartDetailDto; +import com.spring.official.domain.entity.FilesPartDetailEntity; +import com.spring.official.domain.vo.FilesPartDetailVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/I18nMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/I18nMapper.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/mapper/I18nMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/I18nMapper.java index 3e6c17f..86a0ba1 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/I18nMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/I18nMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.I18nDto; -import com.spring.bean.entity.I18nEntity; -import com.spring.bean.vo.I18nVo; +import com.spring.official.domain.dto.system.I18nDto; +import com.spring.official.domain.entity.I18nEntity; +import com.spring.official.domain.vo.I18nVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/I18nTypeMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/I18nTypeMapper.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/mapper/I18nTypeMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/I18nTypeMapper.java index 70fbb86..595d47c 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/I18nTypeMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/I18nTypeMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.I18nTypeDto; -import com.spring.bean.entity.I18nTypeEntity; -import com.spring.bean.vo.I18nTypeVo; +import com.spring.official.domain.dto.system.I18nTypeDto; +import com.spring.official.domain.entity.I18nTypeEntity; +import com.spring.official.domain.vo.I18nTypeVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/MenuIconMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/MenuIconMapper.java similarity index 80% rename from spring-security/official/src/main/java/com/spring/mapper/MenuIconMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/MenuIconMapper.java index fe4d7be..db7733e 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/MenuIconMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/MenuIconMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.MenuIconDto; -import com.spring.domain.entity.MenuIconEntity; -import com.spring.domain.vo.MenuIconVo; +import com.spring.official.domain.dto.system.MenuIconDto; +import com.spring.official.domain.entity.MenuIconEntity; +import com.spring.official.domain.vo.MenuIconVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/MessageMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/MessageMapper.java similarity index 79% rename from spring-security/official/src/main/java/com/spring/mapper/MessageMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/MessageMapper.java index 309362d..d75aa65 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/MessageMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/MessageMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.MessageDto; -import com.spring.domain.entity.MessageEntity; -import com.spring.domain.vo.MessageVo; +import com.spring.official.domain.dto.system.MessageDto; +import com.spring.official.domain.entity.MessageEntity; +import com.spring.official.domain.vo.MessageVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/MessageReceivedMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/MessageReceivedMapper.java similarity index 77% rename from spring-security/step-1/src/main/java/com/spring/mapper/MessageReceivedMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/MessageReceivedMapper.java index e4f3e71..b1f85d5 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/MessageReceivedMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/MessageReceivedMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.MessageReceivedDto; -import com.spring.bean.entity.MessageReceivedEntity; -import com.spring.bean.vo.MessageReceivedVo; +import com.spring.official.domain.dto.system.MessageReceivedDto; +import com.spring.official.domain.entity.MessageReceivedEntity; +import com.spring.official.domain.vo.MessageReceivedVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/MessageTypeMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/MessageTypeMapper.java similarity index 79% rename from spring-security/step-1/src/main/java/com/spring/mapper/MessageTypeMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/MessageTypeMapper.java index 16c0a56..c0cd7cb 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/MessageTypeMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/MessageTypeMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.MessageTypeDto; -import com.spring.bean.entity.MessageTypeEntity; -import com.spring.bean.vo.MessageTypeVo; +import com.spring.official.domain.dto.system.MessageTypeDto; +import com.spring.official.domain.entity.MessageTypeEntity; +import com.spring.official.domain.vo.MessageTypeVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/PermissionMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/PermissionMapper.java similarity index 79% rename from spring-security/step-1/src/main/java/com/spring/mapper/PermissionMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/PermissionMapper.java index 1b37581..d0094df 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/PermissionMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/PermissionMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.PermissionDto; -import com.spring.bean.entity.PermissionEntity; -import com.spring.bean.vo.PermissionVo; +import com.spring.official.domain.dto.system.PermissionDto; +import com.spring.official.domain.entity.PermissionEntity; +import com.spring.official.domain.vo.PermissionVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/RoleMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/RoleMapper.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/mapper/RoleMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/RoleMapper.java index ac73d9a..64006ca 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/RoleMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/RoleMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.RoleDto; -import com.spring.bean.entity.RoleEntity; -import com.spring.bean.vo.RoleVo; +import com.spring.official.domain.dto.system.RoleDto; +import com.spring.official.domain.entity.RoleEntity; +import com.spring.official.domain.vo.RoleVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/RolePermissionMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/RolePermissionMapper.java similarity index 79% rename from spring-security/step-1/src/main/java/com/spring/mapper/RolePermissionMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/RolePermissionMapper.java index 3bb18e9..e3ebae0 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/RolePermissionMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/RolePermissionMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.RolePermissionDto; -import com.spring.bean.entity.RolePermissionEntity; -import com.spring.bean.vo.RolePermissionVo; +import com.spring.official.domain.dto.system.RolePermissionDto; +import com.spring.official.domain.entity.RolePermissionEntity; +import com.spring.official.domain.vo.RolePermissionVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/RouterMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/RouterMapper.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/mapper/RouterMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/RouterMapper.java index c8a0011..70faa6b 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/RouterMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/RouterMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.RouterDto; -import com.spring.bean.entity.RouterEntity; -import com.spring.bean.vo.RouterVo; +import com.spring.official.domain.dto.system.RouterDto; +import com.spring.official.domain.entity.RouterEntity; +import com.spring.official.domain.vo.RouterVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/RouterRoleMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/RouterRoleMapper.java similarity index 80% rename from spring-security/official/src/main/java/com/spring/mapper/RouterRoleMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/RouterRoleMapper.java index 35a1d6e..3a8fa03 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/RouterRoleMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/RouterRoleMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.RouterRoleDto; -import com.spring.domain.entity.RouterRoleEntity; -import com.spring.domain.vo.RouterRoleVo; +import com.spring.official.domain.dto.system.RouterRoleDto; +import com.spring.official.domain.entity.RouterRoleEntity; +import com.spring.official.domain.vo.RouterRoleVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/UserDeptMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/UserDeptMapper.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/mapper/UserDeptMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/UserDeptMapper.java index f5e243e..bfd4dcb 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/UserDeptMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/UserDeptMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.UserDeptDto; -import com.spring.bean.entity.UserDeptEntity; -import com.spring.bean.vo.UserDeptVo; +import com.spring.official.domain.dto.system.UserDeptDto; +import com.spring.official.domain.entity.UserDeptEntity; +import com.spring.official.domain.vo.UserDeptVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/UserLoginMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/UserLoginMapper.java similarity index 79% rename from spring-security/step-1/src/main/java/com/spring/mapper/UserLoginMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/UserLoginMapper.java index 8b1202f..29214c7 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/UserLoginMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/UserLoginMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.UserLoginDto; -import com.spring.bean.entity.UserLoginEntity; -import com.spring.bean.vo.UserLoginVo; +import com.spring.official.domain.dto.system.UserLoginDto; +import com.spring.official.domain.entity.UserLoginEntity; +import com.spring.official.domain.vo.UserLoginVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/UserMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/UserMapper.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/mapper/UserMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/UserMapper.java index e6bdbd1..11a2dcb 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/UserMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/UserMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.UserDto; -import com.spring.bean.entity.UserEntity; -import com.spring.bean.vo.UserVo; +import com.spring.official.domain.dto.system.UserDto; +import com.spring.official.domain.entity.UserEntity; +import com.spring.official.domain.vo.UserVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/UserRoleMapper.java b/spring-security/official/src/main/java/com/spring/official/mapper/UserRoleMapper.java similarity index 80% rename from spring-security/official/src/main/java/com/spring/mapper/UserRoleMapper.java rename to spring-security/official/src/main/java/com/spring/official/mapper/UserRoleMapper.java index 184b03b..d68412a 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/UserRoleMapper.java +++ b/spring-security/official/src/main/java/com/spring/official/mapper/UserRoleMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.official.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.UserRoleDto; -import com.spring.domain.entity.UserRoleEntity; -import com.spring.domain.vo.UserRoleVo; +import com.spring.official.domain.dto.system.UserRoleDto; +import com.spring.official.domain.entity.UserRoleEntity; +import com.spring.official.domain.vo.UserRoleVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/service/impl/LoginServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/impl/LoginServiceImpl.java similarity index 64% rename from spring-security/step-1/src/main/java/com/spring/service/impl/LoginServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/impl/LoginServiceImpl.java index c7c96e7..b5d451a 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/impl/LoginServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/impl/LoginServiceImpl.java @@ -1,6 +1,6 @@ -package com.spring.service.impl; +package com.spring.official.service.impl; -import com.spring.service.security.LoginService; +import com.spring.official.service.security.LoginService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/spring-security/official/src/main/java/com/spring/official/service/security/LoginService.java b/spring-security/official/src/main/java/com/spring/official/service/security/LoginService.java new file mode 100644 index 0000000..e9fa5d2 --- /dev/null +++ b/spring-security/official/src/main/java/com/spring/official/service/security/LoginService.java @@ -0,0 +1,4 @@ +package com.spring.official.service.security; + +public interface LoginService { +} diff --git a/spring-security/official/src/main/java/com/spring/service/system/DeptService.java b/spring-security/official/src/main/java/com/spring/official/service/system/DeptService.java similarity index 77% rename from spring-security/official/src/main/java/com/spring/service/system/DeptService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/DeptService.java index 5f29aae..9ab1dba 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/DeptService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/DeptService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.DeptDto; -import com.spring.domain.entity.DeptEntity; -import com.spring.domain.vo.DeptVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.official.domain.dto.system.DeptDto; +import com.spring.official.domain.entity.DeptEntity; +import com.spring.official.domain.vo.DeptVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/EmailTemplateService.java b/spring-security/official/src/main/java/com/spring/official/service/system/EmailTemplateService.java similarity index 78% rename from spring-security/step-1/src/main/java/com/spring/service/sample/EmailTemplateService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/EmailTemplateService.java index 409a960..75dfdbf 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/EmailTemplateService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/EmailTemplateService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.EmailTemplateDto; -import com.spring.bean.entity.EmailTemplateEntity; -import com.spring.bean.vo.EmailTemplateVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.official.domain.dto.system.EmailTemplateDto; +import com.spring.official.domain.entity.EmailTemplateEntity; +import com.spring.official.domain.vo.EmailTemplateVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/EmailUsersService.java b/spring-security/official/src/main/java/com/spring/official/service/system/EmailUsersService.java similarity index 78% rename from spring-security/step-1/src/main/java/com/spring/service/sample/EmailUsersService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/EmailUsersService.java index 5b39286..aeebcdf 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/EmailUsersService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/EmailUsersService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.EmailUsersDto; -import com.spring.bean.entity.EmailUsersEntity; -import com.spring.bean.vo.EmailUsersVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.official.domain.dto.system.EmailUsersDto; +import com.spring.official.domain.entity.EmailUsersEntity; +import com.spring.official.domain.vo.EmailUsersVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/FilesPartDetailService.java b/spring-security/official/src/main/java/com/spring/official/service/system/FilesPartDetailService.java similarity index 81% rename from spring-security/official/src/main/java/com/spring/service/system/FilesPartDetailService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/FilesPartDetailService.java index dfa83a1..7f4868e 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/FilesPartDetailService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/FilesPartDetailService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.FilesPartDetailDto; -import com.spring.domain.entity.FilesPartDetailEntity; -import com.spring.domain.vo.FilesPartDetailVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.official.domain.dto.system.FilesPartDetailDto; +import com.spring.official.domain.entity.FilesPartDetailEntity; +import com.spring.official.domain.vo.FilesPartDetailVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/FilesService.java b/spring-security/official/src/main/java/com/spring/official/service/system/FilesService.java similarity index 77% rename from spring-security/official/src/main/java/com/spring/service/system/FilesService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/FilesService.java index 8ab8193..89975aa 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/FilesService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/FilesService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.FilesDto; -import com.spring.domain.entity.FilesEntity; -import com.spring.domain.vo.FilesVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.official.domain.dto.system.FilesDto; +import com.spring.official.domain.entity.FilesEntity; +import com.spring.official.domain.vo.FilesVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/I18nService.java b/spring-security/official/src/main/java/com/spring/official/service/system/I18nService.java similarity index 77% rename from spring-security/step-1/src/main/java/com/spring/service/sample/I18nService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/I18nService.java index d7c88eb..5bcc3b8 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/I18nService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/I18nService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.I18nDto; -import com.spring.bean.entity.I18nEntity; -import com.spring.bean.vo.I18nVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.official.domain.dto.system.I18nDto; +import com.spring.official.domain.entity.I18nEntity; +import com.spring.official.domain.vo.I18nVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/I18nTypeService.java b/spring-security/official/src/main/java/com/spring/official/service/system/I18nTypeService.java similarity index 78% rename from spring-security/step-1/src/main/java/com/spring/service/sample/I18nTypeService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/I18nTypeService.java index 4f46a5c..ad59be7 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/I18nTypeService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/I18nTypeService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.I18nTypeDto; -import com.spring.bean.entity.I18nTypeEntity; -import com.spring.bean.vo.I18nTypeVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.official.domain.dto.system.I18nTypeDto; +import com.spring.official.domain.entity.I18nTypeEntity; +import com.spring.official.domain.vo.I18nTypeVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/MenuIconService.java b/spring-security/official/src/main/java/com/spring/official/service/system/MenuIconService.java similarity index 78% rename from spring-security/official/src/main/java/com/spring/service/system/MenuIconService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/MenuIconService.java index 1f89acb..003ec71 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/MenuIconService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/MenuIconService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.MenuIconDto; -import com.spring.domain.entity.MenuIconEntity; -import com.spring.domain.vo.MenuIconVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.official.domain.dto.system.MenuIconDto; +import com.spring.official.domain.entity.MenuIconEntity; +import com.spring.official.domain.vo.MenuIconVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/MessageReceivedService.java b/spring-security/official/src/main/java/com/spring/official/service/system/MessageReceivedService.java similarity index 77% rename from spring-security/step-1/src/main/java/com/spring/service/sample/MessageReceivedService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/MessageReceivedService.java index 2b05b5c..39668ec 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/MessageReceivedService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/MessageReceivedService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.MessageReceivedDto; -import com.spring.bean.entity.MessageReceivedEntity; -import com.spring.bean.vo.MessageReceivedVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.official.domain.dto.system.MessageReceivedDto; +import com.spring.official.domain.entity.MessageReceivedEntity; +import com.spring.official.domain.vo.MessageReceivedVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/MessageService.java b/spring-security/official/src/main/java/com/spring/official/service/system/MessageService.java similarity index 77% rename from spring-security/official/src/main/java/com/spring/service/system/MessageService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/MessageService.java index 2b24179..5fae79e 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/MessageService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/MessageService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.MessageDto; -import com.spring.domain.entity.MessageEntity; -import com.spring.domain.vo.MessageVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.official.domain.dto.system.MessageDto; +import com.spring.official.domain.entity.MessageEntity; +import com.spring.official.domain.vo.MessageVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/MessageTypeService.java b/spring-security/official/src/main/java/com/spring/official/service/system/MessageTypeService.java similarity index 78% rename from spring-security/step-1/src/main/java/com/spring/service/sample/MessageTypeService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/MessageTypeService.java index 97f8c6a..f1c33d6 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/MessageTypeService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/MessageTypeService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.MessageTypeDto; -import com.spring.bean.entity.MessageTypeEntity; -import com.spring.bean.vo.MessageTypeVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.official.domain.dto.system.MessageTypeDto; +import com.spring.official.domain.entity.MessageTypeEntity; +import com.spring.official.domain.vo.MessageTypeVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/PermissionService.java b/spring-security/official/src/main/java/com/spring/official/service/system/PermissionService.java similarity index 78% rename from spring-security/step-1/src/main/java/com/spring/service/sample/PermissionService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/PermissionService.java index 150e00d..3af7a21 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/PermissionService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/PermissionService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.PermissionDto; -import com.spring.bean.entity.PermissionEntity; -import com.spring.bean.vo.PermissionVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.official.domain.dto.system.PermissionDto; +import com.spring.official.domain.entity.PermissionEntity; +import com.spring.official.domain.vo.PermissionVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/RolePermissionService.java b/spring-security/official/src/main/java/com/spring/official/service/system/RolePermissionService.java similarity index 79% rename from spring-security/step-1/src/main/java/com/spring/service/sample/RolePermissionService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/RolePermissionService.java index b4ef6b4..3e1ecc3 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/RolePermissionService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/RolePermissionService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.RolePermissionDto; -import com.spring.bean.entity.RolePermissionEntity; -import com.spring.bean.vo.RolePermissionVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.official.domain.dto.system.RolePermissionDto; +import com.spring.official.domain.entity.RolePermissionEntity; +import com.spring.official.domain.vo.RolePermissionVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/RoleService.java b/spring-security/official/src/main/java/com/spring/official/service/system/RoleService.java similarity index 77% rename from spring-security/official/src/main/java/com/spring/service/system/RoleService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/RoleService.java index 2c8fb2d..e96c56d 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/RoleService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/RoleService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.RoleDto; -import com.spring.domain.entity.RoleEntity; -import com.spring.domain.vo.RoleVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.official.domain.dto.system.RoleDto; +import com.spring.official.domain.entity.RoleEntity; +import com.spring.official.domain.vo.RoleVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/RouterRoleService.java b/spring-security/official/src/main/java/com/spring/official/service/system/RouterRoleService.java similarity index 79% rename from spring-security/official/src/main/java/com/spring/service/system/RouterRoleService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/RouterRoleService.java index 605eec6..563b010 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/RouterRoleService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/RouterRoleService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.RouterRoleDto; -import com.spring.domain.entity.RouterRoleEntity; -import com.spring.domain.vo.RouterRoleVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.official.domain.dto.system.RouterRoleDto; +import com.spring.official.domain.entity.RouterRoleEntity; +import com.spring.official.domain.vo.RouterRoleVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/RouterService.java b/spring-security/official/src/main/java/com/spring/official/service/system/RouterService.java similarity index 78% rename from spring-security/step-1/src/main/java/com/spring/service/sample/RouterService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/RouterService.java index cfb33b5..1b5f797 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/RouterService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/RouterService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.RouterDto; -import com.spring.bean.entity.RouterEntity; -import com.spring.bean.vo.RouterVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.official.domain.dto.system.RouterDto; +import com.spring.official.domain.entity.RouterEntity; +import com.spring.official.domain.vo.RouterVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/UserDeptService.java b/spring-security/official/src/main/java/com/spring/official/service/system/UserDeptService.java similarity index 78% rename from spring-security/step-1/src/main/java/com/spring/service/sample/UserDeptService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/UserDeptService.java index ac40cc9..6e75a9f 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/UserDeptService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/UserDeptService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.UserDeptDto; -import com.spring.bean.entity.UserDeptEntity; -import com.spring.bean.vo.UserDeptVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.official.domain.dto.system.UserDeptDto; +import com.spring.official.domain.entity.UserDeptEntity; +import com.spring.official.domain.vo.UserDeptVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/UserLoginService.java b/spring-security/official/src/main/java/com/spring/official/service/system/UserLoginService.java similarity index 78% rename from spring-security/step-1/src/main/java/com/spring/service/sample/UserLoginService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/UserLoginService.java index 08bd270..beb0bbe 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/UserLoginService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/UserLoginService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.UserLoginDto; -import com.spring.bean.entity.UserLoginEntity; -import com.spring.bean.vo.UserLoginVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.official.domain.dto.system.UserLoginDto; +import com.spring.official.domain.entity.UserLoginEntity; +import com.spring.official.domain.vo.UserLoginVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/UserRoleService.java b/spring-security/official/src/main/java/com/spring/official/service/system/UserRoleService.java similarity index 79% rename from spring-security/official/src/main/java/com/spring/service/system/UserRoleService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/UserRoleService.java index 2cfdd13..fc1775b 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/UserRoleService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/UserRoleService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.UserRoleDto; -import com.spring.domain.entity.UserRoleEntity; -import com.spring.domain.vo.UserRoleVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.official.domain.dto.system.UserRoleDto; +import com.spring.official.domain.entity.UserRoleEntity; +import com.spring.official.domain.vo.UserRoleVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/UserService.java b/spring-security/official/src/main/java/com/spring/official/service/system/UserService.java similarity index 77% rename from spring-security/step-1/src/main/java/com/spring/service/sample/UserService.java rename to spring-security/official/src/main/java/com/spring/official/service/system/UserService.java index 1df6744..0a70e30 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/UserService.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/UserService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.official.service.system; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.UserDto; -import com.spring.bean.entity.UserEntity; -import com.spring.bean.vo.UserVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.official.domain.dto.system.UserDto; +import com.spring.official.domain.entity.UserEntity; +import com.spring.official.domain.vo.UserVo; +import com.spring.official.domain.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/DeptServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/DeptServiceImpl.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/DeptServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/DeptServiceImpl.java index cf4361c..341a09e 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/DeptServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/DeptServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.official.service.system.impl; 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.spring.bean.dto.system.DeptDto; -import com.spring.bean.entity.DeptEntity; -import com.spring.bean.vo.DeptVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.DeptMapper; -import com.spring.service.sample.DeptService; +import com.spring.official.domain.dto.system.DeptDto; +import com.spring.official.domain.entity.DeptEntity; +import com.spring.official.domain.vo.DeptVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.DeptMapper; +import com.spring.official.service.system.DeptService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/EmailTemplateServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/EmailTemplateServiceImpl.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/service/system/impl/EmailTemplateServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/EmailTemplateServiceImpl.java index 0a92977..5f0a9c5 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/EmailTemplateServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/EmailTemplateServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.official.service.system.impl; 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.spring.domain.dto.system.EmailTemplateDto; -import com.spring.domain.entity.EmailTemplateEntity; -import com.spring.domain.vo.EmailTemplateVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.EmailTemplateMapper; -import com.spring.service.system.EmailTemplateService; +import com.spring.official.domain.dto.system.EmailTemplateDto; +import com.spring.official.domain.entity.EmailTemplateEntity; +import com.spring.official.domain.vo.EmailTemplateVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.EmailTemplateMapper; +import com.spring.official.service.system.EmailTemplateService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/EmailUsersServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/EmailUsersServiceImpl.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/EmailUsersServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/EmailUsersServiceImpl.java index a48d1c0..5a02306 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/EmailUsersServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/EmailUsersServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.official.service.system.impl; 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.spring.bean.dto.system.EmailUsersDto; -import com.spring.bean.entity.EmailUsersEntity; -import com.spring.bean.vo.EmailUsersVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.EmailUsersMapper; -import com.spring.service.sample.EmailUsersService; +import com.spring.official.domain.dto.system.EmailUsersDto; +import com.spring.official.domain.entity.EmailUsersEntity; +import com.spring.official.domain.vo.EmailUsersVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.EmailUsersMapper; +import com.spring.official.service.system.EmailUsersService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/FilesPartDetailServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/FilesPartDetailServiceImpl.java similarity index 86% rename from spring-security/official/src/main/java/com/spring/service/system/impl/FilesPartDetailServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/FilesPartDetailServiceImpl.java index 382b348..eeb213a 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/FilesPartDetailServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/FilesPartDetailServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.official.service.system.impl; 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.spring.domain.dto.system.FilesPartDetailDto; -import com.spring.domain.entity.FilesPartDetailEntity; -import com.spring.domain.vo.FilesPartDetailVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.FilesPartDetailMapper; -import com.spring.service.system.FilesPartDetailService; +import com.spring.official.domain.dto.system.FilesPartDetailDto; +import com.spring.official.domain.entity.FilesPartDetailEntity; +import com.spring.official.domain.vo.FilesPartDetailVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.FilesPartDetailMapper; +import com.spring.official.service.system.FilesPartDetailService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/FilesServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/FilesServiceImpl.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/service/system/impl/FilesServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/FilesServiceImpl.java index 2818d3d..eea0476 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/FilesServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/FilesServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.official.service.system.impl; 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.spring.domain.dto.system.FilesDto; -import com.spring.domain.entity.FilesEntity; -import com.spring.domain.vo.FilesVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.FilesMapper; -import com.spring.service.system.FilesService; +import com.spring.official.domain.dto.system.FilesDto; +import com.spring.official.domain.entity.FilesEntity; +import com.spring.official.domain.vo.FilesVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.FilesMapper; +import com.spring.official.service.system.FilesService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/I18nServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/I18nServiceImpl.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/service/system/impl/I18nServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/I18nServiceImpl.java index 14a6095..bfdcd93 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/I18nServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/I18nServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.official.service.system.impl; 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.spring.domain.dto.system.I18nDto; -import com.spring.domain.entity.I18nEntity; -import com.spring.domain.vo.I18nVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.I18nMapper; -import com.spring.service.system.I18nService; +import com.spring.official.domain.dto.system.I18nDto; +import com.spring.official.domain.entity.I18nEntity; +import com.spring.official.domain.vo.I18nVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.I18nMapper; +import com.spring.official.service.system.I18nService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/I18nTypeServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/I18nTypeServiceImpl.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/I18nTypeServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/I18nTypeServiceImpl.java index 0f2f9a5..c8de5ed 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/I18nTypeServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/I18nTypeServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.official.service.system.impl; 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.spring.bean.dto.system.I18nTypeDto; -import com.spring.bean.entity.I18nTypeEntity; -import com.spring.bean.vo.I18nTypeVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.I18nTypeMapper; -import com.spring.service.sample.I18nTypeService; +import com.spring.official.domain.dto.system.I18nTypeDto; +import com.spring.official.domain.entity.I18nTypeEntity; +import com.spring.official.domain.vo.I18nTypeVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.I18nTypeMapper; +import com.spring.official.service.system.I18nTypeService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MenuIconServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/MenuIconServiceImpl.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/MenuIconServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/MenuIconServiceImpl.java index a7005ad..71d8a6a 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MenuIconServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/MenuIconServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.official.service.system.impl; 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.spring.bean.dto.system.MenuIconDto; -import com.spring.bean.entity.MenuIconEntity; -import com.spring.bean.vo.MenuIconVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.MenuIconMapper; -import com.spring.service.sample.MenuIconService; +import com.spring.official.domain.dto.system.MenuIconDto; +import com.spring.official.domain.entity.MenuIconEntity; +import com.spring.official.domain.vo.MenuIconVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.MenuIconMapper; +import com.spring.official.service.system.MenuIconService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageReceivedServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/MessageReceivedServiceImpl.java similarity index 83% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageReceivedServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/MessageReceivedServiceImpl.java index 02a77f4..40f9d80 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageReceivedServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/MessageReceivedServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.official.service.system.impl; 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.spring.bean.dto.system.MessageReceivedDto; -import com.spring.bean.entity.MessageReceivedEntity; -import com.spring.bean.vo.MessageReceivedVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.MessageReceivedMapper; -import com.spring.service.sample.MessageReceivedService; +import com.spring.official.domain.dto.system.MessageReceivedDto; +import com.spring.official.domain.entity.MessageReceivedEntity; +import com.spring.official.domain.vo.MessageReceivedVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.MessageReceivedMapper; +import com.spring.official.service.system.MessageReceivedService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/MessageServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/MessageServiceImpl.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/service/system/impl/MessageServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/MessageServiceImpl.java index 2c2fd56..6bd57b5 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/MessageServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/MessageServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.official.service.system.impl; 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.spring.domain.dto.system.MessageDto; -import com.spring.domain.entity.MessageEntity; -import com.spring.domain.vo.MessageVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.MessageMapper; -import com.spring.service.system.MessageService; +import com.spring.official.domain.dto.system.MessageDto; +import com.spring.official.domain.entity.MessageEntity; +import com.spring.official.domain.vo.MessageVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.MessageMapper; +import com.spring.official.service.system.MessageService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/MessageTypeServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/MessageTypeServiceImpl.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/service/system/impl/MessageTypeServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/MessageTypeServiceImpl.java index 03e7617..fdb5cbf 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/MessageTypeServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/MessageTypeServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.official.service.system.impl; 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.spring.domain.dto.system.MessageTypeDto; -import com.spring.domain.entity.MessageTypeEntity; -import com.spring.domain.vo.MessageTypeVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.MessageTypeMapper; -import com.spring.service.system.MessageTypeService; +import com.spring.official.domain.dto.system.MessageTypeDto; +import com.spring.official.domain.entity.MessageTypeEntity; +import com.spring.official.domain.vo.MessageTypeVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.MessageTypeMapper; +import com.spring.official.service.system.MessageTypeService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/PermissionServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/PermissionServiceImpl.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/PermissionServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/PermissionServiceImpl.java index 7f9eba8..35f4896 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/PermissionServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/PermissionServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.official.service.system.impl; 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.spring.bean.dto.system.PermissionDto; -import com.spring.bean.entity.PermissionEntity; -import com.spring.bean.vo.PermissionVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.PermissionMapper; -import com.spring.service.sample.PermissionService; +import com.spring.official.domain.dto.system.PermissionDto; +import com.spring.official.domain.entity.PermissionEntity; +import com.spring.official.domain.vo.PermissionVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.PermissionMapper; +import com.spring.official.service.system.PermissionService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/RolePermissionServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/RolePermissionServiceImpl.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/service/system/impl/RolePermissionServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/RolePermissionServiceImpl.java index a38c90d..02dc0b1 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/RolePermissionServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/RolePermissionServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.official.service.system.impl; 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.spring.domain.dto.system.RolePermissionDto; -import com.spring.domain.entity.RolePermissionEntity; -import com.spring.domain.vo.RolePermissionVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.RolePermissionMapper; -import com.spring.service.system.RolePermissionService; +import com.spring.official.domain.dto.system.RolePermissionDto; +import com.spring.official.domain.entity.RolePermissionEntity; +import com.spring.official.domain.vo.RolePermissionVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.RolePermissionMapper; +import com.spring.official.service.system.RolePermissionService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/RoleServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/RoleServiceImpl.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/service/system/impl/RoleServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/RoleServiceImpl.java index f340e9b..40375d0 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/RoleServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/RoleServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.official.service.system.impl; 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.spring.domain.dto.system.RoleDto; -import com.spring.domain.entity.RoleEntity; -import com.spring.domain.vo.RoleVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.RoleMapper; -import com.spring.service.system.RoleService; +import com.spring.official.domain.dto.system.RoleDto; +import com.spring.official.domain.entity.RoleEntity; +import com.spring.official.domain.vo.RoleVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.RoleMapper; +import com.spring.official.service.system.RoleService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/RouterRoleServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/RouterRoleServiceImpl.java similarity index 85% rename from spring-security/official/src/main/java/com/spring/service/system/impl/RouterRoleServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/RouterRoleServiceImpl.java index 36b2257..307fc3b 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/RouterRoleServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/RouterRoleServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.official.service.system.impl; 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.spring.domain.dto.system.RouterRoleDto; -import com.spring.domain.entity.RouterRoleEntity; -import com.spring.domain.vo.RouterRoleVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.RouterRoleMapper; -import com.spring.service.system.RouterRoleService; +import com.spring.official.domain.dto.system.RouterRoleDto; +import com.spring.official.domain.entity.RouterRoleEntity; +import com.spring.official.domain.vo.RouterRoleVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.RouterRoleMapper; +import com.spring.official.service.system.RouterRoleService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RouterServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/RouterServiceImpl.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/RouterServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/RouterServiceImpl.java index a36025d..3699512 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RouterServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/RouterServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.official.service.system.impl; 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.spring.bean.dto.system.RouterDto; -import com.spring.bean.entity.RouterEntity; -import com.spring.bean.vo.RouterVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.RouterMapper; -import com.spring.service.sample.RouterService; +import com.spring.official.domain.dto.system.RouterDto; +import com.spring.official.domain.entity.RouterEntity; +import com.spring.official.domain.vo.RouterVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.RouterMapper; +import com.spring.official.service.system.RouterService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserDeptServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/UserDeptServiceImpl.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserDeptServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/UserDeptServiceImpl.java index 69cbcc9..2f3fb51 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserDeptServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/UserDeptServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.official.service.system.impl; 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.spring.bean.dto.system.UserDeptDto; -import com.spring.bean.entity.UserDeptEntity; -import com.spring.bean.vo.UserDeptVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.UserDeptMapper; -import com.spring.service.sample.UserDeptService; +import com.spring.official.domain.dto.system.UserDeptDto; +import com.spring.official.domain.entity.UserDeptEntity; +import com.spring.official.domain.vo.UserDeptVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.UserDeptMapper; +import com.spring.official.service.system.UserDeptService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserLoginServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/UserLoginServiceImpl.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserLoginServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/UserLoginServiceImpl.java index dda43e0..9c3ba35 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserLoginServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/UserLoginServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.official.service.system.impl; 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.spring.bean.dto.system.UserLoginDto; -import com.spring.bean.entity.UserLoginEntity; -import com.spring.bean.vo.UserLoginVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.UserLoginMapper; -import com.spring.service.sample.UserLoginService; +import com.spring.official.domain.dto.system.UserLoginDto; +import com.spring.official.domain.entity.UserLoginEntity; +import com.spring.official.domain.vo.UserLoginVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.UserLoginMapper; +import com.spring.official.service.system.UserLoginService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/UserRoleServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/UserRoleServiceImpl.java similarity index 85% rename from spring-security/official/src/main/java/com/spring/service/system/impl/UserRoleServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/UserRoleServiceImpl.java index b8207ce..d73d8c7 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/UserRoleServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/UserRoleServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.official.service.system.impl; 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.spring.domain.dto.system.UserRoleDto; -import com.spring.domain.entity.UserRoleEntity; -import com.spring.domain.vo.UserRoleVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.UserRoleMapper; -import com.spring.service.system.UserRoleService; +import com.spring.official.domain.dto.system.UserRoleDto; +import com.spring.official.domain.entity.UserRoleEntity; +import com.spring.official.domain.vo.UserRoleVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.UserRoleMapper; +import com.spring.official.service.system.UserRoleService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/UserServiceImpl.java b/spring-security/official/src/main/java/com/spring/official/service/system/impl/UserServiceImpl.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/service/system/impl/UserServiceImpl.java rename to spring-security/official/src/main/java/com/spring/official/service/system/impl/UserServiceImpl.java index 5e52064..5da64ec 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/UserServiceImpl.java +++ b/spring-security/official/src/main/java/com/spring/official/service/system/impl/UserServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.official.service.system.impl; 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.spring.domain.dto.system.UserDto; -import com.spring.domain.entity.UserEntity; -import com.spring.domain.vo.UserVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.UserMapper; -import com.spring.service.system.UserService; +import com.spring.official.domain.dto.system.UserDto; +import com.spring.official.domain.entity.UserEntity; +import com.spring.official.domain.vo.UserVo; +import com.spring.official.domain.vo.result.PageResult; +import com.spring.official.mapper.UserMapper; +import com.spring.official.service.system.UserService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/security/LoginService.java b/spring-security/official/src/main/java/com/spring/service/security/LoginService.java deleted file mode 100644 index e01b9dc..0000000 --- a/spring-security/official/src/main/java/com/spring/service/security/LoginService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.spring.service.security; - -public interface LoginService { -} diff --git a/spring-security/official/src/main/resources/mapper/DeptMapper.xml b/spring-security/official/src/main/resources/mapper/DeptMapper.xml index ab3f3c5..40c3e0e 100644 --- a/spring-security/official/src/main/resources/mapper/DeptMapper.xml +++ b/spring-security/official/src/main/resources/mapper/DeptMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -22,7 +22,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/EmailTemplateMapper.xml b/spring-security/official/src/main/resources/mapper/EmailTemplateMapper.xml index 905e486..e3576eb 100644 --- a/spring-security/official/src/main/resources/mapper/EmailTemplateMapper.xml +++ b/spring-security/official/src/main/resources/mapper/EmailTemplateMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -24,7 +24,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/EmailUsersMapper.xml b/spring-security/official/src/main/resources/mapper/EmailUsersMapper.xml index b04c917..6805681 100644 --- a/spring-security/official/src/main/resources/mapper/EmailUsersMapper.xml +++ b/spring-security/official/src/main/resources/mapper/EmailUsersMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -25,7 +25,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/FilesMapper.xml b/spring-security/official/src/main/resources/mapper/FilesMapper.xml index b17e6d5..013337f 100644 --- a/spring-security/official/src/main/resources/mapper/FilesMapper.xml +++ b/spring-security/official/src/main/resources/mapper/FilesMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -45,7 +45,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/FilesPartDetailMapper.xml b/spring-security/official/src/main/resources/mapper/FilesPartDetailMapper.xml index 53a6c78..06e7968 100644 --- a/spring-security/official/src/main/resources/mapper/FilesPartDetailMapper.xml +++ b/spring-security/official/src/main/resources/mapper/FilesPartDetailMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -24,7 +24,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/I18nMapper.xml b/spring-security/official/src/main/resources/mapper/I18nMapper.xml index 2282d4a..4e9f4a0 100644 --- a/spring-security/official/src/main/resources/mapper/I18nMapper.xml +++ b/spring-security/official/src/main/resources/mapper/I18nMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -21,7 +21,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/I18nTypeMapper.xml b/spring-security/official/src/main/resources/mapper/I18nTypeMapper.xml index 1ea80f3..e332f3a 100644 --- a/spring-security/official/src/main/resources/mapper/I18nTypeMapper.xml +++ b/spring-security/official/src/main/resources/mapper/I18nTypeMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -21,7 +21,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/MenuIconMapper.xml b/spring-security/official/src/main/resources/mapper/MenuIconMapper.xml index b2466bf..8ffc7c6 100644 --- a/spring-security/official/src/main/resources/mapper/MenuIconMapper.xml +++ b/spring-security/official/src/main/resources/mapper/MenuIconMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/MessageMapper.xml b/spring-security/official/src/main/resources/mapper/MessageMapper.xml index 6e19592..5a01784 100644 --- a/spring-security/official/src/main/resources/mapper/MessageMapper.xml +++ b/spring-security/official/src/main/resources/mapper/MessageMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -27,7 +27,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/MessageReceivedMapper.xml b/spring-security/official/src/main/resources/mapper/MessageReceivedMapper.xml index e28ffce..0a03418 100644 --- a/spring-security/official/src/main/resources/mapper/MessageReceivedMapper.xml +++ b/spring-security/official/src/main/resources/mapper/MessageReceivedMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -21,7 +21,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/MessageTypeMapper.xml b/spring-security/official/src/main/resources/mapper/MessageTypeMapper.xml index f97556c..185d74b 100644 --- a/spring-security/official/src/main/resources/mapper/MessageTypeMapper.xml +++ b/spring-security/official/src/main/resources/mapper/MessageTypeMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -22,7 +22,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/PermissionMapper.xml b/spring-security/official/src/main/resources/mapper/PermissionMapper.xml index a75e585..c8c3653 100644 --- a/spring-security/official/src/main/resources/mapper/PermissionMapper.xml +++ b/spring-security/official/src/main/resources/mapper/PermissionMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -23,7 +23,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/RoleMapper.xml b/spring-security/official/src/main/resources/mapper/RoleMapper.xml index 246e5e0..9349c30 100644 --- a/spring-security/official/src/main/resources/mapper/RoleMapper.xml +++ b/spring-security/official/src/main/resources/mapper/RoleMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/RolePermissionMapper.xml b/spring-security/official/src/main/resources/mapper/RolePermissionMapper.xml index 9a557b7..db6d439 100644 --- a/spring-security/official/src/main/resources/mapper/RolePermissionMapper.xml +++ b/spring-security/official/src/main/resources/mapper/RolePermissionMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/RouterMapper.xml b/spring-security/official/src/main/resources/mapper/RouterMapper.xml index 024cb00..9d88a17 100644 --- a/spring-security/official/src/main/resources/mapper/RouterMapper.xml +++ b/spring-security/official/src/main/resources/mapper/RouterMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -25,7 +25,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/RouterRoleMapper.xml b/spring-security/official/src/main/resources/mapper/RouterRoleMapper.xml index 9433d76..bc696f4 100644 --- a/spring-security/official/src/main/resources/mapper/RouterRoleMapper.xml +++ b/spring-security/official/src/main/resources/mapper/RouterRoleMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/UserDeptMapper.xml b/spring-security/official/src/main/resources/mapper/UserDeptMapper.xml index 3f3d06e..c787205 100644 --- a/spring-security/official/src/main/resources/mapper/UserDeptMapper.xml +++ b/spring-security/official/src/main/resources/mapper/UserDeptMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/UserLoginMapper.xml b/spring-security/official/src/main/resources/mapper/UserLoginMapper.xml index a8d12f2..54a5337 100644 --- a/spring-security/official/src/main/resources/mapper/UserLoginMapper.xml +++ b/spring-security/official/src/main/resources/mapper/UserLoginMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -26,7 +26,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/UserMapper.xml b/spring-security/official/src/main/resources/mapper/UserMapper.xml index f4412a5..4fd3338 100644 --- a/spring-security/official/src/main/resources/mapper/UserMapper.xml +++ b/spring-security/official/src/main/resources/mapper/UserMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -29,7 +29,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/official/src/main/resources/mapper/UserRoleMapper.xml b/spring-security/official/src/main/resources/mapper/UserRoleMapper.xml index 8152079..adc4998 100644 --- a/spring-security/official/src/main/resources/mapper/UserRoleMapper.xml +++ b/spring-security/official/src/main/resources/mapper/UserRoleMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, diff --git a/spring-security/pom.xml b/spring-security/pom.xml index e843813..d179a78 100644 --- a/spring-security/pom.xml +++ b/spring-security/pom.xml @@ -31,6 +31,7 @@ 9.2.0 6.2.1 3.5.6 + 4.3.1 4.5.0 5.15.4 5.1.3 @@ -74,6 +75,11 @@ mybatis-plus-spring-boot3-starter ${mybatis-plus.version} + + com.baomidou + dynamic-datasource-spring-boot3-starter + ${dynamic-datasource.version} + com.mysql mysql-connector-j diff --git a/spring-security/step-1/src/main/java/com/spring/service/security/LoginService.java b/spring-security/step-1/src/main/java/com/spring/service/security/LoginService.java deleted file mode 100644 index e01b9dc..0000000 --- a/spring-security/step-1/src/main/java/com/spring/service/security/LoginService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.spring.service.security; - -public interface LoginService { -} diff --git a/spring-security/step-2/src/main/java/com/spring/SpringSecurityStep1Application.java b/spring-security/step-1/src/main/java/com/spring/step1/SpringSecurityStep1Application.java similarity index 92% rename from spring-security/step-2/src/main/java/com/spring/SpringSecurityStep1Application.java rename to spring-security/step-1/src/main/java/com/spring/step1/SpringSecurityStep1Application.java index d068ecb..d49f4c1 100644 --- a/spring-security/step-2/src/main/java/com/spring/SpringSecurityStep1Application.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/SpringSecurityStep1Application.java @@ -1,4 +1,4 @@ -package com.spring; +package com.spring.step1; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/security/LoginRequest.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/security/LoginRequest.java similarity index 92% rename from spring-security/official/src/main/java/com/spring/domain/dto/security/LoginRequest.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/security/LoginRequest.java index b40b7e0..eef8eff 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/security/LoginRequest.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/security/LoginRequest.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.security; +package com.spring.step1.bean.dto.security; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/DeptDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/DeptDto.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/DeptDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/DeptDto.java index 49658b6..10611c8 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/DeptDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/DeptDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/EmailTemplateDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/EmailTemplateDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/EmailTemplateDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/EmailTemplateDto.java index 6883322..40c752b 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/EmailTemplateDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/EmailTemplateDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/EmailUsersDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/EmailUsersDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/EmailUsersDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/EmailUsersDto.java index 821b9ac..65aae7d 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/EmailUsersDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/EmailUsersDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/FilesDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/FilesDto.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/FilesDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/FilesDto.java index fc6fc92..615783e 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/FilesDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/FilesDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/FilesPartDetailDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/FilesPartDetailDto.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/FilesPartDetailDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/FilesPartDetailDto.java index 692d6ce..7dc8414 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/FilesPartDetailDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/FilesPartDetailDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/I18nDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/I18nDto.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/I18nDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/I18nDto.java index 60d6cc0..f7d6972 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/I18nDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/I18nDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/I18nTypeDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/I18nTypeDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/I18nTypeDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/I18nTypeDto.java index e87c8eb..2991c03 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/I18nTypeDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/I18nTypeDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/MenuIconDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/MenuIconDto.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/MenuIconDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/MenuIconDto.java index ce4018d..6d45ede 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/MenuIconDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/MenuIconDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/MessageDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/MessageDto.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/MessageDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/MessageDto.java index 5dc0928..1bdd409 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/MessageDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/MessageDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageReceivedDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/MessageReceivedDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageReceivedDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/MessageReceivedDto.java index cd6cb07..2143534 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/MessageReceivedDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/MessageReceivedDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/MessageTypeDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/MessageTypeDto.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/MessageTypeDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/MessageTypeDto.java index 68ac9fa..a4117dc 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/MessageTypeDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/MessageTypeDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/PermissionDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/PermissionDto.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/PermissionDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/PermissionDto.java index d02098b..c8a868d 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/PermissionDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/PermissionDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/RoleDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/RoleDto.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/RoleDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/RoleDto.java index d5dbfbf..ff0a592 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/RoleDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/RoleDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RolePermissionDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/RolePermissionDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/RolePermissionDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/RolePermissionDto.java index 7df964b..5a28241 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RolePermissionDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/RolePermissionDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/RouterDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/RouterDto.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/RouterDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/RouterDto.java index 7abf946..ce14dd8 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/RouterDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/RouterDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RouterRoleDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/RouterRoleDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/RouterRoleDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/RouterRoleDto.java index 7a40ce0..5fef09e 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/RouterRoleDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/RouterRoleDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/UserDeptDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/UserDeptDto.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/UserDeptDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/UserDeptDto.java index b46f599..fdcf06d 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/UserDeptDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/UserDeptDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/dto/system/UserDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/UserDto.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/dto/system/UserDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/UserDto.java index aeaee41..348b3fd 100644 --- a/spring-security/official/src/main/java/com/spring/domain/dto/system/UserDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/UserDto.java @@ -1,4 +1,4 @@ -package com.spring.domain.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserLoginDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/UserLoginDto.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserLoginDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/UserLoginDto.java index 9d53c9e..3a09832 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserLoginDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/UserLoginDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserRoleDto.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/UserRoleDto.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserRoleDto.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/UserRoleDto.java index 9a626fc..8baf5c8 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/dto/system/UserRoleDto.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/dto/system/UserRoleDto.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto.system; +package com.spring.step1.bean.dto.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/DeptEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/DeptEntity.java similarity index 92% rename from spring-security/official/src/main/java/com/spring/domain/entity/DeptEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/DeptEntity.java index 6d89550..069bc34 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/DeptEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/DeptEntity.java @@ -1,17 +1,14 @@ -package com.spring.domain.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.Date; @Getter @Setter diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/EmailTemplateEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/EmailTemplateEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/EmailTemplateEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/EmailTemplateEntity.java index 37602ab..dc2ea0d 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/EmailTemplateEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/EmailTemplateEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/EmailUsersEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/EmailUsersEntity.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/entity/EmailUsersEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/EmailUsersEntity.java index 1eccbad..474568a 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/EmailUsersEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/EmailUsersEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/FilesEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/FilesEntity.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/FilesEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/FilesEntity.java index 6b12c6d..951d7eb 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/FilesEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/FilesEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/FilesPartDetailEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/FilesPartDetailEntity.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/entity/FilesPartDetailEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/FilesPartDetailEntity.java index 699c373..df1b6c1 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/FilesPartDetailEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/FilesPartDetailEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/I18nEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/I18nEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/I18nEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/I18nEntity.java index 77f61a2..bf83918 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/I18nEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/I18nEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/I18nTypeEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/I18nTypeEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/I18nTypeEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/I18nTypeEntity.java index 855b05e..8e3c212 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/I18nTypeEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/I18nTypeEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/MenuIconEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/MenuIconEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/MenuIconEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/MenuIconEntity.java index 2ec25d0..c4632f6 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/MenuIconEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/MenuIconEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/MessageEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/MessageEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/MessageEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/MessageEntity.java index 3e48ce3..5dce7f3 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/MessageEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/MessageEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/MessageReceivedEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/MessageReceivedEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/MessageReceivedEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/MessageReceivedEntity.java index 852d861..cd4a604 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/MessageReceivedEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/MessageReceivedEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/MessageTypeEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/MessageTypeEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/MessageTypeEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/MessageTypeEntity.java index d2ec90a..07fa6b8 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/MessageTypeEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/MessageTypeEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/PermissionEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/PermissionEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/PermissionEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/PermissionEntity.java index b0523cd..834b2f4 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/PermissionEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/PermissionEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/RoleEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/RoleEntity.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/entity/RoleEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/RoleEntity.java index 20eafb8..6dacb5c 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/RoleEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/RoleEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/RolePermissionEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/RolePermissionEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/RolePermissionEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/RolePermissionEntity.java index ff77252..e9ad48f 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/RolePermissionEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/RolePermissionEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/RouterEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/RouterEntity.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/entity/RouterEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/RouterEntity.java index 86e4a42..cf462b1 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/RouterEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/RouterEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/RouterRoleEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/RouterRoleEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/RouterRoleEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/RouterRoleEntity.java index cab3141..272f554 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/RouterRoleEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/RouterRoleEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/UserDeptEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/UserDeptEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/UserDeptEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/UserDeptEntity.java index 4bc2f75..58983e8 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/UserDeptEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/UserDeptEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/UserEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/UserEntity.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/UserEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/UserEntity.java index e0fd7cc..f399cb7 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/UserEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/UserEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/entity/UserLoginEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/UserLoginEntity.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/entity/UserLoginEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/UserLoginEntity.java index 37dc41d..f001d23 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/entity/UserLoginEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/UserLoginEntity.java @@ -1,4 +1,4 @@ -package com.spring.bean.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/official/src/main/java/com/spring/domain/entity/UserRoleEntity.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/UserRoleEntity.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/entity/UserRoleEntity.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/entity/UserRoleEntity.java index d66f931..29f4fb3 100644 --- a/spring-security/official/src/main/java/com/spring/domain/entity/UserRoleEntity.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/entity/UserRoleEntity.java @@ -1,4 +1,4 @@ -package com.spring.domain.entity; +package com.spring.step1.bean.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/DeptVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/DeptVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/DeptVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/DeptVo.java index eeadc9e..4d12a6e 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/DeptVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/DeptVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/EmailTemplateVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/EmailTemplateVo.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/vo/EmailTemplateVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/EmailTemplateVo.java index e006209..e8f5549 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/EmailTemplateVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/EmailTemplateVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/EmailUsersVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/EmailUsersVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/EmailUsersVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/EmailUsersVo.java index 06e8460..c4a36ec 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/EmailUsersVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/EmailUsersVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/FilesPartDetailVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/FilesPartDetailVo.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/vo/FilesPartDetailVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/FilesPartDetailVo.java index e8368ea..7ae1096 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/FilesPartDetailVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/FilesPartDetailVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/FilesVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/FilesVo.java similarity index 99% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/FilesVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/FilesVo.java index cb48a03..4d2f6f6 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/FilesVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/FilesVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/I18nTypeVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/I18nTypeVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/I18nTypeVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/I18nTypeVo.java index abe247e..2e10890 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/I18nTypeVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/I18nTypeVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/I18nVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/I18nVo.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/vo/I18nVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/I18nVo.java index dd42bdd..22904c1 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/I18nVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/I18nVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/MenuIconVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/MenuIconVo.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/vo/MenuIconVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/MenuIconVo.java index 0ffdbe4..8be4961 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/MenuIconVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/MenuIconVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/MessageReceivedVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/MessageReceivedVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/MessageReceivedVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/MessageReceivedVo.java index e8db89c..b0fb883 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/MessageReceivedVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/MessageReceivedVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/MessageTypeVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/MessageTypeVo.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/vo/MessageTypeVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/MessageTypeVo.java index 7291755..78ccec2 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/MessageTypeVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/MessageTypeVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/MessageVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/MessageVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/MessageVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/MessageVo.java index 01dbbaf..4da306c 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/MessageVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/MessageVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/PermissionVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/PermissionVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/PermissionVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/PermissionVo.java index d1e24b5..64fb1c3 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/PermissionVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/PermissionVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/RolePermissionVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/RolePermissionVo.java similarity index 96% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/RolePermissionVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/RolePermissionVo.java index 2dda71f..5db8644 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/RolePermissionVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/RolePermissionVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/RoleVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/RoleVo.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/vo/RoleVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/RoleVo.java index 99f97bd..b3ed8c4 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/RoleVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/RoleVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/RouterRoleVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/RouterRoleVo.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/vo/RouterRoleVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/RouterRoleVo.java index ab3dc81..5086f10 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/RouterRoleVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/RouterRoleVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/RouterVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/RouterVo.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/RouterVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/RouterVo.java index 90d72bc..19e7248 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/RouterVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/UserDeptVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/UserDeptVo.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/vo/UserDeptVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/UserDeptVo.java index 9938d1a..c6f1751 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/UserDeptVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/UserDeptVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/UserLoginVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/UserLoginVo.java similarity index 97% rename from spring-security/official/src/main/java/com/spring/domain/vo/UserLoginVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/UserLoginVo.java index c3a16a3..6f8d9f0 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/UserLoginVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/UserLoginVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/UserRoleVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/UserRoleVo.java similarity index 96% rename from spring-security/official/src/main/java/com/spring/domain/vo/UserRoleVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/UserRoleVo.java index 2b6b87a..279a570 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/UserRoleVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/UserRoleVo.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/UserVo.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/UserVo.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/UserVo.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/UserVo.java index 8dc3a88..dce6b94 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/UserVo.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/UserVo.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo; +package com.spring.step1.bean.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/result/PageResult.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/result/PageResult.java similarity index 94% rename from spring-security/official/src/main/java/com/spring/domain/vo/result/PageResult.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/result/PageResult.java index d192789..710c096 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/result/PageResult.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/result/PageResult.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo.result; +package com.spring.step1.bean.vo.result; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-2/src/main/java/com/spring/bean/vo/result/Result.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/result/Result.java similarity index 99% rename from spring-security/step-2/src/main/java/com/spring/bean/vo/result/Result.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/result/Result.java index 546db04..fa3c1fc 100644 --- a/spring-security/step-2/src/main/java/com/spring/bean/vo/result/Result.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/result/Result.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo.result; +package com.spring.step1.bean.vo.result; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/result/ResultCodeEnum.java b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/result/ResultCodeEnum.java similarity index 98% rename from spring-security/official/src/main/java/com/spring/domain/vo/result/ResultCodeEnum.java rename to spring-security/step-1/src/main/java/com/spring/step1/bean/vo/result/ResultCodeEnum.java index af3ffaf..ee62efd 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/result/ResultCodeEnum.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/bean/vo/result/ResultCodeEnum.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo.result; +package com.spring.step1.bean.vo.result; import lombok.Getter; diff --git a/spring-security/step-1/src/main/java/com/spring/config/Knife4jConfig.java b/spring-security/step-1/src/main/java/com/spring/step1/config/Knife4jConfig.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/config/Knife4jConfig.java rename to spring-security/step-1/src/main/java/com/spring/step1/config/Knife4jConfig.java index 4d5555a..c60a01d 100644 --- a/spring-security/step-1/src/main/java/com/spring/config/Knife4jConfig.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/config/Knife4jConfig.java @@ -1,4 +1,4 @@ -package com.spring.config; +package com.spring.step1.config; import io.swagger.v3.oas.models.ExternalDocumentation; import io.swagger.v3.oas.models.OpenAPI; diff --git a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/EmailTemplateController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/EmailTemplateController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/EmailTemplateController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/EmailTemplateController.java index 1c99322..9287eb8 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/EmailTemplateController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/EmailTemplateController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.anonymous; +package com.spring.step1.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.EmailTemplateDto; -import com.spring.bean.entity.EmailTemplateEntity; -import com.spring.bean.vo.EmailTemplateVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.EmailTemplateService; +import com.spring.step1.bean.dto.system.EmailTemplateDto; +import com.spring.step1.bean.entity.EmailTemplateEntity; +import com.spring.step1.bean.vo.EmailTemplateVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.EmailTemplateService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/EmailUsersController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/EmailUsersController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/EmailUsersController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/EmailUsersController.java index c2542ac..2bea018 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/EmailUsersController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/EmailUsersController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.anonymous; +package com.spring.step1.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.EmailUsersDto; -import com.spring.bean.entity.EmailUsersEntity; -import com.spring.bean.vo.EmailUsersVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.EmailUsersService; +import com.spring.step1.bean.dto.system.EmailUsersDto; +import com.spring.step1.bean.entity.EmailUsersEntity; +import com.spring.step1.bean.vo.EmailUsersVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.EmailUsersService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/FilesController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/FilesController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/FilesController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/FilesController.java index 4cf6359..2d10ee3 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/FilesController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/FilesController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.anonymous; +package com.spring.step1.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.FilesDto; -import com.spring.bean.entity.FilesEntity; -import com.spring.bean.vo.FilesVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.FilesService; +import com.spring.step1.bean.dto.system.FilesDto; +import com.spring.step1.bean.entity.FilesEntity; +import com.spring.step1.bean.vo.FilesVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.FilesService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/FilesPartDetailController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/FilesPartDetailController.java similarity index 86% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/FilesPartDetailController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/FilesPartDetailController.java index 452edd5..b5077e7 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/FilesPartDetailController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/FilesPartDetailController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.anonymous; +package com.spring.step1.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.FilesPartDetailDto; -import com.spring.bean.entity.FilesPartDetailEntity; -import com.spring.bean.vo.FilesPartDetailVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.FilesPartDetailService; +import com.spring.step1.bean.dto.system.FilesPartDetailDto; +import com.spring.step1.bean.entity.FilesPartDetailEntity; +import com.spring.step1.bean.vo.FilesPartDetailVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.FilesPartDetailService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/I18nController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/I18nController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/I18nController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/I18nController.java index d7fda03..e02c070 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/I18nController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/I18nController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.anonymous; +package com.spring.step1.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.I18nDto; -import com.spring.bean.entity.I18nEntity; -import com.spring.bean.vo.I18nVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.I18nService; +import com.spring.step1.bean.dto.system.I18nDto; +import com.spring.step1.bean.entity.I18nEntity; +import com.spring.step1.bean.vo.I18nVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.I18nService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/I18nTypeController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/I18nTypeController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/I18nTypeController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/I18nTypeController.java index 218cf9f..a4cae6f 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/I18nTypeController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/I18nTypeController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.anonymous; +package com.spring.step1.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.I18nTypeDto; -import com.spring.bean.entity.I18nTypeEntity; -import com.spring.bean.vo.I18nTypeVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.I18nTypeService; +import com.spring.step1.bean.dto.system.I18nTypeDto; +import com.spring.step1.bean.entity.I18nTypeEntity; +import com.spring.step1.bean.vo.I18nTypeVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.I18nTypeService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/MenuIconController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/MenuIconController.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/MenuIconController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/MenuIconController.java index 736439f..0703ada 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/MenuIconController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/MenuIconController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.anonymous; +package com.spring.step1.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.MenuIconDto; -import com.spring.bean.entity.MenuIconEntity; -import com.spring.bean.vo.MenuIconVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.MenuIconService; +import com.spring.step1.bean.dto.system.MenuIconDto; +import com.spring.step1.bean.entity.MenuIconEntity; +import com.spring.step1.bean.vo.MenuIconVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.MenuIconService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/PermissionController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/PermissionController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/PermissionController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/PermissionController.java index cfbf347..04480c6 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/PermissionController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/PermissionController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.anonymous; +package com.spring.step1.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.PermissionDto; -import com.spring.bean.entity.PermissionEntity; -import com.spring.bean.vo.PermissionVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.PermissionService; +import com.spring.step1.bean.dto.system.PermissionDto; +import com.spring.step1.bean.entity.PermissionEntity; +import com.spring.step1.bean.vo.PermissionVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.PermissionService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RoleController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/RoleController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RoleController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/RoleController.java index 6d0f22b..361b17f 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RoleController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/RoleController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.anonymous; +package com.spring.step1.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.RoleDto; -import com.spring.bean.entity.RoleEntity; -import com.spring.bean.vo.RoleVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.RoleService; +import com.spring.step1.bean.dto.system.RoleDto; +import com.spring.step1.bean.entity.RoleEntity; +import com.spring.step1.bean.vo.RoleVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.RoleService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RolePermissionController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/RolePermissionController.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RolePermissionController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/RolePermissionController.java index e6dcda1..65a4727 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RolePermissionController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/RolePermissionController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.anonymous; +package com.spring.step1.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.RolePermissionDto; -import com.spring.bean.entity.RolePermissionEntity; -import com.spring.bean.vo.RolePermissionVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.RolePermissionService; +import com.spring.step1.bean.dto.system.RolePermissionDto; +import com.spring.step1.bean.entity.RolePermissionEntity; +import com.spring.step1.bean.vo.RolePermissionVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.RolePermissionService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RouterController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/RouterController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RouterController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/RouterController.java index 71a4a83..605c808 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RouterController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/RouterController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.anonymous; +package com.spring.step1.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.RouterDto; -import com.spring.bean.entity.RouterEntity; -import com.spring.bean.vo.RouterVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.RouterService; +import com.spring.step1.bean.dto.system.RouterDto; +import com.spring.step1.bean.entity.RouterEntity; +import com.spring.step1.bean.vo.RouterVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.RouterService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RouterRoleController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/RouterRoleController.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RouterRoleController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/RouterRoleController.java index f15f02b..580ec9d 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/anonymous/RouterRoleController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/anonymous/RouterRoleController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.anonymous; +package com.spring.step1.controller.sample.anonymous; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.RouterRoleDto; -import com.spring.bean.entity.RouterRoleEntity; -import com.spring.bean.vo.RouterRoleVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.RouterRoleService; +import com.spring.step1.bean.dto.system.RouterRoleDto; +import com.spring.step1.bean.entity.RouterRoleEntity; +import com.spring.step1.bean.vo.RouterRoleVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.RouterRoleService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/dept/DeptController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/dept/DeptController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/dept/DeptController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/dept/DeptController.java index b535775..f7f3f5e 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/dept/DeptController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/dept/DeptController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.dept; +package com.spring.step1.controller.sample.dept; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.DeptDto; -import com.spring.bean.entity.DeptEntity; -import com.spring.bean.vo.DeptVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.DeptService; +import com.spring.step1.bean.dto.system.DeptDto; +import com.spring.step1.bean.entity.DeptEntity; +import com.spring.step1.bean.vo.DeptVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.DeptService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/message/MessageController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/message/MessageController.java index b77dabb..1cc9224 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/message/MessageController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.message; +package com.spring.step1.controller.sample.message; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.MessageDto; -import com.spring.bean.entity.MessageEntity; -import com.spring.bean.vo.MessageVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.MessageService; +import com.spring.step1.bean.dto.system.MessageDto; +import com.spring.step1.bean.entity.MessageEntity; +import com.spring.step1.bean.vo.MessageVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.MessageService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageReceivedController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/message/MessageReceivedController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageReceivedController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/message/MessageReceivedController.java index fe0540b..f33dfe8 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageReceivedController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/message/MessageReceivedController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.message; +package com.spring.step1.controller.sample.message; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.MessageReceivedDto; -import com.spring.bean.entity.MessageReceivedEntity; -import com.spring.bean.vo.MessageReceivedVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.MessageReceivedService; +import com.spring.step1.bean.dto.system.MessageReceivedDto; +import com.spring.step1.bean.entity.MessageReceivedEntity; +import com.spring.step1.bean.vo.MessageReceivedVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.MessageReceivedService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageTypeController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/message/MessageTypeController.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageTypeController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/message/MessageTypeController.java index 75b7dfe..d1aaad6 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/message/MessageTypeController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/message/MessageTypeController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.message; +package com.spring.step1.controller.sample.message; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.MessageTypeDto; -import com.spring.bean.entity.MessageTypeEntity; -import com.spring.bean.vo.MessageTypeVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.MessageTypeService; +import com.spring.step1.bean.dto.system.MessageTypeDto; +import com.spring.step1.bean.entity.MessageTypeEntity; +import com.spring.step1.bean.vo.MessageTypeVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.MessageTypeService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/user/UserController.java similarity index 84% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/user/UserController.java index 1040e02..32186ee 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/user/UserController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.user; +package com.spring.step1.controller.sample.user; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.UserDto; -import com.spring.bean.entity.UserEntity; -import com.spring.bean.vo.UserVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.UserService; +import com.spring.step1.bean.dto.system.UserDto; +import com.spring.step1.bean.entity.UserEntity; +import com.spring.step1.bean.vo.UserVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.UserService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserDeptController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/user/UserDeptController.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserDeptController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/user/UserDeptController.java index 6eb9e28..dce76f4 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserDeptController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/user/UserDeptController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.user; +package com.spring.step1.controller.sample.user; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.UserDeptDto; -import com.spring.bean.entity.UserDeptEntity; -import com.spring.bean.vo.UserDeptVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.UserDeptService; +import com.spring.step1.bean.dto.system.UserDeptDto; +import com.spring.step1.bean.entity.UserDeptEntity; +import com.spring.step1.bean.vo.UserDeptVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.UserDeptService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserLoginController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/user/UserLoginController.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserLoginController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/user/UserLoginController.java index 82436a6..9f7f1a8 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserLoginController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/user/UserLoginController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.user; +package com.spring.step1.controller.sample.user; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.UserLoginDto; -import com.spring.bean.entity.UserLoginEntity; -import com.spring.bean.vo.UserLoginVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.UserLoginService; +import com.spring.step1.bean.dto.system.UserLoginDto; +import com.spring.step1.bean.entity.UserLoginEntity; +import com.spring.step1.bean.vo.UserLoginVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.UserLoginService; 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/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserRoleController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/user/UserRoleController.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserRoleController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/sample/user/UserRoleController.java index 656035f..d09b49d 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/sample/user/UserRoleController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/sample/user/UserRoleController.java @@ -1,13 +1,13 @@ -package com.spring.controller.sample.user; +package com.spring.step1.controller.sample.user; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.spring.bean.dto.system.UserRoleDto; -import com.spring.bean.entity.UserRoleEntity; -import com.spring.bean.vo.UserRoleVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.bean.vo.result.Result; -import com.spring.bean.vo.result.ResultCodeEnum; -import com.spring.service.sample.UserRoleService; +import com.spring.step1.bean.dto.system.UserRoleDto; +import com.spring.step1.bean.entity.UserRoleEntity; +import com.spring.step1.bean.vo.UserRoleVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.ResultCodeEnum; +import com.spring.step1.service.sample.UserRoleService; 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/spring-security/step-1/src/main/java/com/spring/controller/security/CheckController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/security/CheckController.java similarity index 94% rename from spring-security/step-1/src/main/java/com/spring/controller/security/CheckController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/security/CheckController.java index 8063d47..22d6e84 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/security/CheckController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/security/CheckController.java @@ -1,4 +1,4 @@ -package com.spring.controller.security; +package com.spring.step1.controller.security; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.core.Authentication; diff --git a/spring-security/step-1/src/main/java/com/spring/controller/security/LoginController.java b/spring-security/step-1/src/main/java/com/spring/step1/controller/security/LoginController.java similarity index 87% rename from spring-security/step-1/src/main/java/com/spring/controller/security/LoginController.java rename to spring-security/step-1/src/main/java/com/spring/step1/controller/security/LoginController.java index 2b75bae..067f225 100644 --- a/spring-security/step-1/src/main/java/com/spring/controller/security/LoginController.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/controller/security/LoginController.java @@ -1,4 +1,4 @@ -package com.spring.controller.security; +package com.spring.step1.controller.security; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/DeptMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/DeptMapper.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/mapper/DeptMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/DeptMapper.java index 45e5d21..1ab3fb7 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/DeptMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/DeptMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.DeptDto; -import com.spring.bean.entity.DeptEntity; -import com.spring.bean.vo.DeptVo; +import com.spring.step1.bean.dto.system.DeptDto; +import com.spring.step1.bean.entity.DeptEntity; +import com.spring.step1.bean.vo.DeptVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/EmailTemplateMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/EmailTemplateMapper.java similarity index 80% rename from spring-security/official/src/main/java/com/spring/mapper/EmailTemplateMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/EmailTemplateMapper.java index aa65ff7..257c375 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/EmailTemplateMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/EmailTemplateMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.EmailTemplateDto; -import com.spring.domain.entity.EmailTemplateEntity; -import com.spring.domain.vo.EmailTemplateVo; +import com.spring.step1.bean.dto.system.EmailTemplateDto; +import com.spring.step1.bean.entity.EmailTemplateEntity; +import com.spring.step1.bean.vo.EmailTemplateVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/EmailUsersMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/EmailUsersMapper.java similarity index 80% rename from spring-security/official/src/main/java/com/spring/mapper/EmailUsersMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/EmailUsersMapper.java index 646f602..2dc34a4 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/EmailUsersMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/EmailUsersMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.EmailUsersDto; -import com.spring.domain.entity.EmailUsersEntity; -import com.spring.domain.vo.EmailUsersVo; +import com.spring.step1.bean.dto.system.EmailUsersDto; +import com.spring.step1.bean.entity.EmailUsersEntity; +import com.spring.step1.bean.vo.EmailUsersVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/FilesMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/FilesMapper.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/mapper/FilesMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/FilesMapper.java index 49af869..cfc8705 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/FilesMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/FilesMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.FilesDto; -import com.spring.bean.entity.FilesEntity; -import com.spring.bean.vo.FilesVo; +import com.spring.step1.bean.dto.system.FilesDto; +import com.spring.step1.bean.entity.FilesEntity; +import com.spring.step1.bean.vo.FilesVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/FilesPartDetailMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/FilesPartDetailMapper.java similarity index 83% rename from spring-security/official/src/main/java/com/spring/mapper/FilesPartDetailMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/FilesPartDetailMapper.java index d533b3d..7f94a6a 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/FilesPartDetailMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/FilesPartDetailMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.FilesPartDetailDto; -import com.spring.domain.entity.FilesPartDetailEntity; -import com.spring.domain.vo.FilesPartDetailVo; +import com.spring.step1.bean.dto.system.FilesPartDetailDto; +import com.spring.step1.bean.entity.FilesPartDetailEntity; +import com.spring.step1.bean.vo.FilesPartDetailVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/I18nMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/I18nMapper.java similarity index 81% rename from spring-security/official/src/main/java/com/spring/mapper/I18nMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/I18nMapper.java index e0bd3a9..e658485 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/I18nMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/I18nMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.I18nDto; -import com.spring.domain.entity.I18nEntity; -import com.spring.domain.vo.I18nVo; +import com.spring.step1.bean.dto.system.I18nDto; +import com.spring.step1.bean.entity.I18nEntity; +import com.spring.step1.bean.vo.I18nVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/I18nTypeMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/I18nTypeMapper.java similarity index 81% rename from spring-security/official/src/main/java/com/spring/mapper/I18nTypeMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/I18nTypeMapper.java index fd6a9fd..8456c73 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/I18nTypeMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/I18nTypeMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.I18nTypeDto; -import com.spring.domain.entity.I18nTypeEntity; -import com.spring.domain.vo.I18nTypeVo; +import com.spring.step1.bean.dto.system.I18nTypeDto; +import com.spring.step1.bean.entity.I18nTypeEntity; +import com.spring.step1.bean.vo.I18nTypeVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/MenuIconMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/MenuIconMapper.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/mapper/MenuIconMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/MenuIconMapper.java index 451e07e..ddcb04b 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/MenuIconMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/MenuIconMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.MenuIconDto; -import com.spring.bean.entity.MenuIconEntity; -import com.spring.bean.vo.MenuIconVo; +import com.spring.step1.bean.dto.system.MenuIconDto; +import com.spring.step1.bean.entity.MenuIconEntity; +import com.spring.step1.bean.vo.MenuIconVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/MessageMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/MessageMapper.java similarity index 81% rename from spring-security/step-1/src/main/java/com/spring/mapper/MessageMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/MessageMapper.java index 0d30636..6191fb6 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/MessageMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/MessageMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.MessageDto; -import com.spring.bean.entity.MessageEntity; -import com.spring.bean.vo.MessageVo; +import com.spring.step1.bean.dto.system.MessageDto; +import com.spring.step1.bean.entity.MessageEntity; +import com.spring.step1.bean.vo.MessageVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/MessageReceivedMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/MessageReceivedMapper.java similarity index 78% rename from spring-security/official/src/main/java/com/spring/mapper/MessageReceivedMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/MessageReceivedMapper.java index 2b563bc..ec9a6f7 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/MessageReceivedMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/MessageReceivedMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.MessageReceivedDto; -import com.spring.domain.entity.MessageReceivedEntity; -import com.spring.domain.vo.MessageReceivedVo; +import com.spring.step1.bean.dto.system.MessageReceivedDto; +import com.spring.step1.bean.entity.MessageReceivedEntity; +import com.spring.step1.bean.vo.MessageReceivedVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/MessageTypeMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/MessageTypeMapper.java similarity index 81% rename from spring-security/official/src/main/java/com/spring/mapper/MessageTypeMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/MessageTypeMapper.java index 53d8180..f959007 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/MessageTypeMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/MessageTypeMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.MessageTypeDto; -import com.spring.domain.entity.MessageTypeEntity; -import com.spring.domain.vo.MessageTypeVo; +import com.spring.step1.bean.dto.system.MessageTypeDto; +import com.spring.step1.bean.entity.MessageTypeEntity; +import com.spring.step1.bean.vo.MessageTypeVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/PermissionMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/PermissionMapper.java similarity index 80% rename from spring-security/official/src/main/java/com/spring/mapper/PermissionMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/PermissionMapper.java index 8d3ee4d..f7133f2 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/PermissionMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/PermissionMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.PermissionDto; -import com.spring.domain.entity.PermissionEntity; -import com.spring.domain.vo.PermissionVo; +import com.spring.step1.bean.dto.system.PermissionDto; +import com.spring.step1.bean.entity.PermissionEntity; +import com.spring.step1.bean.vo.PermissionVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/RoleMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/RoleMapper.java similarity index 81% rename from spring-security/official/src/main/java/com/spring/mapper/RoleMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/RoleMapper.java index b0f0602..d421c00 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/RoleMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/RoleMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.RoleDto; -import com.spring.domain.entity.RoleEntity; -import com.spring.domain.vo.RoleVo; +import com.spring.step1.bean.dto.system.RoleDto; +import com.spring.step1.bean.entity.RoleEntity; +import com.spring.step1.bean.vo.RoleVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/RolePermissionMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/RolePermissionMapper.java similarity index 80% rename from spring-security/official/src/main/java/com/spring/mapper/RolePermissionMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/RolePermissionMapper.java index 653cd97..e792690 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/RolePermissionMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/RolePermissionMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.RolePermissionDto; -import com.spring.domain.entity.RolePermissionEntity; -import com.spring.domain.vo.RolePermissionVo; +import com.spring.step1.bean.dto.system.RolePermissionDto; +import com.spring.step1.bean.entity.RolePermissionEntity; +import com.spring.step1.bean.vo.RolePermissionVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/RouterMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/RouterMapper.java similarity index 81% rename from spring-security/official/src/main/java/com/spring/mapper/RouterMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/RouterMapper.java index 9272b87..7aa0123 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/RouterMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/RouterMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.RouterDto; -import com.spring.domain.entity.RouterEntity; -import com.spring.domain.vo.RouterVo; +import com.spring.step1.bean.dto.system.RouterDto; +import com.spring.step1.bean.entity.RouterEntity; +import com.spring.step1.bean.vo.RouterVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/RouterRoleMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/RouterRoleMapper.java similarity index 82% rename from spring-security/step-1/src/main/java/com/spring/mapper/RouterRoleMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/RouterRoleMapper.java index f1a3d4c..6d4db3d 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/RouterRoleMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/RouterRoleMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.RouterRoleDto; -import com.spring.bean.entity.RouterRoleEntity; -import com.spring.bean.vo.RouterRoleVo; +import com.spring.step1.bean.dto.system.RouterRoleDto; +import com.spring.step1.bean.entity.RouterRoleEntity; +import com.spring.step1.bean.vo.RouterRoleVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/UserDeptMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/UserDeptMapper.java similarity index 81% rename from spring-security/official/src/main/java/com/spring/mapper/UserDeptMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/UserDeptMapper.java index 2366d2f..611d371 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/UserDeptMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/UserDeptMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.UserDeptDto; -import com.spring.domain.entity.UserDeptEntity; -import com.spring.domain.vo.UserDeptVo; +import com.spring.step1.bean.dto.system.UserDeptDto; +import com.spring.step1.bean.entity.UserDeptEntity; +import com.spring.step1.bean.vo.UserDeptVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/UserLoginMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/UserLoginMapper.java similarity index 81% rename from spring-security/official/src/main/java/com/spring/mapper/UserLoginMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/UserLoginMapper.java index e43e0c7..4366515 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/UserLoginMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/UserLoginMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.UserLoginDto; -import com.spring.domain.entity.UserLoginEntity; -import com.spring.domain.vo.UserLoginVo; +import com.spring.step1.bean.dto.system.UserLoginDto; +import com.spring.step1.bean.entity.UserLoginEntity; +import com.spring.step1.bean.vo.UserLoginVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/official/src/main/java/com/spring/mapper/UserMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/UserMapper.java similarity index 81% rename from spring-security/official/src/main/java/com/spring/mapper/UserMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/UserMapper.java index 82f43ef..f713955 100644 --- a/spring-security/official/src/main/java/com/spring/mapper/UserMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/UserMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.domain.dto.system.UserDto; -import com.spring.domain.entity.UserEntity; -import com.spring.domain.vo.UserVo; +import com.spring.step1.bean.dto.system.UserDto; +import com.spring.step1.bean.entity.UserEntity; +import com.spring.step1.bean.vo.UserVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-1/src/main/java/com/spring/mapper/UserRoleMapper.java b/spring-security/step-1/src/main/java/com/spring/step1/mapper/UserRoleMapper.java similarity index 82% rename from spring-security/step-1/src/main/java/com/spring/mapper/UserRoleMapper.java rename to spring-security/step-1/src/main/java/com/spring/step1/mapper/UserRoleMapper.java index 394872c..10699a8 100644 --- a/spring-security/step-1/src/main/java/com/spring/mapper/UserRoleMapper.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/mapper/UserRoleMapper.java @@ -1,12 +1,12 @@ -package com.spring.mapper; +package com.spring.step1.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.spring.bean.dto.system.UserRoleDto; -import com.spring.bean.entity.UserRoleEntity; -import com.spring.bean.vo.UserRoleVo; +import com.spring.step1.bean.dto.system.UserRoleDto; +import com.spring.step1.bean.entity.UserRoleEntity; +import com.spring.step1.bean.vo.UserRoleVo; import com.baomidou.mybatisplus.core.metadata.IPage; /** diff --git a/spring-security/step-2/src/main/java/com/spring/security/config/SecurityConfiguration.java b/spring-security/step-1/src/main/java/com/spring/step1/security/config/SecurityConfiguration.java similarity index 98% rename from spring-security/step-2/src/main/java/com/spring/security/config/SecurityConfiguration.java rename to spring-security/step-1/src/main/java/com/spring/step1/security/config/SecurityConfiguration.java index 2279036..36c30ca 100644 --- a/spring-security/step-2/src/main/java/com/spring/security/config/SecurityConfiguration.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/security/config/SecurityConfiguration.java @@ -1,4 +1,4 @@ -package com.spring.security.config; +package com.spring.step1.security.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; diff --git a/spring-security/step-1/src/main/java/com/spring/security/config/SecurityWebConfiguration.java b/spring-security/step-1/src/main/java/com/spring/step1/security/config/SecurityWebConfiguration.java similarity index 93% rename from spring-security/step-1/src/main/java/com/spring/security/config/SecurityWebConfiguration.java rename to spring-security/step-1/src/main/java/com/spring/step1/security/config/SecurityWebConfiguration.java index ec537d2..22227e9 100644 --- a/spring-security/step-1/src/main/java/com/spring/security/config/SecurityWebConfiguration.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/security/config/SecurityWebConfiguration.java @@ -1,7 +1,7 @@ -package com.spring.security.config; +package com.spring.step1.security.config; -import com.spring.security.handler.SecurityAccessDeniedHandler; -import com.spring.security.handler.SecurityAuthenticationEntryPoint; +import com.spring.step1.security.handler.SecurityAccessDeniedHandler; +import com.spring.step1.security.handler.SecurityAuthenticationEntryPoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; diff --git a/spring-security/step-2/src/main/java/com/spring/security/handler/SecurityAccessDeniedHandler.java b/spring-security/step-1/src/main/java/com/spring/step1/security/handler/SecurityAccessDeniedHandler.java similarity index 91% rename from spring-security/step-2/src/main/java/com/spring/security/handler/SecurityAccessDeniedHandler.java rename to spring-security/step-1/src/main/java/com/spring/step1/security/handler/SecurityAccessDeniedHandler.java index 661e686..8b8f7b7 100644 --- a/spring-security/step-2/src/main/java/com/spring/security/handler/SecurityAccessDeniedHandler.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/security/handler/SecurityAccessDeniedHandler.java @@ -1,7 +1,7 @@ -package com.spring.security.handler; +package com.spring.step1.security.handler; import com.alibaba.fastjson2.JSON; -import com.spring.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.Result; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/spring-security/step-1/src/main/java/com/spring/security/handler/SecurityAuthenticationEntryPoint.java b/spring-security/step-1/src/main/java/com/spring/step1/security/handler/SecurityAuthenticationEntryPoint.java similarity index 91% rename from spring-security/step-1/src/main/java/com/spring/security/handler/SecurityAuthenticationEntryPoint.java rename to spring-security/step-1/src/main/java/com/spring/step1/security/handler/SecurityAuthenticationEntryPoint.java index 7e48511..8f3baad 100644 --- a/spring-security/step-1/src/main/java/com/spring/security/handler/SecurityAuthenticationEntryPoint.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/security/handler/SecurityAuthenticationEntryPoint.java @@ -1,7 +1,7 @@ -package com.spring.security.handler; +package com.spring.step1.security.handler; import com.alibaba.fastjson2.JSON; -import com.spring.bean.vo.result.Result; +import com.spring.step1.bean.vo.result.Result; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/spring-security/step-2/src/main/java/com/spring/security/password/MD5PasswordEncoder.java b/spring-security/step-1/src/main/java/com/spring/step1/security/password/MD5PasswordEncoder.java similarity index 97% rename from spring-security/step-2/src/main/java/com/spring/security/password/MD5PasswordEncoder.java rename to spring-security/step-1/src/main/java/com/spring/step1/security/password/MD5PasswordEncoder.java index 1cab71c..51cf036 100644 --- a/spring-security/step-2/src/main/java/com/spring/security/password/MD5PasswordEncoder.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/security/password/MD5PasswordEncoder.java @@ -1,4 +1,4 @@ -package com.spring.security.password; +package com.spring.step1.security.password; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.util.DigestUtils; diff --git a/spring-security/step-1/src/main/java/com/spring/security/service/CustomUserDetailsService.java b/spring-security/step-1/src/main/java/com/spring/step1/security/service/CustomUserDetailsService.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/security/service/CustomUserDetailsService.java rename to spring-security/step-1/src/main/java/com/spring/step1/security/service/CustomUserDetailsService.java index fb727b3..4d9d27d 100644 --- a/spring-security/step-1/src/main/java/com/spring/security/service/CustomUserDetailsService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/security/service/CustomUserDetailsService.java @@ -1,4 +1,4 @@ -package com.spring.security.service; +package com.spring.step1.security.service; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.User; diff --git a/spring-security/step-2/src/main/java/com/spring/service/impl/LoginServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/impl/LoginServiceImpl.java similarity index 65% rename from spring-security/step-2/src/main/java/com/spring/service/impl/LoginServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/impl/LoginServiceImpl.java index 49a9525..5bf0619 100644 --- a/spring-security/step-2/src/main/java/com/spring/service/impl/LoginServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/impl/LoginServiceImpl.java @@ -1,6 +1,6 @@ -package com.spring.service.impl; +package com.spring.step1.service.impl; -import com.spring.service.LoginService; +import com.spring.step1.service.security.LoginService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/DeptService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/DeptService.java similarity index 78% rename from spring-security/step-1/src/main/java/com/spring/service/sample/DeptService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/DeptService.java index e2f7f03..b30fbca 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/DeptService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/DeptService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.DeptDto; -import com.spring.bean.entity.DeptEntity; -import com.spring.bean.vo.DeptVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.step1.bean.dto.system.DeptDto; +import com.spring.step1.bean.entity.DeptEntity; +import com.spring.step1.bean.vo.DeptVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/EmailTemplateService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/EmailTemplateService.java similarity index 79% rename from spring-security/official/src/main/java/com/spring/service/system/EmailTemplateService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/EmailTemplateService.java index ae5344f..2cccff9 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/EmailTemplateService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/EmailTemplateService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.EmailTemplateDto; -import com.spring.domain.entity.EmailTemplateEntity; -import com.spring.domain.vo.EmailTemplateVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.step1.bean.dto.system.EmailTemplateDto; +import com.spring.step1.bean.entity.EmailTemplateEntity; +import com.spring.step1.bean.vo.EmailTemplateVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/EmailUsersService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/EmailUsersService.java similarity index 79% rename from spring-security/official/src/main/java/com/spring/service/system/EmailUsersService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/EmailUsersService.java index 0564d96..68f9e80 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/EmailUsersService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/EmailUsersService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.EmailUsersDto; -import com.spring.domain.entity.EmailUsersEntity; -import com.spring.domain.vo.EmailUsersVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.step1.bean.dto.system.EmailUsersDto; +import com.spring.step1.bean.entity.EmailUsersEntity; +import com.spring.step1.bean.vo.EmailUsersVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/FilesPartDetailService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/FilesPartDetailService.java similarity index 82% rename from spring-security/step-1/src/main/java/com/spring/service/sample/FilesPartDetailService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/FilesPartDetailService.java index 4d3cdd6..9abca6a 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/FilesPartDetailService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/FilesPartDetailService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.FilesPartDetailDto; -import com.spring.bean.entity.FilesPartDetailEntity; -import com.spring.bean.vo.FilesPartDetailVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.step1.bean.dto.system.FilesPartDetailDto; +import com.spring.step1.bean.entity.FilesPartDetailEntity; +import com.spring.step1.bean.vo.FilesPartDetailVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/FilesService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/FilesService.java similarity index 79% rename from spring-security/step-1/src/main/java/com/spring/service/sample/FilesService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/FilesService.java index a80c24d..fcbfac7 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/FilesService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/FilesService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.FilesDto; -import com.spring.bean.entity.FilesEntity; -import com.spring.bean.vo.FilesVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.step1.bean.dto.system.FilesDto; +import com.spring.step1.bean.entity.FilesEntity; +import com.spring.step1.bean.vo.FilesVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/I18nService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/I18nService.java similarity index 79% rename from spring-security/official/src/main/java/com/spring/service/system/I18nService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/I18nService.java index 79ef7f5..de82043 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/I18nService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/I18nService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.I18nDto; -import com.spring.domain.entity.I18nEntity; -import com.spring.domain.vo.I18nVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.step1.bean.dto.system.I18nDto; +import com.spring.step1.bean.entity.I18nEntity; +import com.spring.step1.bean.vo.I18nVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/I18nTypeService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/I18nTypeService.java similarity index 79% rename from spring-security/official/src/main/java/com/spring/service/system/I18nTypeService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/I18nTypeService.java index 9491d8c..102a923 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/I18nTypeService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/I18nTypeService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.I18nTypeDto; -import com.spring.domain.entity.I18nTypeEntity; -import com.spring.domain.vo.I18nTypeVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.step1.bean.dto.system.I18nTypeDto; +import com.spring.step1.bean.entity.I18nTypeEntity; +import com.spring.step1.bean.vo.I18nTypeVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/MenuIconService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/MenuIconService.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/service/sample/MenuIconService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/MenuIconService.java index 9bace8b..8da1357 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/MenuIconService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/MenuIconService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.MenuIconDto; -import com.spring.bean.entity.MenuIconEntity; -import com.spring.bean.vo.MenuIconVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.step1.bean.dto.system.MenuIconDto; +import com.spring.step1.bean.entity.MenuIconEntity; +import com.spring.step1.bean.vo.MenuIconVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/MessageReceivedService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/MessageReceivedService.java similarity index 78% rename from spring-security/official/src/main/java/com/spring/service/system/MessageReceivedService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/MessageReceivedService.java index 4cd6161..80f0041 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/MessageReceivedService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/MessageReceivedService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.MessageReceivedDto; -import com.spring.domain.entity.MessageReceivedEntity; -import com.spring.domain.vo.MessageReceivedVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.step1.bean.dto.system.MessageReceivedDto; +import com.spring.step1.bean.entity.MessageReceivedEntity; +import com.spring.step1.bean.vo.MessageReceivedVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/MessageService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/MessageService.java similarity index 79% rename from spring-security/step-1/src/main/java/com/spring/service/sample/MessageService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/MessageService.java index afd688b..ec69c44 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/MessageService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/MessageService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.MessageDto; -import com.spring.bean.entity.MessageEntity; -import com.spring.bean.vo.MessageVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.step1.bean.dto.system.MessageDto; +import com.spring.step1.bean.entity.MessageEntity; +import com.spring.step1.bean.vo.MessageVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/MessageTypeService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/MessageTypeService.java similarity index 80% rename from spring-security/official/src/main/java/com/spring/service/system/MessageTypeService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/MessageTypeService.java index ad05096..2ed0523 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/MessageTypeService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/MessageTypeService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.MessageTypeDto; -import com.spring.domain.entity.MessageTypeEntity; -import com.spring.domain.vo.MessageTypeVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.step1.bean.dto.system.MessageTypeDto; +import com.spring.step1.bean.entity.MessageTypeEntity; +import com.spring.step1.bean.vo.MessageTypeVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/PermissionService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/PermissionService.java similarity index 79% rename from spring-security/official/src/main/java/com/spring/service/system/PermissionService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/PermissionService.java index 6872bf9..57772af 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/PermissionService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/PermissionService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.PermissionDto; -import com.spring.domain.entity.PermissionEntity; -import com.spring.domain.vo.PermissionVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.step1.bean.dto.system.PermissionDto; +import com.spring.step1.bean.entity.PermissionEntity; +import com.spring.step1.bean.vo.PermissionVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/RolePermissionService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/RolePermissionService.java similarity index 80% rename from spring-security/official/src/main/java/com/spring/service/system/RolePermissionService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/RolePermissionService.java index 13027e4..f77f5a6 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/RolePermissionService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/RolePermissionService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.RolePermissionDto; -import com.spring.domain.entity.RolePermissionEntity; -import com.spring.domain.vo.RolePermissionVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.step1.bean.dto.system.RolePermissionDto; +import com.spring.step1.bean.entity.RolePermissionEntity; +import com.spring.step1.bean.vo.RolePermissionVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/RoleService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/RoleService.java similarity index 79% rename from spring-security/step-1/src/main/java/com/spring/service/sample/RoleService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/RoleService.java index 0c592c2..3e6a97c 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/RoleService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/RoleService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.RoleDto; -import com.spring.bean.entity.RoleEntity; -import com.spring.bean.vo.RoleVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.step1.bean.dto.system.RoleDto; +import com.spring.step1.bean.entity.RoleEntity; +import com.spring.step1.bean.vo.RoleVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/RouterRoleService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/RouterRoleService.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/service/sample/RouterRoleService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/RouterRoleService.java index 1ddacfd..22785f7 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/RouterRoleService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/RouterRoleService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.RouterRoleDto; -import com.spring.bean.entity.RouterRoleEntity; -import com.spring.bean.vo.RouterRoleVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.step1.bean.dto.system.RouterRoleDto; +import com.spring.step1.bean.entity.RouterRoleEntity; +import com.spring.step1.bean.vo.RouterRoleVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/RouterService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/RouterService.java similarity index 79% rename from spring-security/official/src/main/java/com/spring/service/system/RouterService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/RouterService.java index 69d12d3..170436c 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/RouterService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/RouterService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.RouterDto; -import com.spring.domain.entity.RouterEntity; -import com.spring.domain.vo.RouterVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.step1.bean.dto.system.RouterDto; +import com.spring.step1.bean.entity.RouterEntity; +import com.spring.step1.bean.vo.RouterVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/UserDeptService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/UserDeptService.java similarity index 80% rename from spring-security/official/src/main/java/com/spring/service/system/UserDeptService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/UserDeptService.java index 9feca96..6e1f035 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/UserDeptService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/UserDeptService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.UserDeptDto; -import com.spring.domain.entity.UserDeptEntity; -import com.spring.domain.vo.UserDeptVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.step1.bean.dto.system.UserDeptDto; +import com.spring.step1.bean.entity.UserDeptEntity; +import com.spring.step1.bean.vo.UserDeptVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/UserLoginService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/UserLoginService.java similarity index 80% rename from spring-security/official/src/main/java/com/spring/service/system/UserLoginService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/UserLoginService.java index fbe1d60..85cdce5 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/UserLoginService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/UserLoginService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.UserLoginDto; -import com.spring.domain.entity.UserLoginEntity; -import com.spring.domain.vo.UserLoginVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.step1.bean.dto.system.UserLoginDto; +import com.spring.step1.bean.entity.UserLoginEntity; +import com.spring.step1.bean.vo.UserLoginVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/UserRoleService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/UserRoleService.java similarity index 80% rename from spring-security/step-1/src/main/java/com/spring/service/sample/UserRoleService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/UserRoleService.java index 0ea23ee..58ef906 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/UserRoleService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/UserRoleService.java @@ -1,11 +1,11 @@ -package com.spring.service.sample; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.bean.dto.system.UserRoleDto; -import com.spring.bean.entity.UserRoleEntity; -import com.spring.bean.vo.UserRoleVo; -import com.spring.bean.vo.result.PageResult; +import com.spring.step1.bean.dto.system.UserRoleDto; +import com.spring.step1.bean.entity.UserRoleEntity; +import com.spring.step1.bean.vo.UserRoleVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/UserService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/UserService.java similarity index 79% rename from spring-security/official/src/main/java/com/spring/service/system/UserService.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/UserService.java index 35939ae..ff8f85e 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/UserService.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/UserService.java @@ -1,11 +1,11 @@ -package com.spring.service.system; +package com.spring.step1.service.sample; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.spring.domain.dto.system.UserDto; -import com.spring.domain.entity.UserEntity; -import com.spring.domain.vo.UserVo; -import com.spring.domain.vo.result.PageResult; +import com.spring.step1.bean.dto.system.UserDto; +import com.spring.step1.bean.entity.UserEntity; +import com.spring.step1.bean.vo.UserVo; +import com.spring.step1.bean.vo.result.PageResult; import java.util.List; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/DeptServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/DeptServiceImpl.java similarity index 85% rename from spring-security/official/src/main/java/com/spring/service/system/impl/DeptServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/DeptServiceImpl.java index 1131a11..1bb2a28 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/DeptServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/DeptServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.step1.service.sample.impl; 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.spring.domain.dto.system.DeptDto; -import com.spring.domain.entity.DeptEntity; -import com.spring.domain.vo.DeptVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.DeptMapper; -import com.spring.service.system.DeptService; +import com.spring.step1.bean.dto.system.DeptDto; +import com.spring.step1.bean.entity.DeptEntity; +import com.spring.step1.bean.vo.DeptVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.DeptMapper; +import com.spring.step1.service.sample.DeptService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/EmailTemplateServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/EmailTemplateServiceImpl.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/EmailTemplateServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/EmailTemplateServiceImpl.java index eeb0715..54a99a2 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/EmailTemplateServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/EmailTemplateServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.step1.service.sample.impl; 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.spring.bean.dto.system.EmailTemplateDto; -import com.spring.bean.entity.EmailTemplateEntity; -import com.spring.bean.vo.EmailTemplateVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.EmailTemplateMapper; -import com.spring.service.sample.EmailTemplateService; +import com.spring.step1.bean.dto.system.EmailTemplateDto; +import com.spring.step1.bean.entity.EmailTemplateEntity; +import com.spring.step1.bean.vo.EmailTemplateVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.EmailTemplateMapper; +import com.spring.step1.service.sample.EmailTemplateService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/EmailUsersServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/EmailUsersServiceImpl.java similarity index 85% rename from spring-security/official/src/main/java/com/spring/service/system/impl/EmailUsersServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/EmailUsersServiceImpl.java index e3c7836..b0f1513 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/EmailUsersServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/EmailUsersServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.step1.service.sample.impl; 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.spring.domain.dto.system.EmailUsersDto; -import com.spring.domain.entity.EmailUsersEntity; -import com.spring.domain.vo.EmailUsersVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.EmailUsersMapper; -import com.spring.service.system.EmailUsersService; +import com.spring.step1.bean.dto.system.EmailUsersDto; +import com.spring.step1.bean.entity.EmailUsersEntity; +import com.spring.step1.bean.vo.EmailUsersVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.EmailUsersMapper; +import com.spring.step1.service.sample.EmailUsersService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/FilesPartDetailServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/FilesPartDetailServiceImpl.java similarity index 87% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/FilesPartDetailServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/FilesPartDetailServiceImpl.java index e7e11fe..46352cb 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/FilesPartDetailServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/FilesPartDetailServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.step1.service.sample.impl; 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.spring.bean.dto.system.FilesPartDetailDto; -import com.spring.bean.entity.FilesPartDetailEntity; -import com.spring.bean.vo.FilesPartDetailVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.FilesPartDetailMapper; -import com.spring.service.sample.FilesPartDetailService; +import com.spring.step1.bean.dto.system.FilesPartDetailDto; +import com.spring.step1.bean.entity.FilesPartDetailEntity; +import com.spring.step1.bean.vo.FilesPartDetailVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.FilesPartDetailMapper; +import com.spring.step1.service.sample.FilesPartDetailService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/FilesServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/FilesServiceImpl.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/FilesServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/FilesServiceImpl.java index 8eee78f..8535ab3 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/FilesServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/FilesServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.step1.service.sample.impl; 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.spring.bean.dto.system.FilesDto; -import com.spring.bean.entity.FilesEntity; -import com.spring.bean.vo.FilesVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.FilesMapper; -import com.spring.service.sample.FilesService; +import com.spring.step1.bean.dto.system.FilesDto; +import com.spring.step1.bean.entity.FilesEntity; +import com.spring.step1.bean.vo.FilesVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.FilesMapper; +import com.spring.step1.service.sample.FilesService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/I18nServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/I18nServiceImpl.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/I18nServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/I18nServiceImpl.java index 66915f0..b6cacc9 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/I18nServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/I18nServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.step1.service.sample.impl; 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.spring.bean.dto.system.I18nDto; -import com.spring.bean.entity.I18nEntity; -import com.spring.bean.vo.I18nVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.I18nMapper; -import com.spring.service.sample.I18nService; +import com.spring.step1.bean.dto.system.I18nDto; +import com.spring.step1.bean.entity.I18nEntity; +import com.spring.step1.bean.vo.I18nVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.I18nMapper; +import com.spring.step1.service.sample.I18nService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/I18nTypeServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/I18nTypeServiceImpl.java similarity index 85% rename from spring-security/official/src/main/java/com/spring/service/system/impl/I18nTypeServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/I18nTypeServiceImpl.java index 755b7c9..8f16008 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/I18nTypeServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/I18nTypeServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.step1.service.sample.impl; 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.spring.domain.dto.system.I18nTypeDto; -import com.spring.domain.entity.I18nTypeEntity; -import com.spring.domain.vo.I18nTypeVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.I18nTypeMapper; -import com.spring.service.system.I18nTypeService; +import com.spring.step1.bean.dto.system.I18nTypeDto; +import com.spring.step1.bean.entity.I18nTypeEntity; +import com.spring.step1.bean.vo.I18nTypeVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.I18nTypeMapper; +import com.spring.step1.service.sample.I18nTypeService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/MenuIconServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/MenuIconServiceImpl.java similarity index 86% rename from spring-security/official/src/main/java/com/spring/service/system/impl/MenuIconServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/MenuIconServiceImpl.java index 56b254d..ccc4a37 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/MenuIconServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/MenuIconServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.step1.service.sample.impl; 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.spring.domain.dto.system.MenuIconDto; -import com.spring.domain.entity.MenuIconEntity; -import com.spring.domain.vo.MenuIconVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.MenuIconMapper; -import com.spring.service.system.MenuIconService; +import com.spring.step1.bean.dto.system.MenuIconDto; +import com.spring.step1.bean.entity.MenuIconEntity; +import com.spring.step1.bean.vo.MenuIconVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.MenuIconMapper; +import com.spring.step1.service.sample.MenuIconService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/MessageReceivedServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/MessageReceivedServiceImpl.java similarity index 84% rename from spring-security/official/src/main/java/com/spring/service/system/impl/MessageReceivedServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/MessageReceivedServiceImpl.java index 7935e08..31b5add 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/MessageReceivedServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/MessageReceivedServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.step1.service.sample.impl; 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.spring.domain.dto.system.MessageReceivedDto; -import com.spring.domain.entity.MessageReceivedEntity; -import com.spring.domain.vo.MessageReceivedVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.MessageReceivedMapper; -import com.spring.service.system.MessageReceivedService; +import com.spring.step1.bean.dto.system.MessageReceivedDto; +import com.spring.step1.bean.entity.MessageReceivedEntity; +import com.spring.step1.bean.vo.MessageReceivedVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.MessageReceivedMapper; +import com.spring.step1.service.sample.MessageReceivedService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/MessageServiceImpl.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/MessageServiceImpl.java index 0a4a4e1..361bf19 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/MessageServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.step1.service.sample.impl; 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.spring.bean.dto.system.MessageDto; -import com.spring.bean.entity.MessageEntity; -import com.spring.bean.vo.MessageVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.MessageMapper; -import com.spring.service.sample.MessageService; +import com.spring.step1.bean.dto.system.MessageDto; +import com.spring.step1.bean.entity.MessageEntity; +import com.spring.step1.bean.vo.MessageVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.MessageMapper; +import com.spring.step1.service.sample.MessageService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageTypeServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/MessageTypeServiceImpl.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageTypeServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/MessageTypeServiceImpl.java index 147e22a..0543bc9 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/MessageTypeServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/MessageTypeServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.step1.service.sample.impl; 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.spring.bean.dto.system.MessageTypeDto; -import com.spring.bean.entity.MessageTypeEntity; -import com.spring.bean.vo.MessageTypeVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.MessageTypeMapper; -import com.spring.service.sample.MessageTypeService; +import com.spring.step1.bean.dto.system.MessageTypeDto; +import com.spring.step1.bean.entity.MessageTypeEntity; +import com.spring.step1.bean.vo.MessageTypeVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.MessageTypeMapper; +import com.spring.step1.service.sample.MessageTypeService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/PermissionServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/PermissionServiceImpl.java similarity index 85% rename from spring-security/official/src/main/java/com/spring/service/system/impl/PermissionServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/PermissionServiceImpl.java index 6dd59d7..7265c8e 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/PermissionServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/PermissionServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.step1.service.sample.impl; 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.spring.domain.dto.system.PermissionDto; -import com.spring.domain.entity.PermissionEntity; -import com.spring.domain.vo.PermissionVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.PermissionMapper; -import com.spring.service.system.PermissionService; +import com.spring.step1.bean.dto.system.PermissionDto; +import com.spring.step1.bean.entity.PermissionEntity; +import com.spring.step1.bean.vo.PermissionVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.PermissionMapper; +import com.spring.step1.service.sample.PermissionService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RolePermissionServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/RolePermissionServiceImpl.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/RolePermissionServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/RolePermissionServiceImpl.java index b961a18..ce2d2fc 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RolePermissionServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/RolePermissionServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.step1.service.sample.impl; 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.spring.bean.dto.system.RolePermissionDto; -import com.spring.bean.entity.RolePermissionEntity; -import com.spring.bean.vo.RolePermissionVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.RolePermissionMapper; -import com.spring.service.sample.RolePermissionService; +import com.spring.step1.bean.dto.system.RolePermissionDto; +import com.spring.step1.bean.entity.RolePermissionEntity; +import com.spring.step1.bean.vo.RolePermissionVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.RolePermissionMapper; +import com.spring.step1.service.sample.RolePermissionService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RoleServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/RoleServiceImpl.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/RoleServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/RoleServiceImpl.java index 74ab676..1e36fb4 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RoleServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/RoleServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.step1.service.sample.impl; 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.spring.bean.dto.system.RoleDto; -import com.spring.bean.entity.RoleEntity; -import com.spring.bean.vo.RoleVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.RoleMapper; -import com.spring.service.sample.RoleService; +import com.spring.step1.bean.dto.system.RoleDto; +import com.spring.step1.bean.entity.RoleEntity; +import com.spring.step1.bean.vo.RoleVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.RoleMapper; +import com.spring.step1.service.sample.RoleService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RouterRoleServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/RouterRoleServiceImpl.java similarity index 86% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/RouterRoleServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/RouterRoleServiceImpl.java index 30a34f9..dad2119 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/RouterRoleServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/RouterRoleServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.step1.service.sample.impl; 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.spring.bean.dto.system.RouterRoleDto; -import com.spring.bean.entity.RouterRoleEntity; -import com.spring.bean.vo.RouterRoleVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.RouterRoleMapper; -import com.spring.service.sample.RouterRoleService; +import com.spring.step1.bean.dto.system.RouterRoleDto; +import com.spring.step1.bean.entity.RouterRoleEntity; +import com.spring.step1.bean.vo.RouterRoleVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.RouterRoleMapper; +import com.spring.step1.service.sample.RouterRoleService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/RouterServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/RouterServiceImpl.java similarity index 85% rename from spring-security/official/src/main/java/com/spring/service/system/impl/RouterServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/RouterServiceImpl.java index 14db4ed..285c543 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/RouterServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/RouterServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.step1.service.sample.impl; 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.spring.domain.dto.system.RouterDto; -import com.spring.domain.entity.RouterEntity; -import com.spring.domain.vo.RouterVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.RouterMapper; -import com.spring.service.system.RouterService; +import com.spring.step1.bean.dto.system.RouterDto; +import com.spring.step1.bean.entity.RouterEntity; +import com.spring.step1.bean.vo.RouterVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.RouterMapper; +import com.spring.step1.service.sample.RouterService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/UserDeptServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/UserDeptServiceImpl.java similarity index 85% rename from spring-security/official/src/main/java/com/spring/service/system/impl/UserDeptServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/UserDeptServiceImpl.java index 2a4296d..4cc077a 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/UserDeptServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/UserDeptServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.step1.service.sample.impl; 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.spring.domain.dto.system.UserDeptDto; -import com.spring.domain.entity.UserDeptEntity; -import com.spring.domain.vo.UserDeptVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.UserDeptMapper; -import com.spring.service.system.UserDeptService; +import com.spring.step1.bean.dto.system.UserDeptDto; +import com.spring.step1.bean.entity.UserDeptEntity; +import com.spring.step1.bean.vo.UserDeptVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.UserDeptMapper; +import com.spring.step1.service.sample.UserDeptService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/official/src/main/java/com/spring/service/system/impl/UserLoginServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/UserLoginServiceImpl.java similarity index 85% rename from spring-security/official/src/main/java/com/spring/service/system/impl/UserLoginServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/UserLoginServiceImpl.java index af63e48..0eaa8ba 100644 --- a/spring-security/official/src/main/java/com/spring/service/system/impl/UserLoginServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/UserLoginServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.system.impl; +package com.spring.step1.service.sample.impl; 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.spring.domain.dto.system.UserLoginDto; -import com.spring.domain.entity.UserLoginEntity; -import com.spring.domain.vo.UserLoginVo; -import com.spring.domain.vo.result.PageResult; -import com.spring.mapper.UserLoginMapper; -import com.spring.service.system.UserLoginService; +import com.spring.step1.bean.dto.system.UserLoginDto; +import com.spring.step1.bean.entity.UserLoginEntity; +import com.spring.step1.bean.vo.UserLoginVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.UserLoginMapper; +import com.spring.step1.service.sample.UserLoginService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserRoleServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/UserRoleServiceImpl.java similarity index 86% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserRoleServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/UserRoleServiceImpl.java index f0fcd03..e1d2714 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserRoleServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/UserRoleServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.step1.service.sample.impl; 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.spring.bean.dto.system.UserRoleDto; -import com.spring.bean.entity.UserRoleEntity; -import com.spring.bean.vo.UserRoleVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.UserRoleMapper; -import com.spring.service.sample.UserRoleService; +import com.spring.step1.bean.dto.system.UserRoleDto; +import com.spring.step1.bean.entity.UserRoleEntity; +import com.spring.step1.bean.vo.UserRoleVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.UserRoleMapper; +import com.spring.step1.service.sample.UserRoleService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserServiceImpl.java b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/UserServiceImpl.java similarity index 85% rename from spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserServiceImpl.java rename to spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/UserServiceImpl.java index 8b8749a..4b85c79 100644 --- a/spring-security/step-1/src/main/java/com/spring/service/sample/impl/UserServiceImpl.java +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/sample/impl/UserServiceImpl.java @@ -1,14 +1,14 @@ -package com.spring.service.sample.impl; +package com.spring.step1.service.sample.impl; 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.spring.bean.dto.system.UserDto; -import com.spring.bean.entity.UserEntity; -import com.spring.bean.vo.UserVo; -import com.spring.bean.vo.result.PageResult; -import com.spring.mapper.UserMapper; -import com.spring.service.sample.UserService; +import com.spring.step1.bean.dto.system.UserDto; +import com.spring.step1.bean.entity.UserEntity; +import com.spring.step1.bean.vo.UserVo; +import com.spring.step1.bean.vo.result.PageResult; +import com.spring.step1.mapper.UserMapper; +import com.spring.step1.service.sample.UserService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-security/step-1/src/main/java/com/spring/step1/service/security/LoginService.java b/spring-security/step-1/src/main/java/com/spring/step1/service/security/LoginService.java new file mode 100644 index 0000000..5f14dd6 --- /dev/null +++ b/spring-security/step-1/src/main/java/com/spring/step1/service/security/LoginService.java @@ -0,0 +1,4 @@ +package com.spring.step1.service.security; + +public interface LoginService { +} diff --git a/spring-security/step-1/src/main/resources/application.yml b/spring-security/step-1/src/main/resources/application.yml index 8b65d6d..57dd2e2 100644 --- a/spring-security/step-1/src/main/resources/application.yml +++ b/spring-security/step-1/src/main/resources/application.yml @@ -6,13 +6,20 @@ spring: name: spring-security profiles: active: dev + devtools: + livereload: + port: 0 datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://${bunny.master.host}:${bunny.master.port}/${bunny.master.database}?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true - username: ${bunny.master.username} - password: ${bunny.master.password} + dynamic: + primary: master + datasource: + master: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://${bunny.master.host}:${bunny.master.port}/${bunny.master.database}?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true + username: ${bunny.master.username} + password: ${bunny.master.password} hikari: maximum-pool-size: 20 connection-timeout: 30000 diff --git a/spring-security/step-1/src/main/resources/mapper/DeptMapper.xml b/spring-security/step-1/src/main/resources/mapper/DeptMapper.xml index 7794732..7313c8e 100644 --- a/spring-security/step-1/src/main/resources/mapper/DeptMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/DeptMapper.xml @@ -1,19 +1,19 @@ - + - - - - - - - - - - - + + + + + + + + + + + @@ -22,7 +22,7 @@ - select base.*, create_user.username as create_username, @@ -32,36 +32,36 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.parent_id like CONCAT('%',#{dto.parentId},'%') - - - and base.manager like CONCAT('%',#{dto.manager},'%') - - - and base.dept_name like CONCAT('%',#{dto.deptName},'%') - - - and base.summary like CONCAT('%',#{dto.summary},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.parent_id like CONCAT('%',#{dto.parentId},'%') + + + and base.manager like CONCAT('%',#{dto.manager},'%') + + + and base.dept_name like CONCAT('%',#{dto.deptName},'%') + + + and base.summary like CONCAT('%',#{dto.summary},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/EmailTemplateMapper.xml b/spring-security/step-1/src/main/resources/mapper/EmailTemplateMapper.xml index eb64eaa..10f1198 100644 --- a/spring-security/step-1/src/main/resources/mapper/EmailTemplateMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/EmailTemplateMapper.xml @@ -1,21 +1,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -24,7 +24,7 @@ - select base.*, create_user.username as create_username, @@ -34,42 +34,42 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.template_name like CONCAT('%',#{dto.templateName},'%') - - - and base.email_user like CONCAT('%',#{dto.emailUser},'%') - - - and base.subject like CONCAT('%',#{dto.subject},'%') - - - and base.body like CONCAT('%',#{dto.body},'%') - - - and base.type like CONCAT('%',#{dto.type},'%') - - - and base.is_default like CONCAT('%',#{dto.isDefault},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.template_name like CONCAT('%',#{dto.templateName},'%') + + + and base.email_user like CONCAT('%',#{dto.emailUser},'%') + + + and base.subject like CONCAT('%',#{dto.subject},'%') + + + and base.body like CONCAT('%',#{dto.body},'%') + + + and base.type like CONCAT('%',#{dto.type},'%') + + + and base.is_default like CONCAT('%',#{dto.isDefault},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/EmailUsersMapper.xml b/spring-security/step-1/src/main/resources/mapper/EmailUsersMapper.xml index b027726..0e03e7b 100644 --- a/spring-security/step-1/src/main/resources/mapper/EmailUsersMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/EmailUsersMapper.xml @@ -1,22 +1,22 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -25,7 +25,7 @@ - select base.*, create_user.username as create_username, @@ -35,45 +35,45 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.email like CONCAT('%',#{dto.email},'%') - - - and base.password like CONCAT('%',#{dto.password},'%') - - - and base.host like CONCAT('%',#{dto.host},'%') - - - and base.port like CONCAT('%',#{dto.port},'%') - - - and base.smtp_agreement like CONCAT('%',#{dto.smtpAgreement},'%') - - - and base.open_ssl like CONCAT('%',#{dto.openSsl},'%') - - - and base.is_default like CONCAT('%',#{dto.isDefault},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.email like CONCAT('%',#{dto.email},'%') + + + and base.password like CONCAT('%',#{dto.password},'%') + + + and base.host like CONCAT('%',#{dto.host},'%') + + + and base.port like CONCAT('%',#{dto.port},'%') + + + and base.smtp_agreement like CONCAT('%',#{dto.smtpAgreement},'%') + + + and base.open_ssl like CONCAT('%',#{dto.openSsl},'%') + + + and base.is_default like CONCAT('%',#{dto.isDefault},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/FilesMapper.xml b/spring-security/step-1/src/main/resources/mapper/FilesMapper.xml index b98eea4..0c4b472 100644 --- a/spring-security/step-1/src/main/resources/mapper/FilesMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/FilesMapper.xml @@ -1,42 +1,42 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,7 +45,7 @@ - select base.*, create_user.username as create_username, @@ -55,105 +55,105 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.url like CONCAT('%',#{dto.url},'%') - - - and base.size like CONCAT('%',#{dto.size},'%') - - - and base.file_size_str like CONCAT('%',#{dto.fileSizeStr},'%') - - - and base.filename like CONCAT('%',#{dto.filename},'%') - - - and base.original_filename like CONCAT('%',#{dto.originalFilename},'%') - - - and base.base_path like CONCAT('%',#{dto.basePath},'%') - - - and base.filepath like CONCAT('%',#{dto.filepath},'%') - - - and base.ext like CONCAT('%',#{dto.ext},'%') - - - and base.content_type like CONCAT('%',#{dto.contentType},'%') - - - and base.platform like CONCAT('%',#{dto.platform},'%') - - - and base.th_url like CONCAT('%',#{dto.thUrl},'%') - - - and base.th_filename like CONCAT('%',#{dto.thFilename},'%') - - - and base.th_size like CONCAT('%',#{dto.thSize},'%') - - - and base.th_content_type like CONCAT('%',#{dto.thContentType},'%') - - - and base.object_id like CONCAT('%',#{dto.objectId},'%') - - - and base.object_type like CONCAT('%',#{dto.objectType},'%') - - - and base.metadata like CONCAT('%',#{dto.metadata},'%') - - - and base.user_metadata like CONCAT('%',#{dto.userMetadata},'%') - - - and base.th_metadata like CONCAT('%',#{dto.thMetadata},'%') - - - and base.th_user_metadata like CONCAT('%',#{dto.thUserMetadata},'%') - - - and base.attr like CONCAT('%',#{dto.attr},'%') - - - and base.file_acl like CONCAT('%',#{dto.fileAcl},'%') - - - and base.th_file_acl like CONCAT('%',#{dto.thFileAcl},'%') - - - and base.hash_info like CONCAT('%',#{dto.hashInfo},'%') - - - and base.upload_id like CONCAT('%',#{dto.uploadId},'%') - - - and base.upload_status like CONCAT('%',#{dto.uploadStatus},'%') - - - and base.download_count like CONCAT('%',#{dto.downloadCount},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.url like CONCAT('%',#{dto.url},'%') + + + and base.size like CONCAT('%',#{dto.size},'%') + + + and base.file_size_str like CONCAT('%',#{dto.fileSizeStr},'%') + + + and base.filename like CONCAT('%',#{dto.filename},'%') + + + and base.original_filename like CONCAT('%',#{dto.originalFilename},'%') + + + and base.base_path like CONCAT('%',#{dto.basePath},'%') + + + and base.filepath like CONCAT('%',#{dto.filepath},'%') + + + and base.ext like CONCAT('%',#{dto.ext},'%') + + + and base.content_type like CONCAT('%',#{dto.contentType},'%') + + + and base.platform like CONCAT('%',#{dto.platform},'%') + + + and base.th_url like CONCAT('%',#{dto.thUrl},'%') + + + and base.th_filename like CONCAT('%',#{dto.thFilename},'%') + + + and base.th_size like CONCAT('%',#{dto.thSize},'%') + + + and base.th_content_type like CONCAT('%',#{dto.thContentType},'%') + + + and base.object_id like CONCAT('%',#{dto.objectId},'%') + + + and base.object_type like CONCAT('%',#{dto.objectType},'%') + + + and base.metadata like CONCAT('%',#{dto.metadata},'%') + + + and base.user_metadata like CONCAT('%',#{dto.userMetadata},'%') + + + and base.th_metadata like CONCAT('%',#{dto.thMetadata},'%') + + + and base.th_user_metadata like CONCAT('%',#{dto.thUserMetadata},'%') + + + and base.attr like CONCAT('%',#{dto.attr},'%') + + + and base.file_acl like CONCAT('%',#{dto.fileAcl},'%') + + + and base.th_file_acl like CONCAT('%',#{dto.thFileAcl},'%') + + + and base.hash_info like CONCAT('%',#{dto.hashInfo},'%') + + + and base.upload_id like CONCAT('%',#{dto.uploadId},'%') + + + and base.upload_status like CONCAT('%',#{dto.uploadStatus},'%') + + + and base.download_count like CONCAT('%',#{dto.downloadCount},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/FilesPartDetailMapper.xml b/spring-security/step-1/src/main/resources/mapper/FilesPartDetailMapper.xml index d19c5dc..273f2f3 100644 --- a/spring-security/step-1/src/main/resources/mapper/FilesPartDetailMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/FilesPartDetailMapper.xml @@ -1,21 +1,21 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -24,7 +24,7 @@ - select base.*, create_user.username as create_username, @@ -34,42 +34,42 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.platform like CONCAT('%',#{dto.platform},'%') - - - and base.upload_id like CONCAT('%',#{dto.uploadId},'%') - - - and base.e_tag like CONCAT('%',#{dto.eTag},'%') - - - and base.part_number like CONCAT('%',#{dto.partNumber},'%') - - - and base.part_size like CONCAT('%',#{dto.partSize},'%') - - - and base.hash_info like CONCAT('%',#{dto.hashInfo},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.platform like CONCAT('%',#{dto.platform},'%') + + + and base.upload_id like CONCAT('%',#{dto.uploadId},'%') + + + and base.e_tag like CONCAT('%',#{dto.eTag},'%') + + + and base.part_number like CONCAT('%',#{dto.partNumber},'%') + + + and base.part_size like CONCAT('%',#{dto.partSize},'%') + + + and base.hash_info like CONCAT('%',#{dto.hashInfo},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/I18nMapper.xml b/spring-security/step-1/src/main/resources/mapper/I18nMapper.xml index 0f13745..4ad0e33 100644 --- a/spring-security/step-1/src/main/resources/mapper/I18nMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/I18nMapper.xml @@ -1,18 +1,18 @@ - + - - - - - - - - - - + + + + + + + + + + @@ -21,7 +21,7 @@ - select base.*, create_user.username as create_username, @@ -31,33 +31,33 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.key_name like CONCAT('%',#{dto.keyName},'%') - - - and base.translation like CONCAT('%',#{dto.translation},'%') - - - and base.type_name like CONCAT('%',#{dto.typeName},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.key_name like CONCAT('%',#{dto.keyName},'%') + + + and base.translation like CONCAT('%',#{dto.translation},'%') + + + and base.type_name like CONCAT('%',#{dto.typeName},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/I18nTypeMapper.xml b/spring-security/step-1/src/main/resources/mapper/I18nTypeMapper.xml index 70f7954..a458d4b 100644 --- a/spring-security/step-1/src/main/resources/mapper/I18nTypeMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/I18nTypeMapper.xml @@ -1,18 +1,18 @@ - + - - - - - - - - - - + + + + + + + + + + @@ -21,7 +21,7 @@ - select base.*, create_user.username as create_username, @@ -31,33 +31,33 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.type_name like CONCAT('%',#{dto.typeName},'%') - - - and base.summary like CONCAT('%',#{dto.summary},'%') - - - and base.is_default like CONCAT('%',#{dto.isDefault},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.type_name like CONCAT('%',#{dto.typeName},'%') + + + and base.summary like CONCAT('%',#{dto.summary},'%') + + + and base.is_default like CONCAT('%',#{dto.isDefault},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/MenuIconMapper.xml b/spring-security/step-1/src/main/resources/mapper/MenuIconMapper.xml index 06b4e3e..ccb72c6 100644 --- a/spring-security/step-1/src/main/resources/mapper/MenuIconMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/MenuIconMapper.xml @@ -1,17 +1,17 @@ - + - - - - - - - - - + + + + + + + + + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, @@ -30,30 +30,30 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.icon_code like CONCAT('%',#{dto.iconCode},'%') - - - and base.icon_name like CONCAT('%',#{dto.iconName},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.icon_code like CONCAT('%',#{dto.iconCode},'%') + + + and base.icon_name like CONCAT('%',#{dto.iconName},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/MessageMapper.xml b/spring-security/step-1/src/main/resources/mapper/MessageMapper.xml index 1f939cc..f4aaabe 100644 --- a/spring-security/step-1/src/main/resources/mapper/MessageMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/MessageMapper.xml @@ -1,24 +1,24 @@ - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -27,7 +27,7 @@ - select base.*, create_user.username as create_username, @@ -37,51 +37,51 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.title like CONCAT('%',#{dto.title},'%') - - - and base.send_user_id like CONCAT('%',#{dto.sendUserId},'%') - - - and base.message_type like CONCAT('%',#{dto.messageType},'%') - - - and base.cover like CONCAT('%',#{dto.cover},'%') - - - and base.summary like CONCAT('%',#{dto.summary},'%') - - - and base.content like CONCAT('%',#{dto.content},'%') - - - and base.editor_type like CONCAT('%',#{dto.editorType},'%') - - - and base.level like CONCAT('%',#{dto.level},'%') - - - and base.extra like CONCAT('%',#{dto.extra},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.title like CONCAT('%',#{dto.title},'%') + + + and base.send_user_id like CONCAT('%',#{dto.sendUserId},'%') + + + and base.message_type like CONCAT('%',#{dto.messageType},'%') + + + and base.cover like CONCAT('%',#{dto.cover},'%') + + + and base.summary like CONCAT('%',#{dto.summary},'%') + + + and base.content like CONCAT('%',#{dto.content},'%') + + + and base.editor_type like CONCAT('%',#{dto.editorType},'%') + + + and base.level like CONCAT('%',#{dto.level},'%') + + + and base.extra like CONCAT('%',#{dto.extra},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/MessageReceivedMapper.xml b/spring-security/step-1/src/main/resources/mapper/MessageReceivedMapper.xml index 7114e07..dc72a01 100644 --- a/spring-security/step-1/src/main/resources/mapper/MessageReceivedMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/MessageReceivedMapper.xml @@ -1,18 +1,18 @@ - + - - - - - - - - - - + + + + + + + + + + @@ -21,7 +21,7 @@ - select base.*, create_user.username as create_username, @@ -31,33 +31,33 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.received_user_id like CONCAT('%',#{dto.receivedUserId},'%') - - - and base.message_id like CONCAT('%',#{dto.messageId},'%') - - - and base.status like CONCAT('%',#{dto.status},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.received_user_id like CONCAT('%',#{dto.receivedUserId},'%') + + + and base.message_id like CONCAT('%',#{dto.messageId},'%') + + + and base.status like CONCAT('%',#{dto.status},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/MessageTypeMapper.xml b/spring-security/step-1/src/main/resources/mapper/MessageTypeMapper.xml index 54d9481..544cf0c 100644 --- a/spring-security/step-1/src/main/resources/mapper/MessageTypeMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/MessageTypeMapper.xml @@ -1,19 +1,19 @@ - + - - - - - - - - - - - + + + + + + + + + + + @@ -22,7 +22,7 @@ - select base.*, create_user.username as create_username, @@ -32,36 +32,36 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.message_name like CONCAT('%',#{dto.messageName},'%') - - - and base.message_type like CONCAT('%',#{dto.messageType},'%') - - - and base.summary like CONCAT('%',#{dto.summary},'%') - - - and base.status like CONCAT('%',#{dto.status},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.message_name like CONCAT('%',#{dto.messageName},'%') + + + and base.message_type like CONCAT('%',#{dto.messageType},'%') + + + and base.summary like CONCAT('%',#{dto.summary},'%') + + + and base.status like CONCAT('%',#{dto.status},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/PermissionMapper.xml b/spring-security/step-1/src/main/resources/mapper/PermissionMapper.xml index 814f2c2..3ab22a9 100644 --- a/spring-security/step-1/src/main/resources/mapper/PermissionMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/PermissionMapper.xml @@ -1,20 +1,20 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + @@ -23,7 +23,7 @@ - select base.*, create_user.username as create_username, @@ -33,39 +33,39 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.parent_id like CONCAT('%',#{dto.parentId},'%') - - - and base.power_code like CONCAT('%',#{dto.powerCode},'%') - - - and base.power_name like CONCAT('%',#{dto.powerName},'%') - - - and base.request_url like CONCAT('%',#{dto.requestUrl},'%') - - - and base.request_method like CONCAT('%',#{dto.requestMethod},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.parent_id like CONCAT('%',#{dto.parentId},'%') + + + and base.power_code like CONCAT('%',#{dto.powerCode},'%') + + + and base.power_name like CONCAT('%',#{dto.powerName},'%') + + + and base.request_url like CONCAT('%',#{dto.requestUrl},'%') + + + and base.request_method like CONCAT('%',#{dto.requestMethod},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/RoleMapper.xml b/spring-security/step-1/src/main/resources/mapper/RoleMapper.xml index 5466f4a..6dd0cd6 100644 --- a/spring-security/step-1/src/main/resources/mapper/RoleMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/RoleMapper.xml @@ -1,17 +1,17 @@ - + - - - - - - - - - + + + + + + + + + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, @@ -30,30 +30,30 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.role_code like CONCAT('%',#{dto.roleCode},'%') - - - and base.description like CONCAT('%',#{dto.description},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.role_code like CONCAT('%',#{dto.roleCode},'%') + + + and base.description like CONCAT('%',#{dto.description},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/RolePermissionMapper.xml b/spring-security/step-1/src/main/resources/mapper/RolePermissionMapper.xml index 6f95d62..20a98d4 100644 --- a/spring-security/step-1/src/main/resources/mapper/RolePermissionMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/RolePermissionMapper.xml @@ -1,17 +1,17 @@ - + - - - - - - - - - + + + + + + + + + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, @@ -30,30 +30,30 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.role_id like CONCAT('%',#{dto.roleId},'%') - - - and base.power_id like CONCAT('%',#{dto.powerId},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.role_id like CONCAT('%',#{dto.roleId},'%') + + + and base.power_id like CONCAT('%',#{dto.powerId},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/RouterMapper.xml b/spring-security/step-1/src/main/resources/mapper/RouterMapper.xml index e5e49bc..57141c0 100644 --- a/spring-security/step-1/src/main/resources/mapper/RouterMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/RouterMapper.xml @@ -1,22 +1,22 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -25,7 +25,7 @@ - select base.*, create_user.username as create_username, @@ -35,45 +35,45 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.parent_id like CONCAT('%',#{dto.parentId},'%') - - - and base.path like CONCAT('%',#{dto.path},'%') - - - and base.route_name like CONCAT('%',#{dto.routeName},'%') - - - and base.component like CONCAT('%',#{dto.component},'%') - - - and base.redirect like CONCAT('%',#{dto.redirect},'%') - - - and base.menu_type like CONCAT('%',#{dto.menuType},'%') - - - and base.meta like CONCAT('%',#{dto.meta},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.parent_id like CONCAT('%',#{dto.parentId},'%') + + + and base.path like CONCAT('%',#{dto.path},'%') + + + and base.route_name like CONCAT('%',#{dto.routeName},'%') + + + and base.component like CONCAT('%',#{dto.component},'%') + + + and base.redirect like CONCAT('%',#{dto.redirect},'%') + + + and base.menu_type like CONCAT('%',#{dto.menuType},'%') + + + and base.meta like CONCAT('%',#{dto.meta},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/RouterRoleMapper.xml b/spring-security/step-1/src/main/resources/mapper/RouterRoleMapper.xml index 7863cad..3ccf935 100644 --- a/spring-security/step-1/src/main/resources/mapper/RouterRoleMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/RouterRoleMapper.xml @@ -1,17 +1,17 @@ - + - - - - - - - - - + + + + + + + + + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, @@ -30,30 +30,30 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.router_id like CONCAT('%',#{dto.routerId},'%') - - - and base.role_id like CONCAT('%',#{dto.roleId},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.router_id like CONCAT('%',#{dto.routerId},'%') + + + and base.role_id like CONCAT('%',#{dto.roleId},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/UserDeptMapper.xml b/spring-security/step-1/src/main/resources/mapper/UserDeptMapper.xml index e74f3b9..d5150cb 100644 --- a/spring-security/step-1/src/main/resources/mapper/UserDeptMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/UserDeptMapper.xml @@ -1,17 +1,17 @@ - + - - - - - - - - - + + + + + + + + + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, @@ -30,30 +30,30 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.user_id like CONCAT('%',#{dto.userId},'%') - - - and base.dept_id like CONCAT('%',#{dto.deptId},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.user_id like CONCAT('%',#{dto.userId},'%') + + + and base.dept_id like CONCAT('%',#{dto.deptId},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/UserLoginMapper.xml b/spring-security/step-1/src/main/resources/mapper/UserLoginMapper.xml index 4740c3b..dafe9d7 100644 --- a/spring-security/step-1/src/main/resources/mapper/UserLoginMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/UserLoginMapper.xml @@ -1,23 +1,23 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -26,7 +26,7 @@ - select base.*, create_user.username as create_username, @@ -36,48 +36,48 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.user_id like CONCAT('%',#{dto.userId},'%') - - - and base.username like CONCAT('%',#{dto.username},'%') - - - and base.token like CONCAT('%',#{dto.token},'%') - - - and base.ip_address like CONCAT('%',#{dto.ipAddress},'%') - - - and base.ip_region like CONCAT('%',#{dto.ipRegion},'%') - - - and base.user_agent like CONCAT('%',#{dto.userAgent},'%') - - - and base.type like CONCAT('%',#{dto.type},'%') - - - and base.x_requested_with like CONCAT('%',#{dto.xRequestedWith},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.user_id like CONCAT('%',#{dto.userId},'%') + + + and base.username like CONCAT('%',#{dto.username},'%') + + + and base.token like CONCAT('%',#{dto.token},'%') + + + and base.ip_address like CONCAT('%',#{dto.ipAddress},'%') + + + and base.ip_region like CONCAT('%',#{dto.ipRegion},'%') + + + and base.user_agent like CONCAT('%',#{dto.userAgent},'%') + + + and base.type like CONCAT('%',#{dto.type},'%') + + + and base.x_requested_with like CONCAT('%',#{dto.xRequestedWith},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/UserMapper.xml b/spring-security/step-1/src/main/resources/mapper/UserMapper.xml index 373e5ef..bb53129 100644 --- a/spring-security/step-1/src/main/resources/mapper/UserMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/UserMapper.xml @@ -1,26 +1,26 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -29,7 +29,7 @@ - select base.*, create_user.username as create_username, @@ -39,57 +39,57 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.username like CONCAT('%',#{dto.username},'%') - - - and base.nickname like CONCAT('%',#{dto.nickname},'%') - - - and base.email like CONCAT('%',#{dto.email},'%') - - - and base.phone like CONCAT('%',#{dto.phone},'%') - - - and base.password like CONCAT('%',#{dto.password},'%') - - - and base.avatar like CONCAT('%',#{dto.avatar},'%') - - - and base.sex like CONCAT('%',#{dto.sex},'%') - - - and base.summary like CONCAT('%',#{dto.summary},'%') - - - and base.ip_address like CONCAT('%',#{dto.ipAddress},'%') - - - and base.ip_region like CONCAT('%',#{dto.ipRegion},'%') - - - and base.status like CONCAT('%',#{dto.status},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.username like CONCAT('%',#{dto.username},'%') + + + and base.nickname like CONCAT('%',#{dto.nickname},'%') + + + and base.email like CONCAT('%',#{dto.email},'%') + + + and base.phone like CONCAT('%',#{dto.phone},'%') + + + and base.password like CONCAT('%',#{dto.password},'%') + + + and base.avatar like CONCAT('%',#{dto.avatar},'%') + + + and base.sex like CONCAT('%',#{dto.sex},'%') + + + and base.summary like CONCAT('%',#{dto.summary},'%') + + + and base.ip_address like CONCAT('%',#{dto.ipAddress},'%') + + + and base.ip_region like CONCAT('%',#{dto.ipRegion},'%') + + + and base.status like CONCAT('%',#{dto.status},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-1/src/main/resources/mapper/UserRoleMapper.xml b/spring-security/step-1/src/main/resources/mapper/UserRoleMapper.xml index 2b00976..0e23c36 100644 --- a/spring-security/step-1/src/main/resources/mapper/UserRoleMapper.xml +++ b/spring-security/step-1/src/main/resources/mapper/UserRoleMapper.xml @@ -1,17 +1,17 @@ - + - - - - - - - - - + + + + + + + + + @@ -20,7 +20,7 @@ - select base.*, create_user.username as create_username, @@ -30,30 +30,30 @@ left join sys_user update_user on update_user.id = base.update_user base.is_deleted = 0 - - and base.id like CONCAT('%',#{dto.id},'%') - - - and base.user_id like CONCAT('%',#{dto.userId},'%') - - - and base.role_id like CONCAT('%',#{dto.roleId},'%') - - - and base.create_time like CONCAT('%',#{dto.createTime},'%') - - - and base.update_time like CONCAT('%',#{dto.updateTime},'%') - - - and base.create_user like CONCAT('%',#{dto.createUser},'%') - - - and base.update_user like CONCAT('%',#{dto.updateUser},'%') - - - and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') - + + and base.id like CONCAT('%',#{dto.id},'%') + + + and base.user_id like CONCAT('%',#{dto.userId},'%') + + + and base.role_id like CONCAT('%',#{dto.roleId},'%') + + + and base.create_time like CONCAT('%',#{dto.createTime},'%') + + + and base.update_time like CONCAT('%',#{dto.updateTime},'%') + + + and base.create_user like CONCAT('%',#{dto.createUser},'%') + + + and base.update_user like CONCAT('%',#{dto.updateUser},'%') + + + and base.is_deleted like CONCAT('%',#{dto.isDeleted},'%') + diff --git a/spring-security/step-2/src/main/java/com/spring/bean/vo/package-info.java b/spring-security/step-2/src/main/java/com/spring/bean/vo/package-info.java deleted file mode 100644 index 970000e..0000000 --- a/spring-security/step-2/src/main/java/com/spring/bean/vo/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.spring.bean.vo; \ No newline at end of file diff --git a/spring-security/step-1/src/main/java/com/spring/SpringSecurityStep1Application.java b/spring-security/step-2/src/main/java/com/spring/step2/SpringSecurityStep2Application.java similarity index 60% rename from spring-security/step-1/src/main/java/com/spring/SpringSecurityStep1Application.java rename to spring-security/step-2/src/main/java/com/spring/step2/SpringSecurityStep2Application.java index d068ecb..4ccdd31 100644 --- a/spring-security/step-1/src/main/java/com/spring/SpringSecurityStep1Application.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/SpringSecurityStep2Application.java @@ -1,11 +1,11 @@ -package com.spring; +package com.spring.step2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class SpringSecurityStep1Application { +public class SpringSecurityStep2Application { public static void main(String[] args) { - SpringApplication.run(SpringSecurityStep1Application.class, args); + SpringApplication.run(SpringSecurityStep2Application.class, args); } } diff --git a/spring-security/step-2/src/main/java/com/spring/step2/config/ControllerStringParamTrimConfig.java b/spring-security/step-2/src/main/java/com/spring/step2/config/ControllerStringParamTrimConfig.java new file mode 100644 index 0000000..095b2b3 --- /dev/null +++ b/spring-security/step-2/src/main/java/com/spring/step2/config/ControllerStringParamTrimConfig.java @@ -0,0 +1,50 @@ +package com.spring.step2.config; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer; +import org.springframework.beans.propertyeditors.StringTrimmerEditor; +import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.InitBinder; + +import java.io.IOException; + +/** + * 去除前端传递的空格 + */ +@ControllerAdvice +public class ControllerStringParamTrimConfig { + + /** + * 创建 String trim 编辑器 + * 构造方法中 boolean 参数含义为如果是空白字符串,是否转换为null + * 即如果为true,那么 " " 会被转换为 null,否者为 "" + */ + @InitBinder + public void initBinder(WebDataBinder binder) { + StringTrimmerEditor propertyEditor = new StringTrimmerEditor(false); + // 为 String 类对象注册编辑器 + binder.registerCustomEditor(String.class, propertyEditor); + } + + @Bean + public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer() { + return jacksonObjectMapperBuilder -> { + // 为 String 类型自定义反序列化操作 + jacksonObjectMapperBuilder + .deserializerByType(String.class, new StdScalarDeserializer(String.class) { + @Override + public String deserialize(JsonParser jsonParser, DeserializationContext ctx) throws IOException { + // // 去除全部空格 + // return StringUtils.trimAllWhitespace(jsonParser.getValueAsString()); + + // 仅去除前后空格 + return jsonParser.getValueAsString().trim(); + } + }); + }; + } +} \ No newline at end of file diff --git a/spring-security/step-2/src/main/java/com/spring/config/Knife4jConfig.java b/spring-security/step-2/src/main/java/com/spring/step2/config/Knife4jConfig.java similarity index 98% rename from spring-security/step-2/src/main/java/com/spring/config/Knife4jConfig.java rename to spring-security/step-2/src/main/java/com/spring/step2/config/Knife4jConfig.java index cfee8e3..1adf6da 100644 --- a/spring-security/step-2/src/main/java/com/spring/config/Knife4jConfig.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/config/Knife4jConfig.java @@ -1,4 +1,4 @@ -package com.spring.config; +package com.spring.step2.config; import io.swagger.v3.oas.models.ExternalDocumentation; import io.swagger.v3.oas.models.OpenAPI; diff --git a/spring-security/step-2/src/main/java/com/spring/step2/config/MybatisPlusConfig.java b/spring-security/step-2/src/main/java/com/spring/step2/config/MybatisPlusConfig.java new file mode 100644 index 0000000..81fba17 --- /dev/null +++ b/spring-security/step-2/src/main/java/com/spring/step2/config/MybatisPlusConfig.java @@ -0,0 +1,35 @@ +package com.spring.step2.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +@EnableTransactionManagement +@Configuration +public class MybatisPlusConfig { + + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + // 拦截器 + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + + // 使用分页插件 + PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); + paginationInnerInterceptor.setDbType(DbType.MYSQL); + paginationInnerInterceptor.setMaxLimit(600L); + interceptor.addInnerInterceptor(paginationInnerInterceptor); + + // 乐观锁 + interceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor()); + + // 防止全表删除 + interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor()); + + return interceptor; + } +} diff --git a/spring-security/step-2/src/main/java/com/spring/controller/CheckController.java b/spring-security/step-2/src/main/java/com/spring/step2/controller/CheckController.java similarity index 95% rename from spring-security/step-2/src/main/java/com/spring/controller/CheckController.java rename to spring-security/step-2/src/main/java/com/spring/step2/controller/CheckController.java index 3e4b78b..85c3108 100644 --- a/spring-security/step-2/src/main/java/com/spring/controller/CheckController.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/controller/CheckController.java @@ -1,4 +1,4 @@ -package com.spring.controller; +package com.spring.step2.controller; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.core.Authentication; diff --git a/spring-security/step-2/src/main/java/com/spring/controller/LoginController.java b/spring-security/step-2/src/main/java/com/spring/step2/controller/LoginController.java similarity index 89% rename from spring-security/step-2/src/main/java/com/spring/controller/LoginController.java rename to spring-security/step-2/src/main/java/com/spring/step2/controller/LoginController.java index ba7483e..74dc734 100644 --- a/spring-security/step-2/src/main/java/com/spring/controller/LoginController.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/controller/LoginController.java @@ -1,4 +1,4 @@ -package com.spring.controller; +package com.spring.step2.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/spring-security/step-2/src/main/java/com/spring/bean/dto/LoginRequest.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/LoginRequest.java similarity index 93% rename from spring-security/step-2/src/main/java/com/spring/bean/dto/LoginRequest.java rename to spring-security/step-2/src/main/java/com/spring/step2/domain/dto/LoginRequest.java index e50ae7d..4163ef5 100644 --- a/spring-security/step-2/src/main/java/com/spring/bean/dto/LoginRequest.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/LoginRequest.java @@ -1,4 +1,4 @@ -package com.spring.bean.dto; +package com.spring.step2.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/UsersDto.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/UsersDto.java new file mode 100644 index 0000000..cb22ec9 --- /dev/null +++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/UsersDto.java @@ -0,0 +1,31 @@ +package com.spring.step2.domain.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "UsersDTO对象", title = "", description = "的DTO对象") +public class UsersDto { + + @Schema(name = "username", title = "username") + private String username; + + @Schema(name = "password", title = "password") + private String password; + + @Schema(name = "enabled", title = "enabled") + private Boolean enabled; + + @Schema(name = "id", title = "主键") + private String id; + + @Schema(name = "email", title = "邮箱") + private String email; + +} \ No newline at end of file diff --git a/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/BaseEntity.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/BaseEntity.java new file mode 100644 index 0000000..9087675 --- /dev/null +++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/BaseEntity.java @@ -0,0 +1,48 @@ +package com.spring.step2.domain.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Getter +@Setter +@Schema(name = "BaseEntity", title = "基础信息字段", description = "基础信息字段") +public class BaseEntity implements Serializable { + + @Schema(name = "id", title = "唯一标识") + @TableId(value = "id", type = IdType.ASSIGN_ID) + @JsonFormat(shape = JsonFormat.Shape.STRING) + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + @Schema(name = "createTime", title = "创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + @Schema(name = "updateTime", title = "更新时间") + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; + + @Schema(name = "createUser", title = "创建用户") + @TableField(fill = FieldFill.INSERT) + @JsonFormat(shape = JsonFormat.Shape.STRING) + @JsonSerialize(using = ToStringSerializer.class) + private Long createUser; + + @Schema(name = "updateUser", title = "操作用户") + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(shape = JsonFormat.Shape.STRING) + @JsonSerialize(using = ToStringSerializer.class) + private Long updateUser; + +} \ No newline at end of file diff --git a/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/UsersEntity.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/UsersEntity.java new file mode 100644 index 0000000..4c5b17b --- /dev/null +++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/UsersEntity.java @@ -0,0 +1,31 @@ +package com.spring.step2.domain.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +@Getter +@Setter +@Accessors(chain = true) +@TableName("users") +@Schema(name = "Users对象", title = "", description = "的实体类对象") +public class UsersEntity { + + @Schema(name = "username", title = "username") + @TableId(type = IdType.ASSIGN_ID) + private String username; + + @Schema(name = "password", title = "password") + private String password; + + @Schema(name = "id", title = "主键") + private String id; + + @Schema(name = "email", title = "邮箱") + private String email; + +} \ No newline at end of file diff --git a/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/UsersVo.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/UsersVo.java new file mode 100644 index 0000000..59a1004 --- /dev/null +++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/UsersVo.java @@ -0,0 +1,30 @@ +package com.spring.step2.domain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Schema(name = "UsersVO对象", title = "", description = "的VO对象") +public class UsersVo { + + @Schema(name = "username", title = "username") + private String username; + + @Schema(name = "password", title = "password") + private String password; + + @Schema(name = "enabled", title = "enabled") + private Boolean enabled; + + @Schema(name = "id", title = "主键") + private String id; + + @Schema(name = "email", title = "邮箱") + private String email; + +} + diff --git a/spring-security/step-2/src/main/java/com/spring/bean/vo/result/PageResult.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/PageResult.java similarity index 94% rename from spring-security/step-2/src/main/java/com/spring/bean/vo/result/PageResult.java rename to spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/PageResult.java index 2a63921..de47b7e 100644 --- a/spring-security/step-2/src/main/java/com/spring/bean/vo/result/PageResult.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/PageResult.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo.result; +package com.spring.step2.domain.vo.result; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/spring-security/official/src/main/java/com/spring/domain/vo/result/Result.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/Result.java similarity index 98% rename from spring-security/official/src/main/java/com/spring/domain/vo/result/Result.java rename to spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/Result.java index 49a353d..b808bf6 100644 --- a/spring-security/official/src/main/java/com/spring/domain/vo/result/Result.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/Result.java @@ -1,4 +1,4 @@ -package com.spring.domain.vo.result; +package com.spring.step2.domain.vo.result; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/spring-security/step-1/src/main/java/com/spring/bean/vo/result/ResultCodeEnum.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/ResultCodeEnum.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/bean/vo/result/ResultCodeEnum.java rename to spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/ResultCodeEnum.java index 7ab3b98..cd9e4a6 100644 --- a/spring-security/step-1/src/main/java/com/spring/bean/vo/result/ResultCodeEnum.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/result/ResultCodeEnum.java @@ -1,4 +1,4 @@ -package com.spring.bean.vo.result; +package com.spring.step2.domain.vo.result; import lombok.Getter; diff --git a/spring-security/step-2/src/main/java/com/spring/step2/mapper/UsersMapper.java b/spring-security/step-2/src/main/java/com/spring/step2/mapper/UsersMapper.java new file mode 100644 index 0000000..b9b4b41 --- /dev/null +++ b/spring-security/step-2/src/main/java/com/spring/step2/mapper/UsersMapper.java @@ -0,0 +1,34 @@ +package com.spring.step2.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.step2.domain.dto.UsersDto; +import com.spring.step2.domain.entity.UsersEntity; +import com.spring.step2.domain.vo.UsersVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author Bunny + * @since 2025-07-11 14:49:46 + */ +@DS("testJwt") +@Mapper +public interface UsersMapper extends BaseMapper { + + /** + * * 分页查询内容 + * + * @param pageParams 分页参数 + * @param dto 查询表单 + * @return 分页结果 + */ + IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") UsersDto dto); + +} diff --git a/spring-security/step-1/src/main/java/com/spring/security/config/SecurityConfiguration.java b/spring-security/step-2/src/main/java/com/spring/step2/security/config/SecurityConfiguration.java similarity index 98% rename from spring-security/step-1/src/main/java/com/spring/security/config/SecurityConfiguration.java rename to spring-security/step-2/src/main/java/com/spring/step2/security/config/SecurityConfiguration.java index 2279036..0ce879e 100644 --- a/spring-security/step-1/src/main/java/com/spring/security/config/SecurityConfiguration.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/security/config/SecurityConfiguration.java @@ -1,4 +1,4 @@ -package com.spring.security.config; +package com.spring.step2.security.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; diff --git a/spring-security/step-2/src/main/java/com/spring/security/config/SecurityWebConfiguration.java b/spring-security/step-2/src/main/java/com/spring/step2/security/config/SecurityWebConfiguration.java similarity index 73% rename from spring-security/step-2/src/main/java/com/spring/security/config/SecurityWebConfiguration.java rename to spring-security/step-2/src/main/java/com/spring/step2/security/config/SecurityWebConfiguration.java index ec537d2..ca56426 100644 --- a/spring-security/step-2/src/main/java/com/spring/security/config/SecurityWebConfiguration.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/security/config/SecurityWebConfiguration.java @@ -1,10 +1,9 @@ -package com.spring.security.config; +package com.spring.step2.security.config; -import com.spring.security.handler.SecurityAccessDeniedHandler; -import com.spring.security.handler.SecurityAuthenticationEntryPoint; +import com.spring.step2.security.handler.SecurityAccessDeniedHandler; +import com.spring.step2.security.handler.SecurityAuthenticationEntryPoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpMethod; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -25,14 +24,15 @@ public class SecurityWebConfiguration { }; http.authorizeHttpRequests(authorizeRequests -> - // 访问路径为 /api 时需要进行认证 - authorizeRequests - .requestMatchers(permitAllUrls).permitAll() - .requestMatchers("/api/security/**").permitAll() - .requestMatchers(HttpMethod.GET, "/api/anonymous/**").anonymous() - // 会自动变成 ROLE_ADMIN - // .requestMatchers("/api/**").hasRole("ADMIN") - .requestMatchers("/api/**").hasAnyAuthority("all", "read") + // 访问路径为 /api 时需要进行认证 + authorizeRequests + .requestMatchers(permitAllUrls).permitAll() + .anyRequest().permitAll() + // .requestMatchers("/api/security/**").permitAll() + // .requestMatchers(HttpMethod.GET, "/api/anonymous/**").anonymous() + // // 会自动变成 ROLE_ADMIN + // // .requestMatchers("/api/**").hasRole("ADMIN") + // .requestMatchers("/api/**").hasAnyAuthority("all", "read") ) .formLogin(loginPage -> loginPage // 自定义登录页路径 diff --git a/spring-security/step-1/src/main/java/com/spring/security/handler/SecurityAccessDeniedHandler.java b/spring-security/step-2/src/main/java/com/spring/step2/security/handler/SecurityAccessDeniedHandler.java similarity index 91% rename from spring-security/step-1/src/main/java/com/spring/security/handler/SecurityAccessDeniedHandler.java rename to spring-security/step-2/src/main/java/com/spring/step2/security/handler/SecurityAccessDeniedHandler.java index 661e686..a0cb48a 100644 --- a/spring-security/step-1/src/main/java/com/spring/security/handler/SecurityAccessDeniedHandler.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/security/handler/SecurityAccessDeniedHandler.java @@ -1,7 +1,7 @@ -package com.spring.security.handler; +package com.spring.step2.security.handler; import com.alibaba.fastjson2.JSON; -import com.spring.bean.vo.result.Result; +import com.spring.step2.domain.vo.result.Result; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/spring-security/step-2/src/main/java/com/spring/security/handler/SecurityAuthenticationEntryPoint.java b/spring-security/step-2/src/main/java/com/spring/step2/security/handler/SecurityAuthenticationEntryPoint.java similarity index 91% rename from spring-security/step-2/src/main/java/com/spring/security/handler/SecurityAuthenticationEntryPoint.java rename to spring-security/step-2/src/main/java/com/spring/step2/security/handler/SecurityAuthenticationEntryPoint.java index 7e48511..d54322e 100644 --- a/spring-security/step-2/src/main/java/com/spring/security/handler/SecurityAuthenticationEntryPoint.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/security/handler/SecurityAuthenticationEntryPoint.java @@ -1,7 +1,7 @@ -package com.spring.security.handler; +package com.spring.step2.security.handler; import com.alibaba.fastjson2.JSON; -import com.spring.bean.vo.result.Result; +import com.spring.step2.domain.vo.result.Result; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/spring-security/step-1/src/main/java/com/spring/security/password/MD5PasswordEncoder.java b/spring-security/step-2/src/main/java/com/spring/step2/security/password/MD5PasswordEncoder.java similarity index 97% rename from spring-security/step-1/src/main/java/com/spring/security/password/MD5PasswordEncoder.java rename to spring-security/step-2/src/main/java/com/spring/step2/security/password/MD5PasswordEncoder.java index 1cab71c..8fafb11 100644 --- a/spring-security/step-1/src/main/java/com/spring/security/password/MD5PasswordEncoder.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/security/password/MD5PasswordEncoder.java @@ -1,4 +1,4 @@ -package com.spring.security.password; +package com.spring.step2.security.password; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.util.DigestUtils; diff --git a/spring-security/step-2/src/main/java/com/spring/security/service/CustomUserDetailsService.java b/spring-security/step-2/src/main/java/com/spring/step2/security/service/CustomUserDetailsService.java similarity index 97% rename from spring-security/step-2/src/main/java/com/spring/security/service/CustomUserDetailsService.java rename to spring-security/step-2/src/main/java/com/spring/step2/security/service/CustomUserDetailsService.java index fb727b3..bda4f1b 100644 --- a/spring-security/step-2/src/main/java/com/spring/security/service/CustomUserDetailsService.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/security/service/CustomUserDetailsService.java @@ -1,4 +1,4 @@ -package com.spring.security.service; +package com.spring.step2.security.service; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.User; diff --git a/spring-security/step-2/src/main/java/com/spring/service/LoginService.java b/spring-security/step-2/src/main/java/com/spring/step2/service/LoginService.java similarity index 50% rename from spring-security/step-2/src/main/java/com/spring/service/LoginService.java rename to spring-security/step-2/src/main/java/com/spring/step2/service/LoginService.java index 53b86d5..8aa2b35 100644 --- a/spring-security/step-2/src/main/java/com/spring/service/LoginService.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/service/LoginService.java @@ -1,4 +1,4 @@ -package com.spring.service; +package com.spring.step2.service; public interface LoginService { } diff --git a/spring-security/official/src/main/java/com/spring/service/impl/LoginServiceImpl.java b/spring-security/step-2/src/main/java/com/spring/step2/service/impl/LoginServiceImpl.java similarity index 68% rename from spring-security/official/src/main/java/com/spring/service/impl/LoginServiceImpl.java rename to spring-security/step-2/src/main/java/com/spring/step2/service/impl/LoginServiceImpl.java index c7c96e7..08c49b0 100644 --- a/spring-security/official/src/main/java/com/spring/service/impl/LoginServiceImpl.java +++ b/spring-security/step-2/src/main/java/com/spring/step2/service/impl/LoginServiceImpl.java @@ -1,6 +1,6 @@ -package com.spring.service.impl; +package com.spring.step2.service.impl; -import com.spring.service.security.LoginService; +import com.spring.step2.service.LoginService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/spring-security/step-2/src/main/resources/application-dev.yml b/spring-security/step-2/src/main/resources/application-dev.yml index 833b8ce..78e7608 100644 --- a/spring-security/step-2/src/main/resources/application-dev.yml +++ b/spring-security/step-2/src/main/resources/application-dev.yml @@ -4,4 +4,10 @@ bunny: port: 3306 database: bunny_test username: bunny_test + password: "Test1234" + testJwt: + host: rm-bp12z6hlv46vi6g8mro.mysql.rds.aliyuncs.com + port: 3306 + database: test_jwt + username: bunny_test password: "Test1234" \ No newline at end of file diff --git a/spring-security/step-2/src/main/resources/application.yml b/spring-security/step-2/src/main/resources/application.yml index ac51e5a..84b18c7 100644 --- a/spring-security/step-2/src/main/resources/application.yml +++ b/spring-security/step-2/src/main/resources/application.yml @@ -6,13 +6,26 @@ spring: name: spring-security profiles: active: dev + devtools: + livereload: + port: 0 datasource: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://${bunny.master.host}:${bunny.master.port}/${bunny.master.database}?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true - username: ${bunny.master.username} - password: ${bunny.master.password} + dynamic: + primary: master + datasource: + master: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://${bunny.master.host}:${bunny.master.port}/${bunny.master.database}?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true + username: ${bunny.master.username} + password: ${bunny.master.password} + testJwt: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://${bunny.testJwt.host}:${bunny.testJwt.port}/${bunny.testJwt.database}?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf-8&allowPublicKeyRetrieval=true + username: ${bunny.testJwt.username} + password: ${bunny.testJwt.password} hikari: maximum-pool-size: 20 connection-timeout: 30000 @@ -24,9 +37,10 @@ mybatis-plus: mapper-locations: classpath:/mapper/*.xml global-config: db-config: - id-type: auto + id-type: assign_id logic-delete-value: 1 logic-not-delete-value: 0 + logic-delete-field: isDeleted logging: level: diff --git a/spring-security/step-2/src/main/resources/mapper/UsersMapper.xml b/spring-security/step-2/src/main/resources/mapper/UsersMapper.xml new file mode 100644 index 0000000..3705a92 --- /dev/null +++ b/spring-security/step-2/src/main/resources/mapper/UsersMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + username,password,Id,email + + + + + +