From 4fd45a1c8de0949d0b05080e776d329704a51afd Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Wed, 30 Apr 2025 17:49:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82Tok?= =?UTF-8?q?en;=E6=B7=BB=E5=8A=A0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReadMe.md | 22 ++- .../bunny/services/aop/JobExecuteAspect.java | 2 +- .../ConfigurationController.java | 4 +- .../EmailTemplateController.java | 6 +- .../configuration/EmailUsersController.java | 6 +- .../configuration/I18nController.java | 6 +- .../configuration/I18nTypeController.java | 4 +- .../configuration/MenuIconController.java | 6 +- .../log/ScheduleExecuteLogController.java | 6 +- .../log/UserLoginLogController.java | 6 +- .../controller/message/MessageController.java | 6 +- .../message/MessageReceivedController.java | 6 +- .../message/MessageTypeController.java | 6 +- .../schedule/SchedulersController.java | 6 +- .../schedule/SchedulersGroupController.java | 6 +- .../controller/system/DeptController.java | 6 +- .../controller/system/FilesController.java | 6 +- .../system/PermissionController.java | 6 +- .../controller/system/RoleController.java | 6 +- .../system/RolePermissionController.java | 2 +- .../controller/system/RouterController.java | 4 +- .../system/RouterRoleController.java | 2 +- .../controller/system/UserController.java | 8 +- .../controller/system/UserRoleController.java | 2 +- auh-api/src/main/resources/application.yml | 3 + .../ConfigurationControllerTest.java | 2 +- .../EmailTemplateControllerTest.java | 4 +- .../log/UserLoginLogControllerTest.java | 4 +- .../bunny/services/utils/TokenUtilsTest.java | 2 +- .../test/java/impl/I18nServiceImplTest.java | 2 +- .../config/mail/MailSenderConfiguration.java | 4 +- .../services/config/minio/MinioUtil.java | 4 +- .../bunny/services/context/BaseContext.java | 2 +- .../common/constant/RedisUserConstant.java | 2 - .../model/{ => dto}/email/EmailSend.java | 2 +- .../model/{ => dto}/email/EmailSendInit.java | 2 +- .../{ => model/dto}/excel/I18nExcel.java | 2 +- .../dto}/excel/PermissionExcel.java | 2 +- .../{ => model/dto}/excel/RoleExcel.java | 2 +- .../model/{ => dto}/file/MinioFilePath.java | 2 +- .../common/{ => model/dto}/ip/IpEntity.java | 2 +- .../quartz/ScheduleExecuteLogJson.java | 2 +- .../common/model/dto/security/TokenInfo.java | 29 ++++ .../common/{ => model}/entity/BaseEntity.java | 2 +- .../{ => model}/entity/BaseUserEntity.java | 2 +- .../common/{ => model}/vo/BaseUserVo.java | 2 +- .../domain/common/{ => model}/vo/BaseVo.java | 2 +- .../domain/common/{ => model}/vo/LoginVo.java | 2 +- .../{ => model}/vo/result/PageResult.java | 2 +- .../common/{ => model}/vo/result/Result.java | 2 +- .../{ => model}/vo/result/ResultCodeEnum.java | 2 +- .../system/email/entity/EmailTemplate.java | 2 +- .../system/email/entity/EmailUsers.java | 2 +- .../system/email/vo/EmailTemplateVo.java | 2 +- .../domain/system/email/vo/EmailUsersVo.java | 2 +- .../domain/system/files/entity/Files.java | 2 +- .../domain/system/files/vo/FileInfoVo.java | 2 +- .../domain/system/files/vo/FilesVo.java | 2 +- .../domain/system/i18n/entity/I18n.java | 2 +- .../domain/system/i18n/entity/I18nType.java | 2 +- .../domain/system/i18n/vo/I18nTypeVo.java | 2 +- .../domain/system/i18n/vo/I18nVo.java | 2 +- .../system/log/entity/ScheduleExecuteLog.java | 2 +- .../system/log/entity/UserLoginLog.java | 2 +- .../system/log/vo/ScheduleExecuteLogVo.java | 2 +- .../system/log/vo/UserLoginLogLocalVo.java | 2 +- .../domain/system/log/vo/UserLoginLogVo.java | 2 +- .../system/menuIcon/entity/MenuIcon.java | 2 +- .../domain/system/menuIcon/vo/MenuIconVo.java | 2 +- .../domain/system/message/entity/Message.java | 2 +- .../message/entity/MessageReceived.java | 2 +- .../system/message/entity/MessageType.java | 2 +- .../system/message/vo/MessageDetailVo.java | 2 +- .../vo/MessageReceivedWithMessageVo.java | 2 +- .../system/message/vo/MessageTypeVo.java | 2 +- .../system/message/vo/MessageUserVo.java | 2 +- .../domain/system/message/vo/MessageVo.java | 2 +- .../system/quartz/entity/SchedulersGroup.java | 2 +- .../system/quartz/vo/SchedulersGroupVo.java | 2 +- .../system/system/entity/AdminUser.java | 2 +- .../domain/system/system/entity/Dept.java | 2 +- .../system/system/entity/Permission.java | 2 +- .../domain/system/system/entity/Role.java | 2 +- .../system/system/entity/RolePermission.java | 2 +- .../system/system/entity/RouterRole.java | 2 +- .../domain/system/system/entity/UserDept.java | 2 +- .../domain/system/system/entity/UserRole.java | 2 +- .../system/system/entity/router/Router.java | 2 +- .../system/system/views/ViewUserDept.java | 2 +- .../domain/system/system/vo/DeptVo.java | 2 +- .../domain/system/system/vo/PermissionVo.java | 2 +- .../domain/system/system/vo/RoleVo.java | 2 +- .../system/vo/router/RouterManageVo.java | 2 +- .../system/system/vo/router/RouterVo.java | 2 +- .../system/system/vo/user/AdminUserVo.java | 2 +- .../domain/system/system/vo/user/UserVo.java | 2 +- .../exception/AuthCustomerException.java | 2 +- .../exception/GlobalExceptionHandler.java | 4 +- .../java/cn/bunny/services/utils/IpUtil.java | 2 +- .../{JwtHelper.java => JwtTokenUtil.java} | 4 +- .../cn/bunny/services/utils/ResponseUtil.java | 2 +- service/pom.xml | 5 + .../scanner/AbstractAnnotationScanner.java | 2 +- .../services/excel/I18nExcelListener.java | 2 +- .../excel/PermissionExcelListener.java | 2 +- .../services/excel/RoleExcelListener.java | 4 +- .../security/config/MethodSecurityConfig.java | 9 +- .../security/config/WebSecurityConfig.java | 6 +- ...CustomAuthorizationManagerServiceImpl.java | 150 ------------------ .../CustomAuthenticationException.java | 4 +- .../handelr/SecurityAccessDeniedHandler.java | 4 +- .../SecurityAuthenticationEntryPoint.java | 6 +- .../SecurityAuthenticationFailureHandler.java | 2 +- .../SecurityAuthenticationSuccessHandler.java | 2 +- ...CustomAuthorizationManagerServiceImpl.java | 73 +++++++++ .../service/PermissionCheckService.java | 84 ++++++++++ .../bunny/services/security/service/ReadMe.md | 83 ++++++++++ .../service/TokenValidationService.java | 47 ++++++ .../configuration/EmailTemplateService.java | 2 +- .../configuration/EmailUsersService.java | 2 +- .../service/configuration/I18nService.java | 2 +- .../configuration/MenuIconService.java | 2 +- .../impl/ConfigurationServiceImpl.java | 2 +- .../impl/EmailTemplateServiceImpl.java | 4 +- .../impl/EmailUsersServiceImpl.java | 4 +- .../configuration/impl/I18nServiceImpl.java | 8 +- .../impl/I18nTypeServiceImpl.java | 2 +- .../impl/MenuIconServiceImpl.java | 4 +- .../log/ScheduleExecuteLogService.java | 2 +- .../service/log/UserLoginLogService.java | 2 +- .../impl/ScheduleExecuteLogServiceImpl.java | 2 +- .../log/impl/UserLoginLogServiceImpl.java | 2 +- .../message/MessageReceivedService.java | 2 +- .../service/message/MessageService.java | 2 +- .../service/message/MessageTypeService.java | 2 +- .../impl/MessageReceivedServiceImpl.java | 4 +- .../message/impl/MessageServiceImpl.java | 6 +- .../message/impl/MessageTypeServiceImpl.java | 2 +- .../schedule/SchedulersGroupService.java | 2 +- .../service/schedule/SchedulersService.java | 2 +- .../impl/SchedulersGroupServiceImpl.java | 2 +- .../schedule/impl/SchedulersServiceImpl.java | 4 +- .../services/service/system/DeptService.java | 2 +- .../services/service/system/FilesService.java | 2 +- .../service/system/PermissionService.java | 2 +- .../services/service/system/RoleService.java | 2 +- .../services/service/system/UserService.java | 4 +- .../service/system/impl/DeptServiceImpl.java | 4 +- .../service/system/impl/FilesServiceImpl.java | 6 +- .../system/impl/PermissionServiceImpl.java | 6 +- .../service/system/impl/RoleServiceImpl.java | 6 +- .../system/impl/RouterRoleServiceImpl.java | 2 +- .../system/impl/RouterServiceImpl.java | 2 +- .../system/impl/UserRoleServiceImpl.java | 4 +- .../service/system/impl/UserServiceImpl.java | 12 +- .../email/AbstractSenderEmailTemplate.java | 6 +- .../cn/bunny/services/utils/i8n/I18nUtil.java | 2 +- .../utils/login/EmailLoginStrategy.java | 2 +- .../services/utils/system/PermissionUtil.java | 2 +- .../bunny/services/utils/system/UserUtil.java | 10 +- 160 files changed, 579 insertions(+), 384 deletions(-) rename auth-core/src/main/java/cn/bunny/services/domain/common/model/{ => dto}/email/EmailSend.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/common/model/{ => dto}/email/EmailSendInit.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/common/{ => model/dto}/excel/I18nExcel.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/common/{ => model/dto}/excel/PermissionExcel.java (97%) rename auth-core/src/main/java/cn/bunny/services/domain/common/{ => model/dto}/excel/RoleExcel.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/common/model/{ => dto}/file/MinioFilePath.java (86%) rename auth-core/src/main/java/cn/bunny/services/domain/common/{ => model/dto}/ip/IpEntity.java (90%) rename auth-core/src/main/java/cn/bunny/services/domain/common/model/{ => dto}/quartz/ScheduleExecuteLogJson.java (93%) create mode 100644 auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/security/TokenInfo.java rename auth-core/src/main/java/cn/bunny/services/domain/common/{ => model}/entity/BaseEntity.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/common/{ => model}/entity/BaseUserEntity.java (90%) rename auth-core/src/main/java/cn/bunny/services/domain/common/{ => model}/vo/BaseUserVo.java (90%) rename auth-core/src/main/java/cn/bunny/services/domain/common/{ => model}/vo/BaseVo.java (97%) rename auth-core/src/main/java/cn/bunny/services/domain/common/{ => model}/vo/LoginVo.java (97%) rename auth-core/src/main/java/cn/bunny/services/domain/common/{ => model}/vo/result/PageResult.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/common/{ => model}/vo/result/Result.java (98%) rename auth-core/src/main/java/cn/bunny/services/domain/common/{ => model}/vo/result/ResultCodeEnum.java (98%) rename auth-core/src/main/java/cn/bunny/services/utils/{JwtHelper.java => JwtTokenUtil.java} (99%) delete mode 100644 service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java rename service/src/main/java/cn/bunny/services/security/{custom => exception}/CustomAuthenticationException.java (84%) create mode 100644 service/src/main/java/cn/bunny/services/security/service/CustomAuthorizationManagerServiceImpl.java create mode 100644 service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java create mode 100644 service/src/main/java/cn/bunny/services/security/service/ReadMe.md create mode 100644 service/src/main/java/cn/bunny/services/security/service/TokenValidationService.java diff --git a/ReadMe.md b/ReadMe.md index c732bb4..fd5171b 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -38,8 +38,6 @@ ## ✨ v4.0.0 重大更新 -新分支` sysn_6.0.0`与上游【Pure Admin】合并 - ### 核心改进 - **全面重构**：后端接口、实体类等重构，前端重构部分j+优化操作体验 @@ -94,6 +92,21 @@ http.authorizeHttpRequests(auth -> auth ); ``` +### Maven工程结构 + +```mermaid +graph TD + +父工程 -->|主项目| auth-api +父工程 -->|代码生成器| generator-code +auth-api -->|启动项、控制器| service +service -->|mapper| dao +service -->|包含domain、配置等| auth-core +dao -->|包含domain、配置等| auth-code + + +``` + ## 🛠️ 应用场景 ### 1. 纯前端控制模式 @@ -216,7 +229,10 @@ docker compose up -d - [ ] 用户设置持久化存储到数据库 - [ ] 权限弹窗页面优化 - [ ] 后端文档注释完善 -- [ ] 系统监控后端返回403停止请求 +- [x] 系统监控后端返回403停止请求 +- [ ] 优化用户配置权限逻辑，配置后热更新逻辑等 +- [ ] 完善后端注释，有需要添加ReadMe文档 +- [ ] Redis中获取活跃用户 ## 前后端接口规范 diff --git a/auh-api/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java b/auh-api/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java index b96f2a1..1cd4188 100644 --- a/auh-api/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java +++ b/auh-api/src/main/java/cn/bunny/services/aop/JobExecuteAspect.java @@ -3,7 +3,7 @@ package cn.bunny.services.aop; import cn.bunny.services.domain.common.constant.LocalDateTimeConstant; import cn.bunny.services.domain.common.enums.JobEnums; import cn.bunny.services.domain.system.log.entity.ScheduleExecuteLog; -import cn.bunny.services.domain.common.model.quartz.ScheduleExecuteLogJson; +import cn.bunny.services.domain.common.model.dto.quartz.ScheduleExecuteLogJson; import cn.bunny.services.mapper.log.ScheduleExecuteLogMapper; import com.alibaba.fastjson2.JSON; import jakarta.annotation.Resource; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java b/auh-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java index ac048cc..204aa4c 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java @@ -2,8 +2,8 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.domain.system.configuration.dto.WebConfigurationDto; import cn.bunny.services.domain.system.configuration.entity.WebConfiguration; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.configuration.ConfigurationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java b/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java index 396d165..f16512e 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java @@ -5,9 +5,9 @@ import cn.bunny.services.domain.system.email.dto.EmailTemplateDto; import cn.bunny.services.domain.system.email.dto.EmailTemplateUpdateDto; import cn.bunny.services.domain.system.email.entity.EmailTemplate; import cn.bunny.services.domain.system.email.vo.EmailTemplateVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.configuration.EmailTemplateService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java b/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java index c158c78..23666de 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java @@ -5,9 +5,9 @@ import cn.bunny.services.domain.system.email.dto.EmailUsersDto; import cn.bunny.services.domain.system.email.dto.EmailUsersUpdateDto; import cn.bunny.services.domain.system.email.entity.EmailUsers; import cn.bunny.services.domain.system.email.vo.EmailUsersVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.configuration.EmailUsersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java b/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java index 2b8cce7..35ec6c5 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java @@ -6,9 +6,9 @@ import cn.bunny.services.domain.system.i18n.dto.I18nUpdateByFileDto; import cn.bunny.services.domain.system.i18n.dto.I18nUpdateDto; import cn.bunny.services.domain.system.i18n.entity.I18n; import cn.bunny.services.domain.system.i18n.vo.I18nVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.configuration.I18nService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java b/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java index caac550..abbdf28 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java @@ -4,8 +4,8 @@ import cn.bunny.services.domain.system.i18n.dto.I18nTypeAddDto; import cn.bunny.services.domain.system.i18n.dto.I18nTypeDto; import cn.bunny.services.domain.system.i18n.dto.I18nTypeUpdateDto; import cn.bunny.services.domain.system.i18n.vo.I18nTypeVo; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.configuration.I18nTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java b/auh-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java index e45bd82..a2ca7a6 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java @@ -5,9 +5,9 @@ import cn.bunny.services.domain.system.menuIcon.dto.MenuIconDto; import cn.bunny.services.domain.system.menuIcon.dto.MenuIconUpdateDto; import cn.bunny.services.domain.system.menuIcon.entity.MenuIcon; import cn.bunny.services.domain.system.menuIcon.vo.MenuIconVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.configuration.MenuIconService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java b/auh-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java index f05ae29..48be47b 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java @@ -3,9 +3,9 @@ package cn.bunny.services.controller.log; import cn.bunny.services.domain.system.log.dto.ScheduleExecuteLogDto; import cn.bunny.services.domain.system.log.entity.ScheduleExecuteLog; import cn.bunny.services.domain.system.log.vo.ScheduleExecuteLogVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.log.ScheduleExecuteLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java b/auh-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java index c0865cf..d3bca6f 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java @@ -4,9 +4,9 @@ import cn.bunny.services.domain.system.log.dto.UserLoginLogDto; import cn.bunny.services.domain.system.log.entity.UserLoginLog; import cn.bunny.services.domain.system.log.vo.UserLoginLogLocalVo; import cn.bunny.services.domain.system.log.vo.UserLoginLogVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.log.UserLoginLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageController.java b/auh-api/src/main/java/cn/bunny/services/controller/message/MessageController.java index e4f5cfc..483d6a0 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/message/MessageController.java @@ -7,9 +7,9 @@ import cn.bunny.services.domain.system.message.entity.Message; import cn.bunny.services.domain.system.message.vo.MessageDetailVo; import cn.bunny.services.domain.system.message.vo.MessageReceivedWithUserVo; import cn.bunny.services.domain.system.message.vo.MessageVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.message.MessageService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java b/auh-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java index 21f3502..1bd33db 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java @@ -6,9 +6,9 @@ import cn.bunny.services.domain.system.message.dto.MessageUserDto; import cn.bunny.services.domain.system.message.entity.Message; import cn.bunny.services.domain.system.message.vo.MessageReceivedWithMessageVo; import cn.bunny.services.domain.system.message.vo.MessageUserVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.message.MessageReceivedService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java b/auh-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java index b92c852..8e3777d 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java @@ -5,9 +5,9 @@ import cn.bunny.services.domain.system.message.dto.MessageTypeDto; import cn.bunny.services.domain.system.message.dto.MessageTypeUpdateDto; import cn.bunny.services.domain.system.message.entity.MessageType; import cn.bunny.services.domain.system.message.vo.MessageTypeVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.message.MessageTypeService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java b/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java index 97a4a4e..f661380 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java @@ -1,9 +1,9 @@ package cn.bunny.services.controller.schedule; import cn.bunny.services.aop.scanner.QuartzSchedulersScanner; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.domain.system.quartz.dto.SchedulersAddDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersUpdateDto; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java b/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java index 6a49d78..6b5b772 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java @@ -5,9 +5,9 @@ import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupUpdateDto; import cn.bunny.services.domain.system.quartz.entity.SchedulersGroup; import cn.bunny.services.domain.system.quartz.vo.SchedulersGroupVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/DeptController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/DeptController.java index 364137f..1dbf324 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/DeptController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/DeptController.java @@ -5,9 +5,9 @@ import cn.bunny.services.domain.system.system.dto.dept.DeptDto; import cn.bunny.services.domain.system.system.dto.dept.DeptUpdateDto; import cn.bunny.services.domain.system.system.entity.Dept; import cn.bunny.services.domain.system.system.vo.DeptVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.system.DeptService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/FilesController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/FilesController.java index c565fcf..2d5c137 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/FilesController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/FilesController.java @@ -8,9 +8,9 @@ import cn.bunny.services.domain.system.files.dto.FilesUpdateDto; import cn.bunny.services.domain.system.files.entity.Files; import cn.bunny.services.domain.system.files.vo.FileInfoVo; import cn.bunny.services.domain.system.files.vo.FilesVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.system.FilesService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java index fbda96f..2bb47f4 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java @@ -1,9 +1,9 @@ package cn.bunny.services.controller.system; import cn.bunny.services.aop.scanner.ControllerApiPermissionScanner; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.domain.common.scanner.ScannerControllerInfoVo; import cn.bunny.services.domain.system.system.dto.power.PermissionAddDto; import cn.bunny.services.domain.system.system.dto.power.PermissionDto; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/RoleController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/RoleController.java index 2dbf141..9af45db 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/RoleController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/RoleController.java @@ -5,9 +5,9 @@ import cn.bunny.services.domain.system.system.dto.role.RoleDto; import cn.bunny.services.domain.system.system.dto.role.RoleUpdateDto; import cn.bunny.services.domain.system.system.entity.Role; import cn.bunny.services.domain.system.system.vo.RoleVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.system.RoleService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java index 38b1104..e9647e1 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java @@ -1,7 +1,7 @@ package cn.bunny.services.controller.system; import cn.bunny.services.domain.system.system.dto.AssignPowersToRoleDto; -import cn.bunny.services.domain.common.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.service.system.RolePermissionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/RouterController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/RouterController.java index 0fb9d3f..2bb8b66 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/RouterController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/RouterController.java @@ -4,8 +4,8 @@ import cn.bunny.services.domain.system.system.dto.router.RouterAddDto; import cn.bunny.services.domain.system.system.dto.router.RouterUpdateDto; import cn.bunny.services.domain.system.system.vo.router.RouterManageVo; import cn.bunny.services.domain.system.system.vo.router.WebUserRouterVo; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.service.system.RouterService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java index fbd0e3a..e80ca8d 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java @@ -1,6 +1,6 @@ package cn.bunny.services.controller.system; -import cn.bunny.services.domain.common.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.service.system.RouterRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/UserController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/UserController.java index 801cd2f..d86830e 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/UserController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/UserController.java @@ -1,10 +1,10 @@ package cn.bunny.services.controller.system; import cn.bunny.services.context.BaseContext; -import cn.bunny.services.domain.common.vo.LoginVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.LoginVo; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.domain.system.system.dto.user.*; import cn.bunny.services.domain.system.system.entity.AdminUser; import cn.bunny.services.domain.system.system.vo.user.AdminUserVo; diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java b/auh-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java index 9ebb456..c2f3155 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java +++ b/auh-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java @@ -1,7 +1,7 @@ package cn.bunny.services.controller.system; import cn.bunny.services.domain.system.system.dto.user.AssignRolesToUsersDto; -import cn.bunny.services.domain.common.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.service.system.UserRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/auh-api/src/main/resources/application.yml b/auh-api/src/main/resources/application.yml index 2c557c4..eb9d205 100644 --- a/auh-api/src/main/resources/application.yml +++ b/auh-api/src/main/resources/application.yml @@ -4,6 +4,8 @@ server: spring: profiles: active: @profiles.active@ + # main: + # lazy-initialization: true application: name: bunny-service servlet: @@ -76,6 +78,7 @@ spring: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 + mybatis-plus: mapper-locations: classpath:mapper/**/*.xml global-config: diff --git a/auh-api/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java b/auh-api/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java index aafbac1..5c9f0bb 100644 --- a/auh-api/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java +++ b/auh-api/src/test/java/cn/bunny/services/controller/configuration/ConfigurationControllerTest.java @@ -2,7 +2,7 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.domain.system.configuration.dto.WebConfigurationDto; import cn.bunny.services.domain.system.configuration.entity.WebConfiguration; -import cn.bunny.services.domain.common.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.utils.TokenUtilsTest; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.TypeReference; diff --git a/auh-api/src/test/java/cn/bunny/services/controller/configuration/EmailTemplateControllerTest.java b/auh-api/src/test/java/cn/bunny/services/controller/configuration/EmailTemplateControllerTest.java index 9a00032..e853091 100644 --- a/auh-api/src/test/java/cn/bunny/services/controller/configuration/EmailTemplateControllerTest.java +++ b/auh-api/src/test/java/cn/bunny/services/controller/configuration/EmailTemplateControllerTest.java @@ -4,8 +4,8 @@ import cn.bunny.services.domain.system.email.dto.EmailTemplateAddDto; import cn.bunny.services.domain.system.email.dto.EmailTemplateUpdateDto; import cn.bunny.services.domain.system.email.vo.EmailTemplateVo; import cn.bunny.services.domain.common.enums.EmailTemplateEnums; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.utils.TokenUtilsTest; import cn.hutool.crypto.digest.MD5; import com.alibaba.fastjson2.JSON; diff --git a/auh-api/src/test/java/cn/bunny/services/controller/log/UserLoginLogControllerTest.java b/auh-api/src/test/java/cn/bunny/services/controller/log/UserLoginLogControllerTest.java index ddc8ded..7ade491 100644 --- a/auh-api/src/test/java/cn/bunny/services/controller/log/UserLoginLogControllerTest.java +++ b/auh-api/src/test/java/cn/bunny/services/controller/log/UserLoginLogControllerTest.java @@ -4,8 +4,8 @@ import cn.bunny.services.domain.system.log.dto.UserLoginLogDto; import cn.bunny.services.domain.system.log.entity.UserLoginLog; import cn.bunny.services.domain.system.log.vo.UserLoginLogLocalVo; import cn.bunny.services.domain.system.log.vo.UserLoginLogVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.Result; import cn.bunny.services.service.log.UserLoginLogService; import cn.bunny.services.utils.TokenUtilsTest; import com.alibaba.fastjson2.JSON; diff --git a/auh-api/src/test/java/cn/bunny/services/utils/TokenUtilsTest.java b/auh-api/src/test/java/cn/bunny/services/utils/TokenUtilsTest.java index db53f8a..16db80a 100644 --- a/auh-api/src/test/java/cn/bunny/services/utils/TokenUtilsTest.java +++ b/auh-api/src/test/java/cn/bunny/services/utils/TokenUtilsTest.java @@ -1,7 +1,7 @@ package cn.bunny.services.utils; import cn.bunny.services.domain.system.system.entity.AdminUser; -import cn.bunny.services.domain.common.vo.LoginVo; +import cn.bunny.services.domain.common.model.vo.LoginVo; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.utils.system.UserUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/auh-api/src/test/java/impl/I18nServiceImplTest.java b/auh-api/src/test/java/impl/I18nServiceImplTest.java index 074a1ff..636e569 100644 --- a/auh-api/src/test/java/impl/I18nServiceImplTest.java +++ b/auh-api/src/test/java/impl/I18nServiceImplTest.java @@ -1,6 +1,6 @@ package impl; -import cn.bunny.services.domain.common.excel.I18nExcel; +import cn.bunny.services.domain.common.model.dto.excel.I18nExcel; import cn.bunny.services.domain.system.i18n.entity.I18n; import cn.bunny.services.mapper.configuration.I18nMapper; import cn.bunny.services.utils.i8n.I18nUtil; diff --git a/auth-core/src/main/java/cn/bunny/services/config/mail/MailSenderConfiguration.java b/auth-core/src/main/java/cn/bunny/services/config/mail/MailSenderConfiguration.java index 94add05..1aa5024 100644 --- a/auth-core/src/main/java/cn/bunny/services/config/mail/MailSenderConfiguration.java +++ b/auth-core/src/main/java/cn/bunny/services/config/mail/MailSenderConfiguration.java @@ -1,7 +1,7 @@ package cn.bunny.services.config.mail; -import cn.bunny.services.domain.common.model.email.EmailSend; -import cn.bunny.services.domain.common.model.email.EmailSendInit; +import cn.bunny.services.domain.common.model.dto.email.EmailSend; +import cn.bunny.services.domain.common.model.dto.email.EmailSendInit; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import org.springframework.mail.javamail.JavaMailSenderImpl; diff --git a/auth-core/src/main/java/cn/bunny/services/config/minio/MinioUtil.java b/auth-core/src/main/java/cn/bunny/services/config/minio/MinioUtil.java index 56bf85a..769721e 100644 --- a/auth-core/src/main/java/cn/bunny/services/config/minio/MinioUtil.java +++ b/auth-core/src/main/java/cn/bunny/services/config/minio/MinioUtil.java @@ -1,8 +1,8 @@ package cn.bunny.services.config.minio; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.domain.common.constant.MinioConstant; -import cn.bunny.services.domain.common.model.file.MinioFilePath; +import cn.bunny.services.domain.common.model.dto.file.MinioFilePath; import cn.bunny.services.exception.AuthCustomerException; import io.minio.*; import io.minio.messages.DeleteError; diff --git a/auth-core/src/main/java/cn/bunny/services/context/BaseContext.java b/auth-core/src/main/java/cn/bunny/services/context/BaseContext.java index fceeec6..56354a1 100644 --- a/auth-core/src/main/java/cn/bunny/services/context/BaseContext.java +++ b/auth-core/src/main/java/cn/bunny/services/context/BaseContext.java @@ -1,7 +1,7 @@ package cn.bunny.services.context; -import cn.bunny.services.domain.common.vo.LoginVo; +import cn.bunny.services.domain.common.model.vo.LoginVo; public class BaseContext { private static final ThreadLocal userId = new ThreadLocal<>(); diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/RedisUserConstant.java b/auth-core/src/main/java/cn/bunny/services/domain/common/constant/RedisUserConstant.java index 062196c..acef486 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/constant/RedisUserConstant.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/constant/RedisUserConstant.java @@ -14,8 +14,6 @@ public class RedisUserConstant { private static final String ADMIN_LOGIN_INFO_PREFIX = "admin::login_info::"; private static final String ADMIN_EMAIL_CODE_PREFIX = "admin::email_code::"; - private static final String USER_LOGIN_INFO_PREFIX = "user::login_info::"; - private static final String USER_EMAIL_CODE_PREFIX = "user::email_code::"; public static String getAdminLoginInfoPrefix(String adminUser) { return ADMIN_LOGIN_INFO_PREFIX + adminUser; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/email/EmailSend.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/email/EmailSend.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/email/EmailSend.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/email/EmailSend.java index 0b6c580..e3c6e35 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/email/EmailSend.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/email/EmailSend.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.email; +package cn.bunny.services.domain.common.model.dto.email; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/email/EmailSendInit.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/email/EmailSendInit.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/email/EmailSendInit.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/email/EmailSendInit.java index 4238238..e57a699 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/email/EmailSendInit.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/email/EmailSendInit.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.email; +package cn.bunny.services.domain.common.model.dto.email; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/excel/I18nExcel.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/I18nExcel.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/common/excel/I18nExcel.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/I18nExcel.java index 94f6edd..55a5b9a 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/excel/I18nExcel.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/I18nExcel.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.excel; +package cn.bunny.services.domain.common.model.dto.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/excel/PermissionExcel.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/PermissionExcel.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/common/excel/PermissionExcel.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/PermissionExcel.java index 26f957f..b71d351 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/excel/PermissionExcel.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/PermissionExcel.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.excel; +package cn.bunny.services.domain.common.model.dto.excel; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/excel/RoleExcel.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/RoleExcel.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/common/excel/RoleExcel.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/RoleExcel.java index 5219f7f..d63ec1d 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/excel/RoleExcel.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/excel/RoleExcel.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.excel; +package cn.bunny.services.domain.common.model.dto.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/file/MinioFilePath.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/file/MinioFilePath.java similarity index 86% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/file/MinioFilePath.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/file/MinioFilePath.java index 9326809..def013b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/file/MinioFilePath.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/file/MinioFilePath.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.file; +package cn.bunny.services.domain.common.model.dto.file; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/ip/IpEntity.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/ip/IpEntity.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/common/ip/IpEntity.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/ip/IpEntity.java index 8560f34..ed59452 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/ip/IpEntity.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/ip/IpEntity.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.ip; +package cn.bunny.services.domain.common.model.dto.ip; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/quartz/ScheduleExecuteLogJson.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/quartz/ScheduleExecuteLogJson.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/common/model/quartz/ScheduleExecuteLogJson.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/quartz/ScheduleExecuteLogJson.java index 1b16da8..d4eb275 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/model/quartz/ScheduleExecuteLogJson.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/quartz/ScheduleExecuteLogJson.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.model.quartz; +package cn.bunny.services.domain.common.model.dto.quartz; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/security/TokenInfo.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/security/TokenInfo.java new file mode 100644 index 0000000..19dc6ce --- /dev/null +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/dto/security/TokenInfo.java @@ -0,0 +1,29 @@ +package cn.bunny.services.domain.common.model.dto.security; + +import cn.bunny.services.domain.common.model.vo.LoginVo; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Schema(name = "TokenInfo", title = "TokenInfo") +public class TokenInfo { + + @Schema(name = "token", title = "令牌") + private String token; + + @Schema(name = "username", title = "用户名") + private String username; + + @Schema(name = "userId", title = "用户id") + private Long userId; + + @Schema(name = "loginVo", title = "登录成功返回内容") + private LoginVo loginVo; + +} diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/entity/BaseEntity.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/entity/BaseEntity.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/common/entity/BaseEntity.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/entity/BaseEntity.java index 59ec8ea..4f6c20a 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/entity/BaseEntity.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.entity; +package cn.bunny.services.domain.common.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/entity/BaseUserEntity.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/entity/BaseUserEntity.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/common/entity/BaseUserEntity.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/entity/BaseUserEntity.java index fedbf01..e85e50d 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/entity/BaseUserEntity.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/entity/BaseUserEntity.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.entity; +package cn.bunny.services.domain.common.model.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/vo/BaseUserVo.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/BaseUserVo.java similarity index 90% rename from auth-core/src/main/java/cn/bunny/services/domain/common/vo/BaseUserVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/BaseUserVo.java index daf4370..8f09dda 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/vo/BaseUserVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/BaseUserVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.vo; +package cn.bunny.services.domain.common.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/vo/BaseVo.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/BaseVo.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/common/vo/BaseVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/BaseVo.java index 23c9fae..9aba528 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/vo/BaseVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/BaseVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.vo; +package cn.bunny.services.domain.common.model.vo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/vo/LoginVo.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/LoginVo.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/common/vo/LoginVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/LoginVo.java index d662396..4f7cacb 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/vo/LoginVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/LoginVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.vo; +package cn.bunny.services.domain.common.model.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/vo/result/PageResult.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/PageResult.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/common/vo/result/PageResult.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/PageResult.java index af2376d..137b557 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/vo/result/PageResult.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/PageResult.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.vo.result; +package cn.bunny.services.domain.common.model.vo.result; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/vo/result/Result.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/Result.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/domain/common/vo/result/Result.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/Result.java index 6b59506..b1d7bc3 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/vo/result/Result.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/Result.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.vo.result; +package cn.bunny.services.domain.common.model.vo.result; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/common/vo/result/ResultCodeEnum.java b/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/ResultCodeEnum.java similarity index 98% rename from auth-core/src/main/java/cn/bunny/services/domain/common/vo/result/ResultCodeEnum.java rename to auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/ResultCodeEnum.java index 0c408a9..c2ec9a3 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/common/vo/result/ResultCodeEnum.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/common/model/vo/result/ResultCodeEnum.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.common.vo.result; +package cn.bunny.services.domain.common.model.vo.result; import lombok.Getter; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailTemplate.java b/auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailTemplate.java index 120d8bb..ab2cc38 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailTemplate.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailTemplate.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.email.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailUsers.java b/auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailUsers.java index aad0c96..8358121 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailUsers.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/email/entity/EmailUsers.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.email.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailTemplateVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailTemplateVo.java index 1078d10..786ae88 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailTemplateVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailTemplateVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.email.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailUsersVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailUsersVo.java index d3875aa..f9604db 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailUsersVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/email/vo/EmailUsersVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.email.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/entity/Files.java b/auth-core/src/main/java/cn/bunny/services/domain/system/files/entity/Files.java index 731b199..802c02b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/entity/Files.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/files/entity/Files.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.files.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.EqualsAndHashCode; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FileInfoVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FileInfoVo.java index 4374966..ca75152 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FileInfoVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FileInfoVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.files.vo; -import cn.bunny.services.domain.common.vo.BaseVo; +import cn.bunny.services.domain.common.model.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FilesVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FilesVo.java index 6c08ec4..13a8441 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FilesVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/files/vo/FilesVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.files.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18n.java b/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18n.java index 6e69136..3c512ea 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18n.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18n.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.i18n.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18nType.java b/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18nType.java index 16850c1..a52b916 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18nType.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/entity/I18nType.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.i18n.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nTypeVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nTypeVo.java index 41ddcd2..61d6cc2 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nTypeVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nTypeVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.i18n.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nVo.java index e01c43a..f705f0a 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/i18n/vo/I18nVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.i18n.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/ScheduleExecuteLog.java b/auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/ScheduleExecuteLog.java index f129ed7..13b777b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/ScheduleExecuteLog.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/ScheduleExecuteLog.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.log.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/UserLoginLog.java b/auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/UserLoginLog.java index 499d013..736d7f7 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/UserLoginLog.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/log/entity/UserLoginLog.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.log.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/ScheduleExecuteLogVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/ScheduleExecuteLogVo.java index e36f38b..40cb56c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/ScheduleExecuteLogVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/ScheduleExecuteLogVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.log.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogLocalVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogLocalVo.java index e9ba5d9..596a086 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogLocalVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogLocalVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.log.vo; -import cn.bunny.services.domain.common.vo.BaseVo; +import cn.bunny.services.domain.common.model.vo.BaseVo; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogVo.java index 64a82c2..b7cbc21 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/log/vo/UserLoginLogVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.log.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/entity/MenuIcon.java b/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/entity/MenuIcon.java index 834432b..d2f7313 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/entity/MenuIcon.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/entity/MenuIcon.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.menuIcon.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/vo/MenuIconVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/vo/MenuIconVo.java index 29d2b47..31fe0e1 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/vo/MenuIconVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/menuIcon/vo/MenuIconVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.menuIcon.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/Message.java b/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/Message.java index b6a493d..57a829a 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/Message.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/Message.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.message.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageReceived.java b/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageReceived.java index ac09133..15d75da 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageReceived.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageReceived.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.message.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageType.java b/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageType.java index 2d59916..eb5775a 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageType.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/message/entity/MessageType.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.message.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageDetailVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageDetailVo.java index c3ec220..aad8e57 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageDetailVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageDetailVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.message.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageReceivedWithMessageVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageReceivedWithMessageVo.java index 9c3cff7..8bc58a1 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageReceivedWithMessageVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageReceivedWithMessageVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.message.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageTypeVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageTypeVo.java index c685e4f..84666d3 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageTypeVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageTypeVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.message.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageUserVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageUserVo.java index 618d016..4df9ee1 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageUserVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageUserVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.message.vo; -import cn.bunny.services.domain.common.vo.BaseVo; +import cn.bunny.services.domain.common.model.vo.BaseVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageVo.java index 9ff4fb1..b9da6dd 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/message/vo/MessageVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.message.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/entity/SchedulersGroup.java b/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/entity/SchedulersGroup.java index fd18a01..cef5c10 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/entity/SchedulersGroup.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/entity/SchedulersGroup.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.quartz.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/vo/SchedulersGroupVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/vo/SchedulersGroupVo.java index 1e65016..2c4bf37 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/vo/SchedulersGroupVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/quartz/vo/SchedulersGroupVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.quartz.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/AdminUser.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/AdminUser.java index 53ed949..9456ac9 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/AdminUser.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/AdminUser.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Dept.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Dept.java index ee5e3d7..2d64d84 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Dept.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Dept.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Permission.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Permission.java index 14b92fd..0677c8b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Permission.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Permission.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Role.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Role.java index 2b20c18..d802eca 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Role.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/Role.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RolePermission.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RolePermission.java index 2244dfd..e3a36b4 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RolePermission.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RolePermission.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RouterRole.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RouterRole.java index 8200386..98a51c1 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RouterRole.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/RouterRole.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserDept.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserDept.java index 3685623..93dc1e5 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserDept.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserDept.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserRole.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserRole.java index 4543e8b..42ce0cb 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserRole.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/UserRole.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.entity; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/Router.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/Router.java index 17dc2ed..2731060 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/Router.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/entity/router/Router.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.entity.router; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewUserDept.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewUserDept.java index d1a2656..5133b41 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewUserDept.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/views/ViewUserDept.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.views; -import cn.bunny.services.domain.common.entity.BaseUserEntity; +import cn.bunny.services.domain.common.model.entity.BaseUserEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/DeptVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/DeptVo.java index 373244c..90b6d59 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/DeptVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/DeptVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/PermissionVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/PermissionVo.java index 64d5df3..f4d62c0 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/PermissionVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/PermissionVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/RoleVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/RoleVo.java index 215dae6..7f8606a 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/RoleVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/RoleVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.vo; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterManageVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterManageVo.java index 13fb0bf..a64abc7 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterManageVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterManageVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.vo.router; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterVo.java index 29133eb..dfdff15 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/router/RouterVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.vo.router; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/AdminUserVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/AdminUserVo.java index 0dced41..25bd8b1 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/AdminUserVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/AdminUserVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.vo.user; -import cn.bunny.services.domain.common.vo.BaseUserVo; +import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/UserVo.java b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/UserVo.java index 476bc06..cb82625 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/UserVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/system/system/vo/user/UserVo.java @@ -1,6 +1,6 @@ package cn.bunny.services.domain.system.system.vo.user; -import cn.bunny.services.domain.common.vo.BaseVo; +import cn.bunny.services.domain.common.model.vo.BaseVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/auth-core/src/main/java/cn/bunny/services/exception/AuthCustomerException.java b/auth-core/src/main/java/cn/bunny/services/exception/AuthCustomerException.java index d4c2efb..a13d738 100644 --- a/auth-core/src/main/java/cn/bunny/services/exception/AuthCustomerException.java +++ b/auth-core/src/main/java/cn/bunny/services/exception/AuthCustomerException.java @@ -1,6 +1,6 @@ package cn.bunny.services.exception; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/auth-core/src/main/java/cn/bunny/services/exception/GlobalExceptionHandler.java b/auth-core/src/main/java/cn/bunny/services/exception/GlobalExceptionHandler.java index 9d333cb..4c19899 100644 --- a/auth-core/src/main/java/cn/bunny/services/exception/GlobalExceptionHandler.java +++ b/auth-core/src/main/java/cn/bunny/services/exception/GlobalExceptionHandler.java @@ -1,8 +1,8 @@ package cn.bunny.services.exception; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.context.BaseContext; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.MyBatisSystemException; diff --git a/auth-core/src/main/java/cn/bunny/services/utils/IpUtil.java b/auth-core/src/main/java/cn/bunny/services/utils/IpUtil.java index 63e06d1..5fc9a62 100644 --- a/auth-core/src/main/java/cn/bunny/services/utils/IpUtil.java +++ b/auth-core/src/main/java/cn/bunny/services/utils/IpUtil.java @@ -1,6 +1,6 @@ package cn.bunny.services.utils; -import cn.bunny.services.domain.common.ip.IpEntity; +import cn.bunny.services.domain.common.model.dto.ip.IpEntity; import jakarta.annotation.PostConstruct; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; diff --git a/auth-core/src/main/java/cn/bunny/services/utils/JwtHelper.java b/auth-core/src/main/java/cn/bunny/services/utils/JwtTokenUtil.java similarity index 99% rename from auth-core/src/main/java/cn/bunny/services/utils/JwtHelper.java rename to auth-core/src/main/java/cn/bunny/services/utils/JwtTokenUtil.java index 4eaf0f9..d052a09 100644 --- a/auth-core/src/main/java/cn/bunny/services/utils/JwtHelper.java +++ b/auth-core/src/main/java/cn/bunny/services/utils/JwtTokenUtil.java @@ -1,6 +1,6 @@ package cn.bunny.services.utils; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jws; @@ -16,7 +16,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -public class JwtHelper { +public class JwtTokenUtil { // JWT 的 秘钥 // static SecretKey key = new SecretKeySpec("Bunny-Java-Template".getBytes(), "AES"); private static final SecretKey key = Keys.hmacShaKeyFor("Bunny-Auth-Server-Private-SecretKey".getBytes(StandardCharsets.UTF_8)); diff --git a/auth-core/src/main/java/cn/bunny/services/utils/ResponseUtil.java b/auth-core/src/main/java/cn/bunny/services/utils/ResponseUtil.java index 10a3015..09ca963 100644 --- a/auth-core/src/main/java/cn/bunny/services/utils/ResponseUtil.java +++ b/auth-core/src/main/java/cn/bunny/services/utils/ResponseUtil.java @@ -1,6 +1,6 @@ package cn.bunny.services.utils; -import cn.bunny.services.domain.common.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.Result; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/pom.xml b/service/pom.xml index b838e57..7398fdc 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -23,6 +23,11 @@ dao 0.0.1-SNAPSHOT + + cn.bunny + auth-core + 0.0.1-SNAPSHOT + diff --git a/service/src/main/java/cn/bunny/services/aop/scanner/AbstractAnnotationScanner.java b/service/src/main/java/cn/bunny/services/aop/scanner/AbstractAnnotationScanner.java index e584bde..ebe4c16 100644 --- a/service/src/main/java/cn/bunny/services/aop/scanner/AbstractAnnotationScanner.java +++ b/service/src/main/java/cn/bunny/services/aop/scanner/AbstractAnnotationScanner.java @@ -1,6 +1,6 @@ package cn.bunny.services.aop.scanner; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.service.schedule.impl.SchedulersServiceImpl; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/service/src/main/java/cn/bunny/services/excel/I18nExcelListener.java b/service/src/main/java/cn/bunny/services/excel/I18nExcelListener.java index 53d9708..e4e3a68 100644 --- a/service/src/main/java/cn/bunny/services/excel/I18nExcelListener.java +++ b/service/src/main/java/cn/bunny/services/excel/I18nExcelListener.java @@ -1,6 +1,6 @@ package cn.bunny.services.excel; -import cn.bunny.services.domain.common.excel.I18nExcel; +import cn.bunny.services.domain.common.model.dto.excel.I18nExcel; import cn.bunny.services.domain.system.i18n.entity.I18n; import cn.bunny.services.service.configuration.I18nService; import com.alibaba.excel.context.AnalysisContext; diff --git a/service/src/main/java/cn/bunny/services/excel/PermissionExcelListener.java b/service/src/main/java/cn/bunny/services/excel/PermissionExcelListener.java index 31b78bf..4fbc8a6 100644 --- a/service/src/main/java/cn/bunny/services/excel/PermissionExcelListener.java +++ b/service/src/main/java/cn/bunny/services/excel/PermissionExcelListener.java @@ -1,6 +1,6 @@ package cn.bunny.services.excel; -import cn.bunny.services.domain.common.excel.PermissionExcel; +import cn.bunny.services.domain.common.model.dto.excel.PermissionExcel; import cn.bunny.services.domain.system.system.entity.Permission; import cn.bunny.services.service.system.PermissionService; import com.alibaba.excel.context.AnalysisContext; diff --git a/service/src/main/java/cn/bunny/services/excel/RoleExcelListener.java b/service/src/main/java/cn/bunny/services/excel/RoleExcelListener.java index cd29536..984a1f0 100644 --- a/service/src/main/java/cn/bunny/services/excel/RoleExcelListener.java +++ b/service/src/main/java/cn/bunny/services/excel/RoleExcelListener.java @@ -1,7 +1,7 @@ package cn.bunny.services.excel; -import cn.bunny.services.domain.common.excel.RoleExcel; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.dto.excel.RoleExcel; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.domain.system.system.entity.Role; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.service.system.RoleService; diff --git a/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java b/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java index ac611d4..be361ab 100644 --- a/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java +++ b/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java @@ -1,7 +1,7 @@ package cn.bunny.services.security.config; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.domain.system.system.entity.AdminUser; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; import cn.bunny.services.mapper.system.UserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.context.annotation.Bean; @@ -14,11 +14,16 @@ import org.springframework.security.crypto.password.PasswordEncoder; @Configuration public class MethodSecurityConfig { + /** + * 设置密码校验器 + * + * @return PasswordEncoder + */ @Bean public PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } - + /** * 使用数据库方式 * 登录方式：邮箱+用户名 diff --git a/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java b/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java index a7b0678..fe8356e 100644 --- a/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java +++ b/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java @@ -1,8 +1,8 @@ package cn.bunny.services.security.config; -import cn.bunny.services.security.custom.CustomAuthorizationManagerServiceImpl; import cn.bunny.services.security.handelr.SecurityAccessDeniedHandler; import cn.bunny.services.security.handelr.SecurityAuthenticationEntryPoint; +import cn.bunny.services.security.service.CustomAuthorizationManagerServiceImpl; import jakarta.annotation.Resource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -52,7 +52,8 @@ public class WebSecurityConfig { .authorizeHttpRequests(authorize -> authorize .requestMatchers(annotations).permitAll() .requestMatchers(RegexRequestMatcher.regexMatcher(".*\\.(css|js)$")).permitAll() - .anyRequest().access(customAuthorizationManagerService)) + .anyRequest().access(customAuthorizationManagerService) + ) .exceptionHandling(exception -> { // 请求未授权接口 exception.authenticationEntryPoint(new SecurityAuthenticationEntryPoint()); @@ -60,6 +61,7 @@ public class WebSecurityConfig { exception.accessDeniedHandler(new SecurityAccessDeniedHandler()); }) ; + return httpSecurity.build(); } } diff --git a/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java b/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java deleted file mode 100644 index cb6808b..0000000 --- a/service/src/main/java/cn/bunny/services/security/custom/CustomAuthorizationManagerServiceImpl.java +++ /dev/null @@ -1,150 +0,0 @@ -package cn.bunny.services.security.custom; - -import cn.bunny.services.context.BaseContext; -import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.common.vo.LoginVo; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; -import cn.bunny.services.domain.system.system.entity.Permission; -import cn.bunny.services.domain.system.system.entity.Role; -import cn.bunny.services.mapper.system.PermissionMapper; -import cn.bunny.services.mapper.system.RoleMapper; -import cn.bunny.services.security.config.WebSecurityConfig; -import cn.bunny.services.utils.JwtHelper; -import cn.bunny.services.utils.system.RoleUtil; -import com.alibaba.fastjson2.JSON; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; -import lombok.extern.slf4j.Slf4j; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.security.authorization.AuthorizationDecision; -import org.springframework.security.authorization.AuthorizationManager; -import org.springframework.security.core.Authentication; -import org.springframework.security.web.access.intercept.RequestAuthorizationContext; -import org.springframework.security.web.util.matcher.AntPathRequestMatcher; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; - -import java.util.List; -import java.util.Objects; -import java.util.function.Supplier; - - -/** - * 自定义权限判断 - * 判断用户有哪些权限 - */ -@Component -@Slf4j -public class CustomAuthorizationManagerServiceImpl implements AuthorizationManager { - - @Resource - private PermissionMapper permissionMapper; - - @Resource - private RoleMapper roleMapper; - - @Resource - private RedisTemplate redisTemplate; - - /** - * 检查请求的Token是否携带，并判断是否过期 - * - * @param authentication Supplier - * @param context RequestAuthorizationContext - * @return AuthorizationDecision - */ - @Override - public AuthorizationDecision check(Supplier authentication, RequestAuthorizationContext context) { - // 用户的token和用户id、请求Url - HttpServletRequest request = context.getRequest(); - - // 判断是否有 token - String token = request.getHeader("token"); - if (token == null) { - throw new CustomAuthenticationException(ResultCodeEnum.LOGIN_AUTH); - } - - // 判断 token 是否过期 - if (JwtHelper.isExpired(token)) { - throw new CustomAuthenticationException(ResultCodeEnum.AUTHENTICATION_EXPIRED); - } - - // 解析JWT中的用户名 - String username = JwtHelper.getUsername(token); - Long userId = JwtHelper.getUserId(token); - - // 查找 Redis - Object loginVoObject = redisTemplate.opsForValue().get(RedisUserConstant.getAdminLoginInfoPrefix(username)); - LoginVo loginVo = JSON.parseObject(JSON.toJSONString(loginVoObject), LoginVo.class); - - // 登录信息为空 - if (loginVo == null) { - throw new CustomAuthenticationException(ResultCodeEnum.LOGIN_AUTH); - } - - // 判断用户是否禁用 - if (loginVo.getStatus()) { - throw new CustomAuthenticationException(ResultCodeEnum.FAIL_NO_ACCESS_DENIED_USER_LOCKED); - } - - // 设置用户信息 - BaseContext.setUsername(username); - BaseContext.setUserId(userId); - BaseContext.setLoginVo(loginVo); - - // 校验权限 - return new AuthorizationDecision(hasAuth(request)); - } - - /** - * 查询用户所属的角色信息 - * - * @param request 请求url地址 - */ - private Boolean hasAuth(HttpServletRequest request) { - String requestMethod = request.getMethod(); - - // 根据用户ID查询角色数据 - Long userId = BaseContext.getUserId(); - List roleList = roleMapper.selectListByUserId(userId); - - // 角色代码 - List roleCodeList = roleList.stream().map(Role::getRoleCode).toList(); - - // 判断是否是管理员用户 - boolean checkedAdmin = RoleUtil.checkAdmin(roleCodeList); - if (checkedAdmin) return true; - - // 判断请求地址是否是登录之后才需要访问的，已经登录了不需要验证的 - String requestURI = request.getRequestURI(); - for (String userAuth : WebSecurityConfig.userAuths) { - if (requestURI.contains(userAuth)) return true; - } - - // 根据角色列表查询权限信息 - List permissionList = permissionMapper.selectListByUserId(userId); - - // 判断是否与请求路径匹配 - return permissionList.stream() - // 过滤并转成小写进行比较 - .filter(permission -> { - String permissionRequestMethod = permission.getRequestMethod(); - if (StringUtils.hasText(permissionRequestMethod)) { - String lowerCase = permissionRequestMethod.toLowerCase(); - String requestMethodLowerCase = requestMethod.toLowerCase(); - return lowerCase.equals(requestMethodLowerCase) - || requestURI.contains("/**"); - } - return false; - }) - .map(Permission::getRequestUrl) - .filter(Objects::nonNull) - .anyMatch(requestUrl -> { - if ((requestUrl.contains("/*") || requestUrl.contains("/**"))) { - return new AntPathRequestMatcher(requestUrl).matches(request); - } else { - return requestURI.matches(requestUrl); - } - }); - } -} diff --git a/service/src/main/java/cn/bunny/services/security/custom/CustomAuthenticationException.java b/service/src/main/java/cn/bunny/services/security/exception/CustomAuthenticationException.java similarity index 84% rename from service/src/main/java/cn/bunny/services/security/custom/CustomAuthenticationException.java rename to service/src/main/java/cn/bunny/services/security/exception/CustomAuthenticationException.java index ac14689..8ec2828 100644 --- a/service/src/main/java/cn/bunny/services/security/custom/CustomAuthenticationException.java +++ b/service/src/main/java/cn/bunny/services/security/exception/CustomAuthenticationException.java @@ -1,6 +1,6 @@ -package cn.bunny.services.security.custom; +package cn.bunny.services.security.exception; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import lombok.Getter; import lombok.ToString; import lombok.extern.slf4j.Slf4j; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java index 037d17d..b4482ca 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java +++ b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAccessDeniedHandler.java @@ -1,7 +1,7 @@ package cn.bunny.services.security.handelr; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java index 61d6a36..166c665 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java +++ b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java @@ -1,8 +1,8 @@ package cn.bunny.services.security.handelr; -import cn.bunny.services.domain.common.vo.result.Result; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; -import cn.bunny.services.security.custom.CustomAuthenticationException; +import cn.bunny.services.domain.common.model.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; +import cn.bunny.services.security.exception.CustomAuthenticationException; import cn.bunny.services.utils.ResponseUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java index 19168f8..239c68d 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java +++ b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java @@ -1,6 +1,6 @@ package cn.bunny.services.security.handelr; -import cn.bunny.services.domain.common.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.Result; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java index b35be95..bb83427 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java +++ b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationSuccessHandler.java @@ -1,6 +1,6 @@ package cn.bunny.services.security.handelr; -import cn.bunny.services.domain.common.vo.result.Result; +import cn.bunny.services.domain.common.model.vo.result.Result; import com.alibaba.fastjson2.JSON; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/service/src/main/java/cn/bunny/services/security/service/CustomAuthorizationManagerServiceImpl.java b/service/src/main/java/cn/bunny/services/security/service/CustomAuthorizationManagerServiceImpl.java new file mode 100644 index 0000000..b2d724d --- /dev/null +++ b/service/src/main/java/cn/bunny/services/security/service/CustomAuthorizationManagerServiceImpl.java @@ -0,0 +1,73 @@ +package cn.bunny.services.security.service; + +import cn.bunny.services.context.BaseContext; +import cn.bunny.services.domain.common.model.dto.security.TokenInfo; +import cn.bunny.services.domain.common.model.vo.LoginVo; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; +import cn.bunny.services.security.exception.CustomAuthenticationException; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.authorization.AuthorizationDecision; +import org.springframework.security.authorization.AuthorizationManager; +import org.springframework.security.core.Authentication; +import org.springframework.security.web.access.intercept.RequestAuthorizationContext; +import org.springframework.stereotype.Component; + +import java.util.function.Supplier; + + +/** + * 自定义权限判断 + * 判断用户有哪些权限 + */ +@Component +@Slf4j +public class CustomAuthorizationManagerServiceImpl implements AuthorizationManager { + + @Resource + private TokenValidationService tokenValidationService; + + @Resource + private PermissionCheckService permissionCheckService; + + /** + * 检查请求的Token是否携带，并判断是否过期 + * + * @param authentication Supplier + * @param context RequestAuthorizationContext + * @return AuthorizationDecision + */ + @Override + public AuthorizationDecision check(Supplier authentication, RequestAuthorizationContext context) { + // 用户的token和用户id、请求Url + HttpServletRequest request = context.getRequest(); + + // 验证token + TokenInfo tokenInfo = tokenValidationService.validateToken(request); + + // 验证用户状态 + validateUserStatus(tokenInfo.getLoginVo()); + + // 设置用户信息 + BaseContext.setUsername(tokenInfo.getUsername()); + BaseContext.setUserId(tokenInfo.getUserId()); + BaseContext.setLoginVo(tokenInfo.getLoginVo()); + + // 校验权限 + Boolean hasPermission = permissionCheckService.hasPermission(request); + return new AuthorizationDecision(hasPermission); + } + + private void validateUserStatus(LoginVo loginVo) { + // 登录信息为空 + if (loginVo == null) { + throw new CustomAuthenticationException(ResultCodeEnum.LOGIN_AUTH); + } + + // 判断用户是否禁用 + if (loginVo.getStatus()) { + throw new CustomAuthenticationException(ResultCodeEnum.FAIL_NO_ACCESS_DENIED_USER_LOCKED); + } + } +} diff --git a/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java b/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java new file mode 100644 index 0000000..cf48504 --- /dev/null +++ b/service/src/main/java/cn/bunny/services/security/service/PermissionCheckService.java @@ -0,0 +1,84 @@ +package cn.bunny.services.security.service; + +import cn.bunny.services.context.BaseContext; +import cn.bunny.services.domain.system.system.entity.Permission; +import cn.bunny.services.domain.system.system.entity.Role; +import cn.bunny.services.mapper.system.PermissionMapper; +import cn.bunny.services.mapper.system.RoleMapper; +import cn.bunny.services.security.config.WebSecurityConfig; +import cn.bunny.services.utils.system.RoleUtil; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.security.web.util.matcher.AntPathRequestMatcher; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +import java.util.List; +import java.util.Objects; + +/** + * 权限校验认证 + */ +@Component +public class PermissionCheckService { + + @Resource + private PermissionMapper permissionMapper; + + @Resource + private RoleMapper roleMapper; + + /** + * 查询用户所属的角色信息 + * + * @param request 请求url地址 + */ + public Boolean hasPermission(HttpServletRequest request) { + String requestMethod = request.getMethod(); + + // 根据用户ID查询角色数据 + Long userId = BaseContext.getUserId(); + List roleList = roleMapper.selectListByUserId(userId); + + // 角色代码 + List roleCodeList = roleList.stream().map(Role::getRoleCode).toList(); + + // 判断是否是管理员用户 + boolean checkedAdmin = RoleUtil.checkAdmin(roleCodeList); + if (checkedAdmin) return true; + + // 判断请求地址是否是登录之后才需要访问的，已经登录了不需要验证的 + String requestURI = request.getRequestURI(); + for (String userAuth : WebSecurityConfig.userAuths) { + if (requestURI.contains(userAuth)) return true; + } + + // 根据角色列表查询权限信息 + List permissionList = permissionMapper.selectListByUserId(userId); + + // 判断是否与请求路径匹配 + return permissionList.stream() + // 过滤并转成小写进行比较 + .filter(permission -> { + String method = permission.getRequestMethod(); + if (StringUtils.hasText(method)) { + + return method.equalsIgnoreCase(requestMethod) + || requestURI.contains("*"); + } + return false; + }) + .map(Permission::getRequestUrl) + .filter(Objects::nonNull) + .anyMatch(requestUrl -> { + // 使用AntPath 匹配 + if ((requestUrl.contains("/*") || requestUrl.contains("/**"))) { + return new AntPathRequestMatcher(requestUrl).matches(request); + } + // 使用正则匹配（不建议使用） + else { + return requestURI.matches(requestUrl); + } + }); + } +} diff --git a/service/src/main/java/cn/bunny/services/security/service/ReadMe.md b/service/src/main/java/cn/bunny/services/security/service/ReadMe.md new file mode 100644 index 0000000..cfe48fa --- /dev/null +++ b/service/src/main/java/cn/bunny/services/security/service/ReadMe.md @@ -0,0 +1,83 @@ +# 自定义验证请求逻辑实现 + +> [!CAUTION] +> +> 1. 登出操作必须验证身份 +> 2. 敏感操作必须显式授权 +> 3. 通配符权限需谨慎配置 + +## 概述 + +本方案通过实现`AuthorizationManager`接口，为Spring Security项目提供自定义的JWT验证逻辑，替代默认实现以满足特定业务需求。 + +## 核心设计原则 + +1. **差异化验证**：区分不同请求类型的验证需求 +2. **性能优化**：通过方法过滤减少权限验证范围 +3. **灵活匹配**：支持精确匹配和通配符匹配 +4. **特权处理**：管理员特权直接放行机制 + +## 验证流程设计 + +### 前置验证阶段 +1. **Token验证** + - 检查请求头是否包含有效Token + - 验证Token有效期 + - 解析Token获取用户身份信息 + +2. **用户状态验证** + - 查询Redis验证登录状态（`LoginVo`） + - 检查用户账号状态（是否禁用等） + - 设置用户信息到安全上下文 + +### 权限验证阶段 +1. **特权用户处理** + - 管理员(admin)直接放行 +2. **公共端点处理** + - 登录端点免验证 + - 登出端点强制验证 + - 配置白名单匹配 +3. **细粒度权限验证** + - 按请求方法(GET/POST等)过滤权限 + - 支持多种URL匹配模式： + - 精确匹配 + - Ant风格通配符(/*, /**) + +## 关键实现逻辑 + +```java +// 权限验证核心代码片段 +permissionList.stream() + .filter(permission -> { + // 方法匹配过滤 + String method = permission.getRequestMethod(); + if (StringUtils.hasText(method)) { + return method.equalsIgnoreCase(requestMethod) + || isWildcardPath(requestURI); + } + return false; + }) + .map(Permission::getRequestUrl) + .filter(Objects::nonNull) + .anyMatch(url -> matchRequestPath(url, requestURI)); +``` + +**路径匹配策略**： +- 通配符路径(`/*`, `/**`)：使用`AntPathMatcher` +- 精确路径：直接字符串比较 + +## 异常情况处理 + +1. **通配符路径特殊情况** + - 当配置`/**`时需特殊处理 + - 需要同时验证模块前缀和用户权限 + +2. **方法级控制** + - 同一URL不同方法需要区分验证 + - 示例：`/api/test/1`的`GET`和`DELETE`方法需要分别授权 + +## 性能优化建议 + +1. 缓存用户权限数据 +2. 使用布隆过滤器快速判断无效路径 +3. 对权限数据建立方法索引 diff --git a/service/src/main/java/cn/bunny/services/security/service/TokenValidationService.java b/service/src/main/java/cn/bunny/services/security/service/TokenValidationService.java new file mode 100644 index 0000000..4a321e4 --- /dev/null +++ b/service/src/main/java/cn/bunny/services/security/service/TokenValidationService.java @@ -0,0 +1,47 @@ +package cn.bunny.services.security.service; + +import cn.bunny.services.domain.common.constant.RedisUserConstant; +import cn.bunny.services.domain.common.model.dto.security.TokenInfo; +import cn.bunny.services.domain.common.model.vo.LoginVo; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; +import cn.bunny.services.security.exception.CustomAuthenticationException; +import cn.bunny.services.utils.JwtTokenUtil; +import com.alibaba.fastjson2.JSON; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; + +/** + * 处理Token相关逻辑 + */ +@Component +public class TokenValidationService { + + @Resource + private RedisTemplate redisTemplate; + + public TokenInfo validateToken(HttpServletRequest request) { + // 判断是否有 token + String header = request.getHeader("Authorization"); + if (header == null || !header.startsWith("Bearer ")) { + throw new CustomAuthenticationException(ResultCodeEnum.LOGIN_AUTH); + } + + String token = header.substring(7); + // 判断 token 是否过期 + if (JwtTokenUtil.isExpired(token)) { + throw new CustomAuthenticationException(ResultCodeEnum.AUTHENTICATION_EXPIRED); + } + + // 解析JWT中的用户名 + String username = JwtTokenUtil.getUsername(token); + Long userId = JwtTokenUtil.getUserId(token); + + // 查找 Redis + Object loginVoObject = redisTemplate.opsForValue().get(RedisUserConstant.getAdminLoginInfoPrefix(username)); + LoginVo loginVo = JSON.parseObject(JSON.toJSONString(loginVoObject), LoginVo.class); + + return TokenInfo.builder().userId(userId).username(username).token(token).loginVo(loginVo).build(); + } +} diff --git a/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java b/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java index 1d75e69..13a72e2 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java @@ -5,7 +5,7 @@ import cn.bunny.services.domain.system.email.dto.EmailTemplateDto; import cn.bunny.services.domain.system.email.dto.EmailTemplateUpdateDto; import cn.bunny.services.domain.system.email.entity.EmailTemplate; import cn.bunny.services.domain.system.email.vo.EmailTemplateVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java b/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java index 3dffc24..148148b 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java @@ -5,7 +5,7 @@ import cn.bunny.services.domain.system.email.dto.EmailUsersDto; import cn.bunny.services.domain.system.email.dto.EmailUsersUpdateDto; import cn.bunny.services.domain.system.email.entity.EmailUsers; import cn.bunny.services.domain.system.email.vo.EmailUsersVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java b/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java index e998da2..2f1e419 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java @@ -6,7 +6,7 @@ import cn.bunny.services.domain.system.i18n.dto.I18nUpdateByFileDto; import cn.bunny.services.domain.system.i18n.dto.I18nUpdateDto; import cn.bunny.services.domain.system.i18n.entity.I18n; import cn.bunny.services.domain.system.i18n.vo.I18nVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.system.i18n.dto.I18nAddDto; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java b/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java index da19e6a..797cd39 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java @@ -5,7 +5,7 @@ import cn.bunny.services.domain.system.menuIcon.dto.MenuIconDto; import cn.bunny.services.domain.system.menuIcon.dto.MenuIconUpdateDto; import cn.bunny.services.domain.system.menuIcon.entity.MenuIcon; import cn.bunny.services.domain.system.menuIcon.vo.MenuIconVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java index 78d34b4..f017a08 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/ConfigurationServiceImpl.java @@ -3,7 +3,7 @@ package cn.bunny.services.service.configuration.impl; import cn.bunny.services.domain.system.configuration.dto.WebConfigurationDto; import cn.bunny.services.domain.system.configuration.entity.WebConfiguration; import cn.bunny.services.domain.common.constant.RedisUserConstant; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.service.configuration.ConfigurationService; import com.alibaba.fastjson2.JSON; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java index 3c0e406..b8eca77 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java @@ -6,8 +6,8 @@ import cn.bunny.services.domain.system.email.dto.EmailTemplateUpdateDto; import cn.bunny.services.domain.system.email.entity.EmailTemplate; import cn.bunny.services.domain.system.email.vo.EmailTemplateVo; import cn.bunny.services.domain.common.enums.EmailTemplateEnums; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailTemplateMapper; import cn.bunny.services.service.configuration.EmailTemplateService; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java index 791b563..78b3dd1 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java @@ -5,8 +5,8 @@ import cn.bunny.services.domain.system.email.dto.EmailUsersDto; import cn.bunny.services.domain.system.email.dto.EmailUsersUpdateDto; import cn.bunny.services.domain.system.email.entity.EmailUsers; import cn.bunny.services.domain.system.email.vo.EmailUsersVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailUsersMapper; import cn.bunny.services.service.configuration.EmailUsersService; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java index c72833e..562333a 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java @@ -1,10 +1,10 @@ package cn.bunny.services.service.configuration.impl; -import cn.bunny.services.domain.common.entity.BaseEntity; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; import cn.bunny.services.domain.common.constant.FileType; -import cn.bunny.services.domain.common.excel.I18nExcel; +import cn.bunny.services.domain.common.model.entity.BaseEntity; +import cn.bunny.services.domain.common.model.dto.excel.I18nExcel; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.domain.system.i18n.dto.I18nAddDto; import cn.bunny.services.domain.system.i18n.dto.I18nDto; import cn.bunny.services.domain.system.i18n.dto.I18nUpdateByFileDto; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java index 0c615eb..1baf30a 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java @@ -5,7 +5,7 @@ import cn.bunny.services.domain.system.i18n.dto.I18nTypeDto; import cn.bunny.services.domain.system.i18n.dto.I18nTypeUpdateDto; import cn.bunny.services.domain.system.i18n.entity.I18nType; import cn.bunny.services.domain.system.i18n.vo.I18nTypeVo; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.I18nTypeMapper; import cn.bunny.services.service.configuration.I18nTypeService; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java index c4ebf51..e0d408d 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java @@ -5,8 +5,8 @@ import cn.bunny.services.domain.system.menuIcon.dto.MenuIconDto; import cn.bunny.services.domain.system.menuIcon.dto.MenuIconUpdateDto; import cn.bunny.services.domain.system.menuIcon.entity.MenuIcon; import cn.bunny.services.domain.system.menuIcon.vo.MenuIconVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.MenuIconMapper; import cn.bunny.services.service.configuration.MenuIconService; diff --git a/service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java b/service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java index fc1abca..97683fa 100644 --- a/service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java +++ b/service/src/main/java/cn/bunny/services/service/log/ScheduleExecuteLogService.java @@ -3,7 +3,7 @@ package cn.bunny.services.service.log; import cn.bunny.services.domain.system.log.dto.ScheduleExecuteLogDto; import cn.bunny.services.domain.system.log.entity.ScheduleExecuteLog; import cn.bunny.services.domain.system.log.vo.ScheduleExecuteLogVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java b/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java index 4d4aead..9421c1e 100644 --- a/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java +++ b/service/src/main/java/cn/bunny/services/service/log/UserLoginLogService.java @@ -4,7 +4,7 @@ import cn.bunny.services.domain.system.log.dto.UserLoginLogDto; import cn.bunny.services.domain.system.log.entity.UserLoginLog; import cn.bunny.services.domain.system.log.vo.UserLoginLogLocalVo; import cn.bunny.services.domain.system.log.vo.UserLoginLogVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java index 211adad..cac5c19 100644 --- a/service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/log/impl/ScheduleExecuteLogServiceImpl.java @@ -3,7 +3,7 @@ package cn.bunny.services.service.log.impl; import cn.bunny.services.domain.system.log.dto.ScheduleExecuteLogDto; import cn.bunny.services.domain.system.log.entity.ScheduleExecuteLog; import cn.bunny.services.domain.system.log.vo.ScheduleExecuteLogVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.mapper.log.ScheduleExecuteLogMapper; import cn.bunny.services.service.log.ScheduleExecuteLogService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java index 9f773f5..b82f42c 100644 --- a/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/log/impl/UserLoginLogServiceImpl.java @@ -4,7 +4,7 @@ import cn.bunny.services.domain.system.log.dto.UserLoginLogDto; import cn.bunny.services.domain.system.log.entity.UserLoginLog; import cn.bunny.services.domain.system.log.vo.UserLoginLogLocalVo; import cn.bunny.services.domain.system.log.vo.UserLoginLogVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.context.BaseContext; import cn.bunny.services.mapper.log.UserLoginLogMapper; import cn.bunny.services.service.log.UserLoginLogService; diff --git a/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java b/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java index 9139275..67e5022 100644 --- a/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java +++ b/service/src/main/java/cn/bunny/services/service/message/MessageReceivedService.java @@ -7,7 +7,7 @@ import cn.bunny.services.domain.system.message.entity.Message; import cn.bunny.services.domain.system.message.entity.MessageReceived; import cn.bunny.services.domain.system.message.vo.MessageReceivedWithMessageVo; import cn.bunny.services.domain.system.message.vo.MessageUserVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/message/MessageService.java b/service/src/main/java/cn/bunny/services/service/message/MessageService.java index e81a87c..567aa33 100644 --- a/service/src/main/java/cn/bunny/services/service/message/MessageService.java +++ b/service/src/main/java/cn/bunny/services/service/message/MessageService.java @@ -7,7 +7,7 @@ import cn.bunny.services.domain.system.message.entity.Message; import cn.bunny.services.domain.system.message.vo.MessageDetailVo; import cn.bunny.services.domain.system.message.vo.MessageReceivedWithUserVo; import cn.bunny.services.domain.system.message.vo.MessageVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java b/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java index b08aecf..628fd0b 100644 --- a/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java +++ b/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java @@ -5,7 +5,7 @@ import cn.bunny.services.domain.system.message.dto.MessageTypeDto; import cn.bunny.services.domain.system.message.dto.MessageTypeUpdateDto; import cn.bunny.services.domain.system.message.entity.MessageType; import cn.bunny.services.domain.system.message.vo.MessageTypeVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java index ca78f0c..aabe99a 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java @@ -7,8 +7,8 @@ import cn.bunny.services.domain.system.message.entity.Message; import cn.bunny.services.domain.system.message.entity.MessageReceived; import cn.bunny.services.domain.system.message.vo.MessageReceivedWithMessageVo; import cn.bunny.services.domain.system.message.vo.MessageUserVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.context.BaseContext; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.message.MessageReceivedMapper; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java index 64c67f0..3c7540a 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.message.impl; -import cn.bunny.services.domain.common.entity.BaseEntity; +import cn.bunny.services.domain.common.model.entity.BaseEntity; import cn.bunny.services.domain.system.message.dto.MessageAddDto; import cn.bunny.services.domain.system.message.dto.MessageDto; import cn.bunny.services.domain.system.message.dto.MessageUpdateDto; @@ -10,8 +10,8 @@ import cn.bunny.services.domain.system.message.vo.MessageDetailVo; import cn.bunny.services.domain.system.message.vo.MessageReceivedWithMessageVo; import cn.bunny.services.domain.system.message.vo.MessageReceivedWithUserVo; import cn.bunny.services.domain.system.message.vo.MessageVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.context.BaseContext; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.message.MessageMapper; diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java index a5cbede..a105b02 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java @@ -5,7 +5,7 @@ import cn.bunny.services.domain.system.message.dto.MessageTypeDto; import cn.bunny.services.domain.system.message.dto.MessageTypeUpdateDto; import cn.bunny.services.domain.system.message.entity.MessageType; import cn.bunny.services.domain.system.message.vo.MessageTypeVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.mapper.message.MessageTypeMapper; import cn.bunny.services.service.message.MessageTypeService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java index de469ce..70ba1b0 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersGroupService.java @@ -5,7 +5,7 @@ import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupUpdateDto; import cn.bunny.services.domain.system.quartz.entity.SchedulersGroup; import cn.bunny.services.domain.system.quartz.vo.SchedulersGroupVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java index 2c96333..1220459 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.schedule; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.system.quartz.dto.SchedulersAddDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersUpdateDto; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java index b0b2c10..8de5030 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java @@ -5,7 +5,7 @@ import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersGroupUpdateDto; import cn.bunny.services.domain.system.quartz.entity.SchedulersGroup; import cn.bunny.services.domain.system.quartz.vo.SchedulersGroupVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.mapper.schedule.SchedulersGroupMapper; import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java index 405d101..1aa16f5 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersServiceImpl.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.schedule.impl; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.domain.system.quartz.dto.SchedulersAddDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersDto; import cn.bunny.services.domain.system.quartz.dto.SchedulersUpdateDto; diff --git a/service/src/main/java/cn/bunny/services/service/system/DeptService.java b/service/src/main/java/cn/bunny/services/service/system/DeptService.java index 2119a42..ad58c2c 100644 --- a/service/src/main/java/cn/bunny/services/service/system/DeptService.java +++ b/service/src/main/java/cn/bunny/services/service/system/DeptService.java @@ -5,7 +5,7 @@ import cn.bunny.services.domain.system.system.dto.dept.DeptDto; import cn.bunny.services.domain.system.system.dto.dept.DeptUpdateDto; import cn.bunny.services.domain.system.system.entity.Dept; import cn.bunny.services.domain.system.system.vo.DeptVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/system/FilesService.java b/service/src/main/java/cn/bunny/services/service/system/FilesService.java index 84efb0b..9bd2cbe 100644 --- a/service/src/main/java/cn/bunny/services/service/system/FilesService.java +++ b/service/src/main/java/cn/bunny/services/service/system/FilesService.java @@ -7,7 +7,7 @@ import cn.bunny.services.domain.system.files.dto.FilesUpdateDto; import cn.bunny.services.domain.system.files.entity.Files; import cn.bunny.services.domain.system.files.vo.FileInfoVo; import cn.bunny.services.domain.system.files.vo.FilesVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/system/PermissionService.java b/service/src/main/java/cn/bunny/services/service/system/PermissionService.java index 006cd41..f9426b9 100644 --- a/service/src/main/java/cn/bunny/services/service/system/PermissionService.java +++ b/service/src/main/java/cn/bunny/services/service/system/PermissionService.java @@ -1,6 +1,6 @@ package cn.bunny.services.service.system; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.system.system.dto.power.PermissionAddDto; import cn.bunny.services.domain.system.system.dto.power.PermissionDto; import cn.bunny.services.domain.system.system.dto.power.PermissionUpdateBatchByParentIdDto; diff --git a/service/src/main/java/cn/bunny/services/service/system/RoleService.java b/service/src/main/java/cn/bunny/services/service/system/RoleService.java index 4f4b803..a805ebe 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RoleService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RoleService.java @@ -5,7 +5,7 @@ import cn.bunny.services.domain.system.system.dto.role.RoleDto; import cn.bunny.services.domain.system.system.dto.role.RoleUpdateDto; import cn.bunny.services.domain.system.system.entity.Role; import cn.bunny.services.domain.system.system.vo.RoleVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/system/UserService.java b/service/src/main/java/cn/bunny/services/service/system/UserService.java index 20d0d1a..407fa3e 100644 --- a/service/src/main/java/cn/bunny/services/service/system/UserService.java +++ b/service/src/main/java/cn/bunny/services/service/system/UserService.java @@ -5,8 +5,8 @@ import cn.bunny.services.domain.system.system.entity.AdminUser; import cn.bunny.services.domain.system.system.vo.user.AdminUserVo; import cn.bunny.services.domain.system.system.vo.user.RefreshTokenVo; import cn.bunny.services.domain.system.system.vo.user.UserVo; -import cn.bunny.services.domain.common.vo.LoginVo; -import cn.bunny.services.domain.common.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.LoginVo; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java index ffd608f..f41bb22 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/DeptServiceImpl.java @@ -5,8 +5,8 @@ import cn.bunny.services.domain.system.system.dto.dept.DeptDto; import cn.bunny.services.domain.system.system.dto.dept.DeptUpdateDto; import cn.bunny.services.domain.system.system.entity.Dept; import cn.bunny.services.domain.system.system.vo.DeptVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.system.DeptMapper; import cn.bunny.services.mapper.system.UserDeptMapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java index ba3335d..9d182d6 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/FilesServiceImpl.java @@ -3,9 +3,9 @@ package cn.bunny.services.service.system.impl; import cn.bunny.services.config.minio.MinioProperties; import cn.bunny.services.config.minio.MinioUtil; import cn.bunny.services.context.BaseContext; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; -import cn.bunny.services.domain.common.model.file.MinioFilePath; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.dto.file.MinioFilePath; import cn.bunny.services.domain.system.files.dto.FileUploadDto; import cn.bunny.services.domain.system.files.dto.FilesAddDto; import cn.bunny.services.domain.system.files.dto.FilesDto; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java index a28fb9c..d96afa7 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.system.impl; import cn.bunny.services.domain.common.constant.FileType; -import cn.bunny.services.domain.common.excel.PermissionExcel; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.dto.excel.PermissionExcel; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.domain.system.system.dto.power.PermissionAddDto; import cn.bunny.services.domain.system.system.dto.power.PermissionDto; import cn.bunny.services.domain.system.system.dto.power.PermissionUpdateBatchByParentIdDto; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java index d86f98e..e01cc09 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.system.impl; -import cn.bunny.services.domain.common.excel.RoleExcel; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.dto.excel.RoleExcel; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.domain.system.system.dto.role.RoleAddDto; import cn.bunny.services.domain.system.system.dto.role.RoleDto; import cn.bunny.services.domain.system.system.dto.role.RoleUpdateDto; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java index bfcf404..d8940f6 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RouterRoleServiceImpl.java @@ -1,7 +1,7 @@ package cn.bunny.services.service.system.impl; import cn.bunny.services.domain.system.system.entity.RouterRole; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.system.RouterRoleMapper; import cn.bunny.services.service.system.RouterRoleService; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java index c6b3be8..b921ffc 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RouterServiceImpl.java @@ -10,7 +10,7 @@ import cn.bunny.services.domain.system.system.views.ViewRouterRole; import cn.bunny.services.domain.system.system.vo.router.RouterManageVo; import cn.bunny.services.domain.system.system.vo.router.RouterVo; import cn.bunny.services.domain.system.system.vo.router.WebUserRouterVo; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.system.RolePermissionMapper; import cn.bunny.services.mapper.system.RouterMapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java index 31c9b89..4a63035 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserRoleServiceImpl.java @@ -4,8 +4,8 @@ import cn.bunny.services.domain.common.constant.RedisUserConstant; import cn.bunny.services.domain.system.system.dto.user.AssignRolesToUsersDto; import cn.bunny.services.domain.system.system.entity.AdminUser; import cn.bunny.services.domain.system.system.entity.UserRole; -import cn.bunny.services.domain.common.vo.LoginVo; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.LoginVo; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.context.BaseContext; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.system.UserMapper; diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java index cdd011c..ad90e5c 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java @@ -1,12 +1,12 @@ package cn.bunny.services.service.system.impl; import cn.bunny.services.context.BaseContext; -import cn.bunny.services.domain.common.vo.LoginVo; -import cn.bunny.services.domain.common.vo.result.PageResult; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; import cn.bunny.services.domain.common.constant.RedisUserConstant; import cn.bunny.services.domain.common.enums.EmailTemplateEnums; import cn.bunny.services.domain.common.enums.LoginEnums; +import cn.bunny.services.domain.common.model.vo.LoginVo; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.domain.system.email.entity.EmailTemplate; import cn.bunny.services.domain.system.log.entity.UserLoginLog; import cn.bunny.services.domain.system.system.dto.user.*; @@ -25,9 +25,9 @@ import cn.bunny.services.mapper.system.UserDeptMapper; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.mapper.system.UserRoleMapper; import cn.bunny.services.service.system.UserService; -import cn.bunny.services.utils.JwtHelper; -import cn.bunny.services.utils.email.ConcreteSenderEmailTemplate; import cn.bunny.services.utils.IpUtil; +import cn.bunny.services.utils.JwtTokenUtil; +import cn.bunny.services.utils.email.ConcreteSenderEmailTemplate; import cn.bunny.services.utils.login.DefaultLoginStrategy; import cn.bunny.services.utils.login.EmailLoginStrategy; import cn.bunny.services.utils.login.LoginContext; @@ -175,7 +175,7 @@ public class UserServiceImpl extends ServiceImpl implemen @NotNull @Override public RefreshTokenVo refreshToken(@NotNull RefreshTokenDto dto) { - Long userId = JwtHelper.getUserId(dto.getRefreshToken()); + Long userId = JwtTokenUtil.getUserId(dto.getRefreshToken()); AdminUser adminUser = getOne(Wrappers.lambdaQuery().eq(AdminUser::getId, userId)); // 用户存在且没有禁用 diff --git a/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java b/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java index 3b3765f..a07a0bc 100644 --- a/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java +++ b/service/src/main/java/cn/bunny/services/utils/email/AbstractSenderEmailTemplate.java @@ -1,9 +1,9 @@ package cn.bunny.services.utils.email; import cn.bunny.services.config.mail.MailSenderConfiguration; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; -import cn.bunny.services.domain.common.model.email.EmailSend; -import cn.bunny.services.domain.common.model.email.EmailSendInit; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.dto.email.EmailSend; +import cn.bunny.services.domain.common.model.dto.email.EmailSendInit; import cn.bunny.services.domain.system.email.entity.EmailTemplate; import cn.bunny.services.domain.system.email.entity.EmailUsers; import cn.bunny.services.exception.AuthCustomerException; diff --git a/service/src/main/java/cn/bunny/services/utils/i8n/I18nUtil.java b/service/src/main/java/cn/bunny/services/utils/i8n/I18nUtil.java index c2b3e15..78d5d2d 100644 --- a/service/src/main/java/cn/bunny/services/utils/i8n/I18nUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/i8n/I18nUtil.java @@ -1,6 +1,6 @@ package cn.bunny.services.utils.i8n; -import cn.bunny.services.domain.common.excel.I18nExcel; +import cn.bunny.services.domain.common.model.dto.excel.I18nExcel; import cn.bunny.services.domain.system.i18n.entity.I18n; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson2.JSON; diff --git a/service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java b/service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java index 9fd5884..113ecc0 100644 --- a/service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java +++ b/service/src/main/java/cn/bunny/services/utils/login/EmailLoginStrategy.java @@ -3,7 +3,7 @@ package cn.bunny.services.utils.login; import cn.bunny.services.domain.common.constant.RedisUserConstant; import cn.bunny.services.domain.system.system.dto.user.LoginDto; import cn.bunny.services.domain.system.system.entity.AdminUser; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.mapper.system.UserMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.data.redis.core.RedisTemplate; diff --git a/service/src/main/java/cn/bunny/services/utils/system/PermissionUtil.java b/service/src/main/java/cn/bunny/services/utils/system/PermissionUtil.java index bdb551c..132e1a9 100644 --- a/service/src/main/java/cn/bunny/services/utils/system/PermissionUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/system/PermissionUtil.java @@ -1,6 +1,6 @@ package cn.bunny.services.utils.system; -import cn.bunny.services.domain.common.excel.PermissionExcel; +import cn.bunny.services.domain.common.model.dto.excel.PermissionExcel; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson2.JSON; diff --git a/service/src/main/java/cn/bunny/services/utils/system/UserUtil.java b/service/src/main/java/cn/bunny/services/utils/system/UserUtil.java index 200bb24..b20e2e5 100644 --- a/service/src/main/java/cn/bunny/services/utils/system/UserUtil.java +++ b/service/src/main/java/cn/bunny/services/utils/system/UserUtil.java @@ -1,12 +1,12 @@ package cn.bunny.services.utils.system; import cn.bunny.services.config.minio.MinioUtil; -import cn.bunny.services.domain.common.vo.LoginVo; -import cn.bunny.services.domain.common.vo.result.ResultCodeEnum; import cn.bunny.services.domain.common.constant.LocalDateTimeConstant; import cn.bunny.services.domain.common.constant.MinioConstant; import cn.bunny.services.domain.common.constant.RedisUserConstant; import cn.bunny.services.domain.common.constant.UserConstant; +import cn.bunny.services.domain.common.model.vo.LoginVo; +import cn.bunny.services.domain.common.model.vo.result.ResultCodeEnum; import cn.bunny.services.domain.system.files.dto.FileUploadDto; import cn.bunny.services.domain.system.files.vo.FileInfoVo; import cn.bunny.services.domain.system.log.entity.UserLoginLog; @@ -20,8 +20,8 @@ import cn.bunny.services.mapper.system.PermissionMapper; import cn.bunny.services.mapper.system.RoleMapper; import cn.bunny.services.mapper.system.UserMapper; import cn.bunny.services.service.system.FilesService; -import cn.bunny.services.utils.JwtHelper; import cn.bunny.services.utils.IpUtil; +import cn.bunny.services.utils.JwtTokenUtil; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.BeanUtils; @@ -76,7 +76,7 @@ public class UserUtil { String username = user.getUsername(); // 使用用户名创建token - String token = JwtHelper.createToken(userId, username, (int) readMeDay); + String token = JwtTokenUtil.createToken(userId, username, (int) readMeDay); // 获取IP地址并更新用户登录信息 String ipAddr = IpUtil.getCurrentUserIpAddress().getIpAddr(); @@ -116,7 +116,7 @@ public class UserUtil { String loginInfoPrefix = RedisUserConstant.getAdminLoginInfoPrefix(username); // 使用用户名创建token - String token = JwtHelper.createToken(userId, username, (int) readMeDay); + String token = JwtTokenUtil.createToken(userId, username, (int) readMeDay); // 设置用户返回信息 LoginVo loginVo = setLoginVo(user, token, readMeDay, user.getIpAddress(), user.getIpRegion());